From 728a18f680598d2c77f8efb62a706978f9960a32 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 17 Oct 2012 23:50:36 -0700 Subject: [PATCH] Fixed searchProvider --- .../ProviderTests/SeriesProviderTest.cs | 36 ------------------- NzbDrone.Core/Providers/SearchProvider.cs | 7 +++- NzbDrone.Core/Providers/SeriesProvider.cs | 8 ----- 3 files changed, 6 insertions(+), 45 deletions(-) diff --git a/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs index 3d66807a9..2d765676e 100644 --- a/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs @@ -833,41 +833,5 @@ namespace NzbDrone.Core.Test.ProviderTests } - - [Test] - public void Update_UseSceneNumbering_should_update_applicable_series() - { - WithRealDb(); - var series = Builder.CreateListOfSize(5) - .All() - .With(s => s.UseSceneNumbering = false) - .Build(); - - Db.InsertMany(series); - - Mocker.Resolve().UpdateUseSceneNumbering(new []{ 2, 3 }); - - var seriesResults = Db.Fetch(); - seriesResults.Single(s => s.SeriesId == 2).UseSceneNumbering.Should().BeTrue(); - seriesResults.Single(s => s.SeriesId == 3).UseSceneNumbering.Should().BeTrue(); - } - - [Test] - public void Update_UseSceneNumbering_should_not_update_other_series() - { - WithRealDb(); - var series = Builder.CreateListOfSize(5) - .All() - .With(s => s.UseSceneNumbering = false) - .Build(); - - Db.InsertMany(series); - - Mocker.Resolve().UpdateUseSceneNumbering(new [] { 2, 3 }); - - var seriesResults = Db.Fetch(); - seriesResults.Where(s => !s.UseSceneNumbering).Should().HaveCount(3); - seriesResults.Where(s => !s.UseSceneNumbering).Should().NotContain(s => s.SeriesId == 2 || s.SeriesId == 3); - } } } \ No newline at end of file diff --git a/NzbDrone.Core/Providers/SearchProvider.cs b/NzbDrone.Core/Providers/SearchProvider.cs index 510ee312c..498930aa9 100644 --- a/NzbDrone.Core/Providers/SearchProvider.cs +++ b/NzbDrone.Core/Providers/SearchProvider.cs @@ -254,7 +254,12 @@ namespace NzbDrone.Core.Providers //Treat as single episode else if (episodes.Count == 1) { - if (!series.IsDaily) + //Use SceneNumbering + if (series.UseSceneNumbering) + reports.AddRange(indexer.FetchEpisode(title, episodes.First().SceneSeasonNumber, episodes.First().SceneEpisodeNumber)); + + //Standard + else if (!series.IsDaily) reports.AddRange(indexer.FetchEpisode(title, seasonNumber, episodes.First().EpisodeNumber)); //Daily Episode diff --git a/NzbDrone.Core/Providers/SeriesProvider.cs b/NzbDrone.Core/Providers/SeriesProvider.cs index f195de48a..ecbded829 100644 --- a/NzbDrone.Core/Providers/SeriesProvider.cs +++ b/NzbDrone.Core/Providers/SeriesProvider.cs @@ -238,14 +238,6 @@ namespace NzbDrone.Core.Providers _database.UpdateMany(allSeries); } - public virtual void UpdateUseSceneNumbering(IEnumerable seriesIds) - { - _database.Execute("UPDATE Series SET UseSceneNumbering = 0"); - - var query = String.Format("UPDATE Series SET UseSceneNumbering = 1 WHERE SeriesId IN ({0})", String.Join(",", seriesIds)); - _database.Execute(query); - } - /// /// Cleans up the AirsTime Component from TheTVDB since it can be garbage that comes in. ///