Merge pull request #69 from Taloth/xemseasonsearch

Season Search now correctly uses scene numbering

src/NzbDrone.Core/DecisionEngine/Specifications/Search/EpisodeRequestedSpecification.cs

@@ -0,0 +1,43 @@
+using System.Linq;
+using NLog;
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Parser.Model;
+
+
+namespace NzbDrone.Core.DecisionEngine.Specifications.Search
+{
+    public class EpisodeRequestedSpecification : IDecisionEngineSpecification
+    {
+        private readonly Logger _logger;
+
+        public EpisodeRequestedSpecification(Logger logger)
+        {
+            _logger = logger;
+        }
+
+        public string RejectionReason
+        {
+            get
+            {
+                return "Episode wasn't requested";
+            }
+        }
+
+        public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria)
+        {
+            if (searchCriteria == null)
+            {
+                return true;
+            }
+            var criteriaEpisodes = searchCriteria.Episodes.Select(v => v.Id).ToList();
+            var remoteEpisodes = remoteEpisode.Episodes.Select(v => v.Id).ToList();
+            if (!criteriaEpisodes.Intersect(remoteEpisodes).Any())
+            {
+                _logger.Debug("Release rejected since the episode wasn't requested: {0}", remoteEpisode.ParsedEpisodeInfo);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}

src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs

@@ -138,10 +138,53 @@ namespace NzbDrone.Core.IndexerSearch
                 return SearchSpecial(series, episodes);
             }
 
-            var searchSpec = Get<SeasonSearchCriteria>(series, episodes);
-            searchSpec.SeasonNumber = seasonNumber;
+            List<DownloadDecision> downloadDecisions = new List<DownloadDecision>();
 
-            return Dispatch(indexer => _feedFetcher.Fetch(indexer, searchSpec), searchSpec);
+            if (series.UseSceneNumbering)
+            {
+                var sceneSeasonGroups = episodes.GroupBy(v => 
+                    {
+                        if (v.SceneSeasonNumber == 0 && v.SceneEpisodeNumber == 0)
+                            return v.SeasonNumber;
+                        else
+                            return v.SceneSeasonNumber;
+                    }).Distinct();
+
+                foreach (var sceneSeasonEpisodes in sceneSeasonGroups)
+                {
+                    if (sceneSeasonEpisodes.Count() == 1)
+                    {
+                        var episode = sceneSeasonEpisodes.First();
+                        var searchSpec = Get<SingleEpisodeSearchCriteria>(series, sceneSeasonEpisodes.ToList());
+                        searchSpec.SeasonNumber = sceneSeasonEpisodes.Key;
+                        if (episode.SceneSeasonNumber == 0 && episode.SceneEpisodeNumber == 0)
+                            searchSpec.EpisodeNumber = episode.EpisodeNumber;
+                        else
+                            searchSpec.EpisodeNumber = episode.SceneEpisodeNumber;
+
+                        var decisions = Dispatch(indexer => _feedFetcher.Fetch(indexer, searchSpec), searchSpec);
+                        downloadDecisions.AddRange(decisions);
+                    }
+                    else
+                    {
+                        var searchSpec = Get<SeasonSearchCriteria>(series, sceneSeasonEpisodes.ToList());
+                        searchSpec.SeasonNumber = sceneSeasonEpisodes.Key;
+
+                        var decisions = Dispatch(indexer => _feedFetcher.Fetch(indexer, searchSpec), searchSpec);
+                        downloadDecisions.AddRange(decisions);
+                    }
+                }
+            }
+            else
+            {
+                var searchSpec = Get<SeasonSearchCriteria>(series, episodes);
+                searchSpec.SeasonNumber = seasonNumber;
+
+                var decisions = Dispatch(indexer => _feedFetcher.Fetch(indexer, searchSpec), searchSpec);
+                downloadDecisions.AddRange(decisions);
+            }
+
+            return downloadDecisions;
         }
 
         private TSpec Get<TSpec>(Series series, List<Episode> episodes) where TSpec : SearchCriteriaBase, new()

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -217,6 +217,7 @@
     <Compile Include="DecisionEngine\Specifications\NotRestrictedReleaseSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\NotSampleSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\RssSync\ProperSpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\Search\EpisodeRequestedSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\Search\SeriesSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\Search\SeasonMatchSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\Search\DailyEpisodeMatchSpecification.cs" />