From 9931bab998db1ddfc63a04341092391157de208e Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 24 Feb 2013 11:57:33 -0800 Subject: [PATCH] fixed more tests. --- .../UpgradeHistorySpecificationFixture.cs | 8 +-- .../UpgradePossibleSpecificationFixture.cs | 2 +- .../HistoryTests/HistoryServiceTest.cs | 1 + .../Indexers/IndexerServiceTest.cs | 10 +-- .../JobTests/BacklogSearchJobTest.cs | 4 +- .../JobTests/BannerDownloadJobTest.cs | 4 +- .../JobTests/DiskScanJobTest.cs | 18 +++--- .../JobTests/ImportNewSeriesJobTest.cs | 46 +++++++------- .../JobTests/RenameSeasonJobFixture.cs | 12 ++-- .../ProviderTests/BannerProviderTest.cs | 2 +- .../CleanUpDropFolderFixture.cs | 2 +- .../MoveEpisodeFileFixture.cs | 24 ++++---- .../ProviderTests/MediaFileProviderTest.cs | 2 +- .../Metadata/Xbmc_ForEpisodeFile_Fixture.cs | 2 +- .../Metadata/Xbmc_ForSeries_Fixture.cs | 2 +- .../ProcessDownloadFixture.cs | 4 +- .../ProcessVideoFileFixture.cs | 2 +- .../ReferenceDataProviderTest.cs | 12 ++-- .../SearchHistoryProviderTest.cs | 2 +- .../CheckReportFixture.cs | 2 +- .../EpisodeSearchTests/CheckReportFixture.cs | 2 +- .../SearchTests/GetSearchTitleFixture.cs | 6 +- .../CheckReportFixture.cs | 2 +- .../SearchTests/PerformSearchTestBase.cs | 4 +- .../SearchTests/ProcessResultsFixture.cs | 4 +- .../FindMatchingTvRageSeriesFixture.cs | 4 +- .../UpcomingEpisodesProviderTest.cs | 4 +- .../ProviderTests/XbmcProviderTest.cs | 12 ++-- .../EpisodeProviderTest.cs | 58 +++++++++--------- ...isodeProviderTest_DeleteInvalidEpisodes.cs | 12 ++-- ...deProviderTest_GetEpisodesByParseResult.cs | 6 +- .../GetEpisodeBySceneNumberFixture.cs | 10 +-- .../TvTests/SeriesProviderTest.cs | Bin 3428 -> 3423 bytes .../AcceptableSizeSpecification.cs | 1 + .../UpgradeHistorySpecification.cs | 2 +- NzbDrone.Core/History/HistoryRepository.cs | 2 +- NzbDrone.Core/Jobs/ImportNewSeriesJob.cs | 17 ++--- NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs | 1 + NzbDrone.Core/Jobs/RenameSeriesJob.cs | 1 + NzbDrone.Core/Jobs/UpdateInfoJob.cs | 1 + NzbDrone.Core/Providers/BannerProvider.cs | 1 + NzbDrone.Core/Providers/DiskScanProvider.cs | 1 + NzbDrone.Core/Providers/Metadata/Xbmc.cs | 1 + NzbDrone.Core/Providers/MetadataProvider.cs | 1 + NzbDrone.Core/Providers/Search/SearchBase.cs | 3 +- .../Providers/TvRageMappingProvider.cs | 3 +- NzbDrone.Core/Providers/XbmcProvider.cs | 6 +- NzbDrone.Core/Providers/XemProvider.cs | 5 +- NzbDrone.Core/Tv/EpisodeService.cs | 11 ++-- NzbDrone.Core/Tv/Series.cs | 2 +- NzbDrone.Core/Tv/SeriesService.cs | 9 +-- 51 files changed, 184 insertions(+), 169 deletions(-) diff --git a/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs index c833648b4..038f9cecf 100644 --- a/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs @@ -66,9 +66,9 @@ namespace NzbDrone.Core.Test.DecisionEngineTests firstQuality = new QualityModel(QualityTypes.Bluray1080p, true); secondQuality = new QualityModel(QualityTypes.Bluray1080p, true); - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 3)).Returns(firstQuality); - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 4)).Returns(secondQuality); - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 5)).Returns(null); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(fakeSeries.OID, 12, 3)).Returns(firstQuality); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(fakeSeries.OID, 12, 4)).Returns(secondQuality); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(fakeSeries.OID, 12, 5)).Returns(null); } private void WithFirstReportUpgradable() @@ -124,7 +124,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests parseResultSingle.Quality = new QualityModel(QualityTypes.WEBDL1080p, false); firstQuality = new QualityModel(QualityTypes.WEBDL1080p, false); - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(fakeSeries.SeriesId, 12, 3)).Returns(firstQuality); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(fakeSeries.OID, 12, 3)).Returns(firstQuality); _upgradeHistory.IsSatisfiedBy(parseResultSingle).Should().BeFalse(); } diff --git a/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs index 92cedd7f5..baad30685 100644 --- a/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs +++ b/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests .Build(); _episode = Builder.CreateNew() - .With(e => e.SeriesId = _series.SeriesId) + .With(e => e.SeriesId = _series.OID) .With(e => e.Series = _series) .With(e => e.EpisodeFile = _episodeFile) .Build(); diff --git a/NzbDrone.Core.Test/HistoryTests/HistoryServiceTest.cs b/NzbDrone.Core.Test/HistoryTests/HistoryServiceTest.cs index bf8a25345..50749ad89 100644 --- a/NzbDrone.Core.Test/HistoryTests/HistoryServiceTest.cs +++ b/NzbDrone.Core.Test/HistoryTests/HistoryServiceTest.cs @@ -3,6 +3,7 @@ using System.Linq; using FizzWare.NBuilder; using FluentAssertions; using NUnit.Framework; +using NzbDrone.Core.Datastore; using NzbDrone.Core.History; using NzbDrone.Core.Tv; using NzbDrone.Core.Repository.Quality; diff --git a/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs b/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs index 66b80ca7c..afed8329b 100644 --- a/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs +++ b/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs @@ -76,7 +76,7 @@ namespace NzbDrone.Core.Test.Indexers public class MockIndexer : IndexerBase { - public MockIndexer(HttpProvider httpProvider, ConfigService configService) + public MockIndexer(HttpProvider httpProvider, IConfigService configService) : base(httpProvider, configService) { } @@ -134,7 +134,7 @@ namespace NzbDrone.Core.Test.Indexers public class TestUrlIndexer : IndexerBase { - public TestUrlIndexer(HttpProvider httpProvider, ConfigService configService) + public TestUrlIndexer(HttpProvider httpProvider, IConfigService configService) : base(httpProvider, configService) { } @@ -187,7 +187,7 @@ namespace NzbDrone.Core.Test.Indexers public class CustomParserIndexer : IndexerBase { - public CustomParserIndexer(HttpProvider httpProvider, ConfigService configService) + public CustomParserIndexer(HttpProvider httpProvider, IConfigService configService) : base(httpProvider, configService) { } @@ -247,7 +247,7 @@ namespace NzbDrone.Core.Test.Indexers public class NotConfiguredIndexer : IndexerBase { - public NotConfiguredIndexer(HttpProvider httpProvider, ConfigService configService) + public NotConfiguredIndexer(HttpProvider httpProvider, IConfigService configService) : base(httpProvider, configService) { } @@ -300,7 +300,7 @@ namespace NzbDrone.Core.Test.Indexers public class DefaultEnabledIndexer : IndexerBase { - public DefaultEnabledIndexer(HttpProvider httpProvider, ConfigService configService) + public DefaultEnabledIndexer(HttpProvider httpProvider, IConfigService configService) : base(httpProvider, configService) { } diff --git a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs index 88a4f3ae6..7c7d1151a 100644 --- a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs @@ -158,7 +158,7 @@ namespace NzbDrone.Core.Test.JobTests var episodes = Builder.CreateListOfSize(5) .All() .With(e => e.Series = series) - .With(e => e.SeriesId = series.SeriesId) + .With(e => e.SeriesId = series.OID) .With(e => e.SeasonNumber = 1) .Build(); @@ -198,7 +198,7 @@ namespace NzbDrone.Core.Test.JobTests var episodes = Builder.CreateListOfSize(10) .TheFirst(5) .With(e => e.Series = series) - .With(e => e.SeriesId = series.SeriesId) + .With(e => e.SeriesId = series.OID) .With(e => e.SeasonNumber = 1) .TheNext(5) .With(e => e.Series = series2) diff --git a/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs b/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs index 3fb2aae70..e1938b59e 100644 --- a/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs @@ -82,10 +82,10 @@ namespace NzbDrone.Core.Test.JobTests var series = Builder.CreateNew() .Build(); - Mocker.GetMock().Setup(s => s.Get(series.SeriesId)) + Mocker.GetMock().Setup(s => s.Get(series.OID)) .Returns(series); - Mocker.Resolve().Start(_notification, new { SeriesId = series.SeriesId }); + Mocker.Resolve().Start(_notification, new { SeriesId = series.OID }); VerifyDownloadMock(1); } } diff --git a/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs b/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs index ce6d40b03..82d0704bd 100644 --- a/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs @@ -26,12 +26,12 @@ namespace NzbDrone.Core.Test.JobTests public void series_specific_scan_should_scan_series() { var series = Builder.CreateNew() - .With(s => s.SeriesId = 12) + .With(s => s.OID = 12) .Build(); Mocker.GetMock() - .Setup(p => p.Get(series.SeriesId)); + .Setup(p => p.Get(series.OID)); Mocker.GetMock() @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.JobTests .Returns(new List()); //Act - Mocker.Resolve().Start(new ProgressNotification("Test"), new { SeriesId = series.SeriesId }); + Mocker.Resolve().Start(new ProgressNotification("Test"), new { SeriesId = series.OID }); //Assert Mocker.VerifyAllMocks(); @@ -51,8 +51,8 @@ namespace NzbDrone.Core.Test.JobTests public void job_with_no_target_should_scan_all_series() { var series = Builder.CreateListOfSize(2) - .TheFirst(1).With(s => s.SeriesId = 12) - .TheNext(1).With(s => s.SeriesId = 15) + .TheFirst(1).With(s => s.OID = 12) + .TheNext(1).With(s => s.OID = 15) .Build().ToList(); Mocker.GetMock() @@ -77,8 +77,8 @@ namespace NzbDrone.Core.Test.JobTests public void failed_scan_should_not_terminated_job() { var series = Builder.CreateListOfSize(2) - .TheFirst(1).With(s => s.SeriesId = 12) - .TheNext(1).With(s => s.SeriesId = 15) + .TheFirst(1).With(s => s.OID = 12) + .TheNext(1).With(s => s.OID = 15) .Build().ToList(); Mocker.GetMock() @@ -104,8 +104,8 @@ namespace NzbDrone.Core.Test.JobTests public void job_with_no_target_should_scan_series_with_episodes() { var series = Builder.CreateListOfSize(2) - .TheFirst(1).With(s => s.SeriesId = 12) - .TheNext(1).With(s => s.SeriesId = 15) + .TheFirst(1).With(s => s.OID = 12) + .TheNext(1).With(s => s.OID = 15) .Build().ToList(); Mocker.GetMock() diff --git a/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs b/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs index 073124949..38ed5eebf 100644 --- a/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs +++ b/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs @@ -26,8 +26,8 @@ namespace NzbDrone.Core.Test.JobTests { var series = Builder.CreateListOfSize(2) .All().With(s => s.LastInfoSync = null) - .TheFirst(1).With(s => s.SeriesId = 12) - .TheNext(1).With(s => s.SeriesId = 15) + .TheFirst(1).With(s => s.OID = 12) + .TheNext(1).With(s => s.OID = 15) .Build(); var notification = new ProgressNotification("Test"); @@ -40,11 +40,11 @@ namespace NzbDrone.Core.Test.JobTests Mocker.GetMock() - .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId))) + .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID))) .Callback(() => series[0].LastDiskSync = DateTime.Now); Mocker.GetMock() - .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].SeriesId))) + .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].OID))) .Callback(() => series[1].LastDiskSync = DateTime.Now); Mocker.GetMock() @@ -54,18 +54,18 @@ namespace NzbDrone.Core.Test.JobTests .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") > 0))); Mocker.GetMock() - .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId))) + .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID))) .Callback(() => series[0].LastInfoSync = DateTime.Now); Mocker.GetMock() - .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].SeriesId))) + .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].OID))) .Callback(() => series[1].LastInfoSync = DateTime.Now); Mocker.GetMock() - .Setup(s => s.Get(series[0].SeriesId)).Returns(series[0]); + .Setup(s => s.Get(series[0].OID)).Returns(series[0]); Mocker.GetMock() - .Setup(s => s.Get(series[1].SeriesId)).Returns(series[1]); + .Setup(s => s.Get(series[1].OID)).Returns(series[1]); Mocker.GetMock() .Setup(s => s.GetSeriesFiles(It.IsAny())).Returns(new List()); @@ -74,11 +74,11 @@ namespace NzbDrone.Core.Test.JobTests Mocker.Resolve().Start(notification, null); //Assert - Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId)), Times.Once()); - Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].SeriesId)), Times.Once()); + Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID)), Times.Once()); + Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].OID)), Times.Once()); - Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId)), Times.Once()); - Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].SeriesId)), Times.Once()); + Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID)), Times.Once()); + Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].OID)), Times.Once()); } @@ -91,8 +91,8 @@ namespace NzbDrone.Core.Test.JobTests { var series = Builder.CreateListOfSize(2) .All().With(s => s.LastInfoSync = null) - .TheFirst(1).With(s => s.SeriesId = 12) - .TheNext(1).With(s => s.SeriesId = 15) + .TheFirst(1).With(s => s.OID = 12) + .TheNext(1).With(s => s.OID = 15) .Build(); var notification = new ProgressNotification("Test"); @@ -104,37 +104,37 @@ namespace NzbDrone.Core.Test.JobTests .Returns(series); Mocker.GetMock() - .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId))) + .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID))) .Callback(() => series[0].LastInfoSync = DateTime.Now); Mocker.GetMock() - .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].SeriesId))) + .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].OID))) .Throws(new InvalidOperationException()); Mocker.GetMock() - .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId))) + .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID))) .Callback(() => series[0].LastDiskSync = DateTime.Now); Mocker.GetMock() - .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId))); + .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID))); Mocker.GetMock() - .Setup(s => s.Get(series[0].SeriesId)).Returns(series[0]); + .Setup(s => s.Get(series[0].OID)).Returns(series[0]); Mocker.GetMock() .Setup(s => s.GetSeriesFiles(It.IsAny())).Returns(new List()); Mocker.GetMock() - .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId))); + .Setup(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID))); //Act Mocker.Resolve().Start(notification, null); //Assert - Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId)), Times.Once()); - Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].SeriesId)), Times.Once()); + Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID)), Times.Once()); + Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[1].OID)), Times.Once()); - Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].SeriesId)), Times.Once()); + Mocker.GetMock().Verify(j => j.Start(notification, It.Is(d => d.GetPropertyValue("SeriesId") == series[0].OID)), Times.Once()); ExceptionVerification.ExpectedErrors(1); diff --git a/NzbDrone.Core.Test/JobTests/RenameSeasonJobFixture.cs b/NzbDrone.Core.Test/JobTests/RenameSeasonJobFixture.cs index 2fafa2cce..480ff4334 100644 --- a/NzbDrone.Core.Test/JobTests/RenameSeasonJobFixture.cs +++ b/NzbDrone.Core.Test/JobTests/RenameSeasonJobFixture.cs @@ -37,11 +37,11 @@ namespace NzbDrone.Core.Test.JobTests .Build(); Mocker.GetMock() - .Setup(s => s.Get(_series.SeriesId)) + .Setup(s => s.Get(_series.OID)) .Returns(_series); Mocker.GetMock() - .Setup(s => s.GetSeasonFiles(_series.SeriesId, 5)) + .Setup(s => s.GetSeasonFiles(_series.OID, 5)) .Returns(_episodeFiles); } @@ -63,13 +63,13 @@ namespace NzbDrone.Core.Test.JobTests public void should_throw_if_seasonId_is_less_than_zero() { Assert.Throws(() => - Mocker.Resolve().Start(_testNotification, new { SeriesId = _series.SeriesId, SeasonNumber = -10 })); + Mocker.Resolve().Start(_testNotification, new { SeriesId = _series.OID, SeasonNumber = -10 })); } [Test] public void should_log_warning_if_no_episode_files_are_found() { - Mocker.Resolve().Start(_testNotification, new { SeriesId = _series.SeriesId, SeasonNumber = 10 }); + Mocker.Resolve().Start(_testNotification, new { SeriesId = _series.OID, SeasonNumber = 10 }); ExceptionVerification.ExpectedWarns(1); } @@ -77,7 +77,7 @@ namespace NzbDrone.Core.Test.JobTests [Test] public void should_return_if_no_episodes_are_moved() { - Mocker.Resolve().Start(_testNotification, new { SeriesId = _series.SeriesId, SeasonNumber = 5 }); + Mocker.Resolve().Start(_testNotification, new { SeriesId = _series.OID, SeasonNumber = 5 }); Mocker.GetMock().Verify(v => v.RemoveForEpisodeFiles(It.IsAny>()), Times.Never()); } @@ -86,7 +86,7 @@ namespace NzbDrone.Core.Test.JobTests public void should_return_process_metadata_if_files_are_moved() { WithMovedFiles(); - Mocker.Resolve().Start(_testNotification, new { SeriesId = _series.SeriesId, SeasonNumber = 5 }); + Mocker.Resolve().Start(_testNotification, new { SeriesId = _series.OID, SeasonNumber = 5 }); Mocker.GetMock().Verify(v => v.RemoveForEpisodeFiles(It.IsAny>()), Times.Once()); } diff --git a/NzbDrone.Core.Test/ProviderTests/BannerProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/BannerProviderTest.cs index 6188376bb..36e1b61b2 100644 --- a/NzbDrone.Core.Test/ProviderTests/BannerProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/BannerProviderTest.cs @@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test.ProviderTests WithTempAsAppPath(); _series = Builder.CreateNew() - .With(s => s.SeriesId = 12345) + .With(s => s.OID = 12345) .Build(); var path = @"C:\Windows\Temp"; diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs index a14289078..05f6a8fe4 100644 --- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs @@ -81,7 +81,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests .Build(); var series = Builder.CreateNew() - .With(s => s.SeriesId = seriesId) + .With(s => s.OID = seriesId) .With(s => s.Title = "The Office") .Build(); diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs index 0816c8bf8..f3d785d35 100644 --- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs @@ -28,13 +28,13 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests public void should_not_move_file_if_source_and_destination_are_the_same_path() { var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 5) + .With(s => s.OID = 5) .With(s => s.Title = "30 Rock") .Build(); var fakeEpisode = Builder.CreateListOfSize(1) .All() - .With(e => e.SeriesId = fakeSeries.SeriesId) + .With(e => e.SeriesId = fakeSeries.OID) .With(e => e.SeasonNumber = 1) .With(e => e.EpisodeNumber = 1) .Build(); @@ -43,12 +43,12 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests var fi = new FileInfo(Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", filename + ".avi")); var file = Builder.CreateNew() - .With(f => f.SeriesId = fakeSeries.SeriesId) + .With(f => f.SeriesId = fakeSeries.OID) .With(f => f.Path = fi.FullName) .Build(); Mocker.GetMock() - .Setup(e => e.Get(fakeSeries.SeriesId)) + .Setup(e => e.Get(fakeSeries.OID)) .Returns(fakeSeries); Mocker.GetMock() @@ -74,13 +74,13 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests public void should_use_EpisodeFiles_quality() { var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 5) + .With(s => s.OID = 5) .With(s => s.Title = "30 Rock") .Build(); var fakeEpisode = Builder.CreateListOfSize(1) .All() - .With(e => e.SeriesId = fakeSeries.SeriesId) + .With(e => e.SeriesId = fakeSeries.OID) .With(e => e.SeasonNumber = 1) .With(e => e.EpisodeNumber = 1) .Build(); @@ -91,14 +91,14 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests const string message = "30 Rock - 1x01 - [WEBDL]"; var file = Builder.CreateNew() - .With(f => f.SeriesId = fakeSeries.SeriesId) + .With(f => f.SeriesId = fakeSeries.OID) .With(f => f.Path = currentFilename) .With(f => f.Quality = QualityTypes.WEBDL720p) .With(f => f.Proper = false) .Build(); Mocker.GetMock() - .Setup(e => e.Get(fakeSeries.SeriesId)) + .Setup(e => e.Get(fakeSeries.OID)) .Returns(fakeSeries); Mocker.GetMock() @@ -133,13 +133,13 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests public void should_log_error_and_return_null_when_source_file_does_not_exists() { var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 5) + .With(s => s.OID = 5) .With(s => s.Title = "30 Rock") .Build(); var fakeEpisode = Builder.CreateListOfSize(1) .All() - .With(e => e.SeriesId = fakeSeries.SeriesId) + .With(e => e.SeriesId = fakeSeries.OID) .With(e => e.SeasonNumber = 1) .With(e => e.EpisodeNumber = 1) .Build(); @@ -150,14 +150,14 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests const string message = "30 Rock - 1x01 - [WEBDL]"; var file = Builder.CreateNew() - .With(f => f.SeriesId = fakeSeries.SeriesId) + .With(f => f.SeriesId = fakeSeries.OID) .With(f => f.Path = currentFilename) .With(f => f.Quality = QualityTypes.WEBDL720p) .With(f => f.Proper = false) .Build(); Mocker.GetMock() - .Setup(e => e.Get(fakeSeries.SeriesId)) + .Setup(e => e.Get(fakeSeries.OID)) .Returns(fakeSeries); Mocker.GetMock() diff --git a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs index 86a1c3b8b..e5a72b583 100644 --- a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs @@ -97,7 +97,7 @@ namespace NzbDrone.Core.Test.ProviderTests .Returns(true); var series = Builder.CreateNew() - .With(s => s.SeriesId = 12).Build(); + .With(s => s.OID = 12).Build(); //Act Mocker.Resolve().Scan(series); diff --git a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs index b0ef9a5ac..809731f06 100644 --- a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.ProviderTests.Metadata series = Builder .CreateNew() - .With(s => s.SeriesId == 79488) + .With(s => s.OID == 79488) .With(s => s.Title == "30 Rock") .Build(); diff --git a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForSeries_Fixture.cs b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForSeries_Fixture.cs index b488c3cb5..35f6cd305 100644 --- a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForSeries_Fixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForSeries_Fixture.cs @@ -37,7 +37,7 @@ namespace NzbDrone.Core.Test.ProviderTests.Metadata series = Builder .CreateNew() - .With(s => s.SeriesId == 79488) + .With(s => s.OID == 79488) .With(s => s.Title == "30 Rock") .Build(); diff --git a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs index 70b591abb..e4a738055 100644 --- a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs @@ -72,7 +72,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests { var fakeEpisodeFiles = Builder.CreateListOfSize(2) .All() - .With(f => f.SeriesId = fakeSeries.SeriesId) + .With(f => f.SeriesId = fakeSeries.OID) .Build().ToList(); Mocker.GetMock().Setup(s => s.Scan(fakeSeries, droppedFolder)).Returns(fakeEpisodeFiles); @@ -224,7 +224,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests var fakeEpisodeFiles = Builder.CreateListOfSize(2) .All() - .With(f => f.SeriesId = fakeSeries.SeriesId) + .With(f => f.SeriesId = fakeSeries.OID) .Build().ToList(); //Act diff --git a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessVideoFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessVideoFileFixture.cs index a7ccf8eb8..2ca1b85b0 100644 --- a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessVideoFileFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessVideoFileFixture.cs @@ -71,7 +71,7 @@ namespace NzbDrone.Core.Test.ProviderTests.PostDownloadProviderTests private void WithImportedFile(string file) { var fakeEpisodeFile = Builder.CreateNew() - .With(f => f.SeriesId = fakeSeries.SeriesId) + .With(f => f.SeriesId = fakeSeries.OID) .Build(); Mocker.GetMock().Setup(s => s.ImportFile(fakeSeries, file)).Returns(fakeEpisodeFile); diff --git a/NzbDrone.Core.Test/ProviderTests/ReferenceDataProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/ReferenceDataProviderTest.cs index 801fe8e87..19a5f474a 100644 --- a/NzbDrone.Core.Test/ProviderTests/ReferenceDataProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/ReferenceDataProviderTest.cs @@ -138,11 +138,11 @@ namespace NzbDrone.Core.Test.ProviderTests .All() .With(s => s.SeriesType = SeriesType.Standard) .TheFirst(1) - .With(s => s.SeriesId = 10) + .With(s => s.OID = 10) .TheNext(1) - .With(s => s.SeriesId = 11) + .With(s => s.OID = 11) .TheNext(1) - .With(s => s.SeriesId = 12) + .With(s => s.OID = 12) .Build(); Db.InsertMany(fakeSeries); @@ -170,12 +170,12 @@ namespace NzbDrone.Core.Test.ProviderTests .All() .With(s => s.SeriesType = SeriesType.Standard) .TheFirst(1) - .With(s => s.SeriesId = 10) + .With(s => s.OID = 10) .With(s => s.SeriesType = SeriesType.Daily) .TheNext(1) - .With(s => s.SeriesId = 11) + .With(s => s.OID = 11) .TheNext(1) - .With(s => s.SeriesId = 12) + .With(s => s.OID = 12) .Build(); Db.InsertMany(fakeSeries); diff --git a/NzbDrone.Core.Test/ProviderTests/SearchHistoryProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/SearchHistoryProviderTest.cs index ca013b453..3507df51c 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchHistoryProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchHistoryProviderTest.cs @@ -45,7 +45,7 @@ namespace NzbDrone.Core.Test.ProviderTests _searchHistory = Builder.CreateNew() .With(h => h.EpisodeId = _episode.OID) - .With(h => h.SeriesId - _series.SeriesId) + .With(h => h.SeriesId - _series.OID) .With(h => h.SearchHistoryItems = items) .Build(); } diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/CheckReportFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/CheckReportFixture.cs index c17b55f33..bfd03f18f 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/CheckReportFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/CheckReportFixture.cs @@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests.DailyEpisodeSearchTests _episode = Builder .CreateNew() - .With(e => e.SeriesId = _series.SeriesId) + .With(e => e.SeriesId = _series.OID) .With(e => e.Series = _series) .Build(); diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/CheckReportFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/CheckReportFixture.cs index 68e86b7a1..10c76e59f 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/CheckReportFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/CheckReportFixture.cs @@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests.EpisodeSearchTests _episode = Builder .CreateNew() - .With(e => e.SeriesId = _series.SeriesId) + .With(e => e.SeriesId = _series.OID) .With(e => e.Series = _series) .Build(); diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/GetSearchTitleFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/GetSearchTitleFixture.cs index 4119d5b24..e5142e4f8 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchTests/GetSearchTitleFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/GetSearchTitleFixture.cs @@ -29,7 +29,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests private void WithSceneMapping() { Mocker.GetMock() - .Setup(s => s.GetSceneName(_series.SeriesId, -1)) + .Setup(s => s.GetSceneName(_series.OID, -1)) .Returns("Hawaii Five 0 2010"); } @@ -53,7 +53,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests public void should_return_season_scene_name_when_one_exists() { Mocker.GetMock() - .Setup(s => s.GetSceneName(_series.SeriesId, 5)) + .Setup(s => s.GetSceneName(_series.OID, 5)) .Returns("Hawaii Five 0 2010 - Season 5"); Mocker.Resolve().GetSearchTitle(_series, 5) @@ -86,7 +86,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests _series.Title = input; Mocker.GetMock() - .Setup(s => s.GetSceneName(_series.SeriesId, -1)) + .Setup(s => s.GetSceneName(_series.OID, -1)) .Returns(""); Mocker.Resolve().GetSearchTitle(_series, 5) diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/CheckReportFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/CheckReportFixture.cs index 7ff08d54b..692775a40 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/CheckReportFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/CheckReportFixture.cs @@ -34,7 +34,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests.PartialSeasonSearchTests _episodes = Builder .CreateListOfSize(10) .All() - .With(e => e.SeriesId = _series.SeriesId) + .With(e => e.SeriesId = _series.OID) .With(e => e.Series = _series) .Build() .ToList(); diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs index 5446d56db..b0386cce1 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs @@ -36,14 +36,14 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests _episode = Builder .CreateNew() - .With(e => e.SeriesId = _series.SeriesId) + .With(e => e.SeriesId = _series.OID) .With(e => e.Series = _series) .Build(); _episodes = Builder .CreateListOfSize(10) .All() - .With(e => e.SeriesId = _series.SeriesId) + .With(e => e.SeriesId = _series.OID) .With(e => e.Series = _series) .Build() .ToList(); diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs index acb49927f..ebb2062c3 100644 --- a/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs @@ -36,12 +36,12 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests public void Setup() { _matchingSeries = Builder.CreateNew() - .With(s => s.SeriesId = 79488) + .With(s => s.OID = 79488) .With(s => s.Title = "30 Rock") .Build(); _mismatchedSeries = Builder.CreateNew() - .With(s => s.SeriesId = 12345) + .With(s => s.OID = 12345) .With(s => s.Title = "Not 30 Rock") .Build(); diff --git a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs index 6604151cf..a4c903dec 100644 --- a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs @@ -46,11 +46,11 @@ namespace NzbDrone.Core.Test.ProviderTests.TvRageMappingProviderTests .Build(); Mocker.GetMock() - .Setup(s => s.GetEpisode(_series.SeriesId, 1, 1)) + .Setup(s => s.GetEpisode(_series.OID, 1, 1)) .Returns(_episode); Mocker.GetMock() - .Setup(s => s.GetCleanName(_series.SeriesId)) + .Setup(s => s.GetCleanName(_series.OID)) .Returns(""); Mocker.GetMock() diff --git a/NzbDrone.Core.Test/ProviderTests/UpcomingEpisodesProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/UpcomingEpisodesProviderTest.cs index 661c3e396..4e7dd0a1c 100644 --- a/NzbDrone.Core.Test/ProviderTests/UpcomingEpisodesProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/UpcomingEpisodesProviderTest.cs @@ -43,7 +43,7 @@ namespace NzbDrone.Core.Test.ProviderTests .Build(); series = Builder.CreateNew() - .With(s => s.SeriesId = 1) + .With(s => s.OID = 1) .And(c => c.Monitored = true) .Build(); @@ -71,7 +71,7 @@ namespace NzbDrone.Core.Test.ProviderTests //Assert result.Should().HaveCount(5); - result.Should().OnlyContain(c => c.Series != null && c.SeriesId == series.SeriesId); + result.Should().OnlyContain(c => c.Series != null && c.SeriesId == series.OID); } [Test] diff --git a/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs index 4de9d9a0c..64b599679 100644 --- a/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs +++ b/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs @@ -465,7 +465,7 @@ namespace NzbDrone.Core.Test.ProviderTests var url = "http://localhost:8080/xbmcCmds/xbmcHttp?command=ExecBuiltIn(UpdateLibrary(video,smb://xbmc:xbmc@HOMESERVER/TV/30 Rock/))"; var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 79488) + .With(s => s.OID = 79488) .With(s => s.Title = "30 Rock") .Build(); @@ -491,7 +491,7 @@ namespace NzbDrone.Core.Test.ProviderTests var url = "http://localhost:8080/xbmcCmds/xbmcHttp?command=ExecBuiltIn(UpdateLibrary(video))"; var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 79488) + .With(s => s.OID = 79488) .With(s => s.Title = "30 Rock") .Build(); @@ -519,7 +519,7 @@ namespace NzbDrone.Core.Test.ProviderTests var tvshows = "{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"limits\":{\"end\":5,\"start\":0,\"total\":5},\"tvshows\":[{\"file\":\"smb://HOMESERVER/TV/7th Heaven/\",\"imdbnumber\":\"73928\",\"label\":\"7th Heaven\",\"tvshowid\":3},{\"file\":\"smb://HOMESERVER/TV/8 Simple Rules/\",\"imdbnumber\":\"78461\",\"label\":\"8 Simple Rules\",\"tvshowid\":4},{\"file\":\"smb://HOMESERVER/TV/24-7 Penguins-Capitals- Road to the NHL Winter Classic/\",\"imdbnumber\":\"213041\",\"label\":\"24/7 Penguins/Capitals: Road to the NHL Winter Classic\",\"tvshowid\":1},{\"file\":\"smb://HOMESERVER/TV/30 Rock/\",\"imdbnumber\":\"79488\",\"label\":\"30 Rock\",\"tvshowid\":2},{\"file\":\"smb://HOMESERVER/TV/90210/\",\"imdbnumber\":\"82716\",\"label\":\"90210\",\"tvshowid\":5}]}}"; var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 79488) + .With(s => s.OID = 79488) .With(s => s.Title = "30 Rock") .Build(); @@ -552,7 +552,7 @@ namespace NzbDrone.Core.Test.ProviderTests var tvshows = "{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"limits\":{\"end\":5,\"start\":0,\"total\":5},\"tvshows\":[{\"file\":\"smb://HOMESERVER/TV/7th Heaven/\",\"imdbnumber\":\"73928\",\"label\":\"7th Heaven\",\"tvshowid\":3},{\"file\":\"smb://HOMESERVER/TV/8 Simple Rules/\",\"imdbnumber\":\"78461\",\"label\":\"8 Simple Rules\",\"tvshowid\":4},{\"file\":\"smb://HOMESERVER/TV/24-7 Penguins-Capitals- Road to the NHL Winter Classic/\",\"imdbnumber\":\"213041\",\"label\":\"24/7 Penguins/Capitals: Road to the NHL Winter Classic\",\"tvshowid\":1},{\"file\":\"smb://HOMESERVER/TV/90210/\",\"imdbnumber\":\"82716\",\"label\":\"90210\",\"tvshowid\":5}]}}"; var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 79488) + .With(s => s.OID = 79488) .With(s => s.Title = "30 Rock") .Build(); @@ -585,7 +585,7 @@ namespace NzbDrone.Core.Test.ProviderTests var tvshows = "{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"limits\":{\"end\":5,\"start\":0,\"total\":5},\"tvshows\":[{\"file\":\"smb://HOMESERVER/TV/7th Heaven/\",\"imdbnumber\":\"73928\",\"label\":\"7th Heaven\",\"tvshowid\":3},{\"file\":\"smb://HOMESERVER/TV/8 Simple Rules/\",\"imdbnumber\":\"78461\",\"label\":\"8 Simple Rules\",\"tvshowid\":4},{\"file\":\"smb://HOMESERVER/TV/24-7 Penguins-Capitals- Road to the NHL Winter Classic/\",\"imdbnumber\":\"213041\",\"label\":\"24/7 Penguins/Capitals: Road to the NHL Winter Classic\",\"tvshowid\":1},{\"file\":\"smb://HOMESERVER/TV/30 Rock/\",\"imdbnumber\":\"79488\",\"label\":\"30 Rock\",\"tvshowid\":2},{\"file\":\"smb://HOMESERVER/TV/90210/\",\"imdbnumber\":\"82716\",\"label\":\"90210\",\"tvshowid\":5}]}}"; var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 79488) + .With(s => s.OID = 79488) .With(s => s.Title = "30 Rock") .Build(); @@ -617,7 +617,7 @@ namespace NzbDrone.Core.Test.ProviderTests var tvshows = "{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"limits\":{\"end\":5,\"start\":0,\"total\":5},\"tvshows\":[{\"file\":\"smb://HOMESERVER/TV/7th Heaven/\",\"imdbnumber\":\"73928\",\"label\":\"7th Heaven\",\"tvshowid\":3},{\"file\":\"smb://HOMESERVER/TV/8 Simple Rules/\",\"imdbnumber\":\"78461\",\"label\":\"8 Simple Rules\",\"tvshowid\":4},{\"file\":\"smb://HOMESERVER/TV/24-7 Penguins-Capitals- Road to the NHL Winter Classic/\",\"imdbnumber\":\"213041\",\"label\":\"24/7 Penguins/Capitals: Road to the NHL Winter Classic\",\"tvshowid\":1},{\"file\":\"smb://HOMESERVER/TV/90210/\",\"imdbnumber\":\"82716\",\"label\":\"90210\",\"tvshowid\":5}]}}"; var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 79488) + .With(s => s.OID = 79488) .With(s => s.Title = "30 Rock") .Build(); diff --git a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs index 867317f4c..692336248 100644 --- a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs +++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs @@ -50,7 +50,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithRealDb(); var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 1) + .With(s => s.OID = 1) .Build(); var fakeEpisodes = Builder.CreateNew() .With(e => e.SeriesId = 1) @@ -61,7 +61,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests Db.Insert(fakeEpisodes); //Act - var episode = Mocker.Resolve().GetEpisode(fakeSeries.SeriesId, 2, 1); + var episode = Mocker.Resolve().GetEpisode(fakeSeries.OID, 2, 1); //Assert episode.ShouldHave().AllPropertiesBut(e => e.Series).EqualTo(fakeEpisodes); @@ -128,7 +128,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithRealDb(); var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 12) + .With(s => s.OID = 12) .Build(); var episodes = Builder.CreateListOfSize(10) @@ -162,7 +162,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); @@ -196,7 +196,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); @@ -237,7 +237,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); Db.Insert(fakeSeries); @@ -274,7 +274,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); @@ -313,7 +313,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); @@ -351,7 +351,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); @@ -384,7 +384,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); @@ -417,7 +417,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); @@ -452,7 +452,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); @@ -484,7 +484,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); var currentEpisodes = new List(); @@ -515,7 +515,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); var currentEpisodes = new List(); foreach (var tvDbEpisode in tvdbSeries.Episodes) @@ -553,7 +553,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests ) .Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); var fakeEpisodeList = new List { new Episode { TvDbEpisodeId = 99, SeasonNumber = 10, EpisodeNumber = 10, Series = fakeSeries } }; Mocker.GetMock() @@ -595,7 +595,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); Mocker.GetMock(MockBehavior.Strict) .Setup(c => c.GetSeries(seriesId, true, false)) @@ -621,7 +621,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); var currentEpisodes = new List(); foreach (var tvDbEpisode in tvdbSeries.Episodes) @@ -670,7 +670,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); var currentEpisodes = new List(); foreach (var tvDbEpisode in tvdbSeries.Episodes) @@ -716,7 +716,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); var currentEpisodes = new List(); foreach (var tvDbEpisode in tvdbSeries.Episodes) @@ -784,7 +784,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); @@ -1121,7 +1121,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithRealDb(); var series = Builder.CreateNew() - .With(s => s.SeriesId = 10) + .With(s => s.OID = 10) .Build(); var episodes = Builder.CreateListOfSize(4) @@ -1164,7 +1164,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithRealDb(); var series = Builder.CreateNew() - .With(s => s.SeriesId = 10) + .With(s => s.OID = 10) .Build(); var episodes = Builder.CreateListOfSize(4) @@ -1208,7 +1208,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithRealDb(); var series = Builder.CreateNew() - .With(s => s.SeriesId = 10) + .With(s => s.OID = 10) .Build(); var episodeFile = Builder.CreateNew() @@ -1252,7 +1252,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithRealDb(); var series = Builder.CreateNew() - .With(s => s.SeriesId = 10) + .With(s => s.OID = 10) .Build(); var episodes = Builder.CreateListOfSize(2) @@ -1281,7 +1281,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithRealDb(); var series = Builder.CreateNew() - .With(s => s.SeriesId = 10) + .With(s => s.OID = 10) .Build(); var fakeEpisodes = Builder.CreateListOfSize(2) @@ -1308,7 +1308,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithRealDb(); var series = Builder.CreateNew() - .With(s => s.SeriesId = 10) + .With(s => s.OID = 10) .Build(); var fakeEpisode = Builder.CreateNew() @@ -1400,7 +1400,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithRealDb(); var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 12345) + .With(s => s.OID = 12345) .With(s => s.CleanTitle = "officeus") .Build(); @@ -1432,7 +1432,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests var postDownloadStatus = PostDownloadStatusType.Failed; var fakeSeries = Builder.CreateNew() - .With(s => s.SeriesId = 12345) + .With(s => s.OID = 12345) .With(s => s.CleanTitle = "officeus") .Build(); @@ -1489,7 +1489,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build()) ).With(c => c.Id = seriesId).Build(); - var fakeSeries = Builder.CreateNew().With(c => c.SeriesId = seriesId).Build(); + var fakeSeries = Builder.CreateNew().With(c => c.OID = seriesId).Build(); WithRealDb(); diff --git a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs index 5a522d8bf..fa13af32e 100644 --- a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs +++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs @@ -29,7 +29,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests var fakeSeries = Builder.CreateNew() - .With(c => c.SeriesId = seriesId) + .With(c => c.OID = seriesId) .Build(); var fakeEpisode = Builder.CreateNew() @@ -65,7 +65,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build(); var fakeSeries = Builder.CreateNew() - .With(c => c.SeriesId = seriesId) + .With(c => c.OID = seriesId) .Build(); var fakeEpisode = Builder.CreateNew() @@ -101,7 +101,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build(); var fakeSeries = Builder.CreateNew() - .With(c => c.SeriesId = seriesId) + .With(c => c.OID = seriesId) .Build(); var fakeEpisode = Builder.CreateNew() @@ -135,7 +135,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build(); var fakeSeries = Builder.CreateNew() - .With(c => c.SeriesId = seriesId) + .With(c => c.OID = seriesId) .Build(); var fakeEpisode = Builder.CreateNew() @@ -174,7 +174,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build(); var fakeSeries = Builder.CreateNew() - .With(c => c.SeriesId = seriesId) + .With(c => c.OID = seriesId) .Build(); var fakeEpisode = Builder.CreateNew() @@ -186,7 +186,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests //Other Series var otherFakeSeries = Builder.CreateNew() - .With(c => c.SeriesId = 12345) + .With(c => c.OID = 12345) .Build(); var otherFakeEpisode = Builder.CreateNew() diff --git a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs index affa46fd2..08403cb17 100644 --- a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs +++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs @@ -36,19 +36,19 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests .Build(); fakeEpisode = Builder.CreateNew() - .With(e => e.SeriesId = fakeSeries.SeriesId) + .With(e => e.SeriesId = fakeSeries.OID) .With(e => e.Title = "Episode (1)") .Build(); fakeEpisode2 = Builder.CreateNew() - .With(e => e.SeriesId = fakeSeries.SeriesId) + .With(e => e.SeriesId = fakeSeries.OID) .With(e => e.SeasonNumber = fakeEpisode.SeasonNumber) .With(e => e.EpisodeNumber = fakeEpisode.EpisodeNumber + 1) .With(e => e.Title = "Episode (2)") .Build(); fakeDailyEpisode = Builder.CreateNew() - .With(e => e.SeriesId = fakeSeries.SeriesId) + .With(e => e.SeriesId = fakeSeries.OID) .With(e => e.AirDate = DateTime.Now.Date) .With(e => e.Title = "Daily Episode 1") .Build(); diff --git a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs index e3d6741a7..ba857a55e 100644 --- a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs +++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs @@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests { _episode = Builder .CreateNew() - .With(e => e.SeriesId = _series.SeriesId) + .With(e => e.SeriesId = _series.OID) .Build(); Db.Insert(_episode); @@ -43,7 +43,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests { _episode = Builder .CreateNew() - .With(e => e.SeriesId = _series.SeriesId) + .With(e => e.SeriesId = _series.OID) .Build(); Db.Insert(_episode); @@ -52,14 +52,14 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests [Test] public void should_return_null_if_no_episodes_in_db() { - Mocker.Resolve().GetEpisodeBySceneNumbering(_series.SeriesId, 1, 1).Should().BeNull(); + Mocker.Resolve().GetEpisodeBySceneNumbering(_series.OID, 1, 1).Should().BeNull(); } [Test] public void should_return_null_if_no_matching_episode_is_found() { WithNullSceneNumbering(); - Mocker.Resolve().GetEpisodeBySceneNumbering(_series.SeriesId, 1, 1).Should().BeNull(); + Mocker.Resolve().GetEpisodeBySceneNumbering(_series.OID, 1, 1).Should().BeNull(); } [Test] @@ -68,7 +68,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests WithSceneNumbering(); var result = Mocker.Resolve() - .GetEpisodeBySceneNumbering(_series.SeriesId, _episode.SceneSeasonNumber, _episode.SceneEpisodeNumber); + .GetEpisodeBySceneNumbering(_series.OID, _episode.SceneSeasonNumber, _episode.SceneEpisodeNumber); result.OID.Should().Be(_episode.OID); } diff --git a/NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs b/NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs index f7c2c0e667cf0503de1309aaac4a3d02f9311950..8e06fcb1ac7680dd9e0e13ab7c7db6decb1e0e43 100644 GIT binary patch delta 16 XcmaDNbzf@3cNS)UPnXUASyDLwKH>(Y delta 21 ccmcaF^+amJcNUJ|)S}GPV$YP#zgSW^0BEQP;Q#;t diff --git a/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs b/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs index ac6ccca2b..3b8aaf7ab 100644 --- a/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs +++ b/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs @@ -1,5 +1,6 @@ using System.Linq; using NLog; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; diff --git a/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs b/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs index 076252efb..4ce7ba886 100644 --- a/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs +++ b/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs @@ -30,7 +30,7 @@ namespace NzbDrone.Core.DecisionEngine { foreach (var episode in subject.Episodes) { - var bestQualityInHistory = _historyService.GetBestQualityInHistory(subject.Series.SeriesId, episode.SeasonNumber, episode.EpisodeNumber); + var bestQualityInHistory = _historyService.GetBestQualityInHistory(subject.Series.OID, episode.SeasonNumber, episode.EpisodeNumber); if (bestQualityInHistory != null) { logger.Trace("Comparing history quality with report. History is {0}", bestQualityInHistory); diff --git a/NzbDrone.Core/History/HistoryRepository.cs b/NzbDrone.Core/History/HistoryRepository.cs index 34fcd535a..efab26ad1 100644 --- a/NzbDrone.Core/History/HistoryRepository.cs +++ b/NzbDrone.Core/History/HistoryRepository.cs @@ -27,7 +27,7 @@ namespace NzbDrone.Core.History public QualityModel GetBestQualityInHistory(int seriesId, int seasonNumber, int episodeNumber) { - var history = Queryable.OrderByDescending(c => c.Quality).FirstOrDefault(c => c.Episode.Series.SeriesId == seriesId && c.Episode.SeasonNumber == seasonNumber && + var history = Queryable.OrderByDescending(c => c.Quality).FirstOrDefault(c => c.Episode.Series.OID == seriesId && c.Episode.SeasonNumber == seasonNumber && c.Episode.EpisodeNumber == episodeNumber); if (history != null) diff --git a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs index 03ba79db7..e31adea08 100644 --- a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs +++ b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using NLog; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; @@ -65,7 +66,7 @@ namespace NzbDrone.Core.Jobs private void ScanSeries(ProgressNotification notification) { - var syncList = _seriesRepository.All().Where(s => s.LastInfoSync == null && !_attemptedSeries.Contains(s.SeriesId)).ToList(); + var syncList = _seriesRepository.All().Where(s => s.LastInfoSync == null && !_attemptedSeries.Contains(s.OID)).ToList(); if (syncList.Count == 0) { return; @@ -75,20 +76,20 @@ namespace NzbDrone.Core.Jobs { try { - _attemptedSeries.Add(currentSeries.OID); + _attemptedSeries.Add(((ModelBase)currentSeries).OID); notification.CurrentMessage = String.Format("Searching for '{0}'", new DirectoryInfo(currentSeries.Path).Name); - _updateInfoJob.Start(notification, new { SeriesId = currentSeries.OID }); - _diskScanJob.Start(notification, new { SeriesId = currentSeries.OID }); + _updateInfoJob.Start(notification, new { SeriesId = ((ModelBase)currentSeries).OID }); + _diskScanJob.Start(notification, new { SeriesId = ((ModelBase)currentSeries).OID }); - var updatedSeries = _seriesRepository.Get(currentSeries.OID); - AutoIgnoreSeasons(updatedSeries.OID); + var updatedSeries = _seriesRepository.Get(((ModelBase)currentSeries).OID); + AutoIgnoreSeasons(((ModelBase)updatedSeries).OID); //Download the banner for the new series - _bannerDownloadJob.Start(notification, new { SeriesId = updatedSeries.OID }); + _bannerDownloadJob.Start(notification, new { SeriesId = ((ModelBase)updatedSeries).OID }); //Get Scene Numbering if applicable - _xemUpdateJob.Start(notification, new { SeriesId = updatedSeries.OID }); + _xemUpdateJob.Start(notification, new { SeriesId = ((ModelBase)updatedSeries).OID }); notification.CurrentMessage = String.Format("{0} was successfully imported", updatedSeries.Title); } diff --git a/NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs b/NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs index 4b7c4d348..b4c2f02f5 100644 --- a/NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs +++ b/NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System; using NLog; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; diff --git a/NzbDrone.Core/Jobs/RenameSeriesJob.cs b/NzbDrone.Core/Jobs/RenameSeriesJob.cs index 6d976f830..22e13577d 100644 --- a/NzbDrone.Core/Jobs/RenameSeriesJob.cs +++ b/NzbDrone.Core/Jobs/RenameSeriesJob.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System; using NLog; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Providers; diff --git a/NzbDrone.Core/Jobs/UpdateInfoJob.cs b/NzbDrone.Core/Jobs/UpdateInfoJob.cs index 3a3bc55b1..e59cb9acb 100644 --- a/NzbDrone.Core/Jobs/UpdateInfoJob.cs +++ b/NzbDrone.Core/Jobs/UpdateInfoJob.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using NLog; using NzbDrone.Core.Configuration; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Helpers; using NzbDrone.Core.Model.Notification; diff --git a/NzbDrone.Core/Providers/BannerProvider.cs b/NzbDrone.Core/Providers/BannerProvider.cs index 6b055f96b..d9df7225d 100644 --- a/NzbDrone.Core/Providers/BannerProvider.cs +++ b/NzbDrone.Core/Providers/BannerProvider.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text; using NLog; using NzbDrone.Common; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Model.Notification; using NzbDrone.Core.Repository; diff --git a/NzbDrone.Core/Providers/DiskScanProvider.cs b/NzbDrone.Core/Providers/DiskScanProvider.cs index b0be4a91c..677b7c057 100644 --- a/NzbDrone.Core/Providers/DiskScanProvider.cs +++ b/NzbDrone.Core/Providers/DiskScanProvider.cs @@ -5,6 +5,7 @@ using System.Linq; using NLog; using NzbDrone.Common; using NzbDrone.Core.Configuration; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Download; using NzbDrone.Core.Tv; using NzbDrone.Core.Model; diff --git a/NzbDrone.Core/Providers/Metadata/Xbmc.cs b/NzbDrone.Core/Providers/Metadata/Xbmc.cs index 7bf51fc35..da08b1abc 100644 --- a/NzbDrone.Core/Providers/Metadata/Xbmc.cs +++ b/NzbDrone.Core/Providers/Metadata/Xbmc.cs @@ -6,6 +6,7 @@ using System.Xml; using System.Xml.Linq; using NzbDrone.Common; using NzbDrone.Core.Configuration; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.Core; diff --git a/NzbDrone.Core/Providers/MetadataProvider.cs b/NzbDrone.Core/Providers/MetadataProvider.cs index 3a4e094f0..f68c56b35 100644 --- a/NzbDrone.Core/Providers/MetadataProvider.cs +++ b/NzbDrone.Core/Providers/MetadataProvider.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using NLog; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Model; using NzbDrone.Core.Providers.ExternalNotification; diff --git a/NzbDrone.Core/Providers/Search/SearchBase.cs b/NzbDrone.Core/Providers/Search/SearchBase.cs index 1de8f2725..82da86285 100644 --- a/NzbDrone.Core/Providers/Search/SearchBase.cs +++ b/NzbDrone.Core/Providers/Search/SearchBase.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using NLog; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Download; using NzbDrone.Core.Indexers; using NzbDrone.Core.Tv; @@ -109,7 +110,7 @@ namespace NzbDrone.Core.Providers.Search logger.Trace("Analysing report " + episodeParseResult); episodeParseResult.Series = _seriesRepository.GetByTitle(episodeParseResult.CleanTitle); - if(episodeParseResult.Series == null || episodeParseResult.Series.OID != series.OID) + if(episodeParseResult.Series == null || ((ModelBase)episodeParseResult.Series).OID != series.OID) { item.SearchError = ReportRejectionType.WrongSeries; continue; diff --git a/NzbDrone.Core/Providers/TvRageMappingProvider.cs b/NzbDrone.Core/Providers/TvRageMappingProvider.cs index 1c3ca397f..6c430e4ac 100644 --- a/NzbDrone.Core/Providers/TvRageMappingProvider.cs +++ b/NzbDrone.Core/Providers/TvRageMappingProvider.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using NLog; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Model.TvRage; using NzbDrone.Core.Repository; @@ -33,7 +34,7 @@ namespace NzbDrone.Core.Providers { var firstEpisode = _episodeService.GetEpisode(series.OID, 1, 1); - var cleanName = _sceneMappingProvider.GetCleanName(series.SeriesId); + var cleanName = _sceneMappingProvider.GetCleanName(series.OID); var results = _tvRageProvider.SearchSeries(series.Title); var result = ProcessResults(results, series, cleanName, firstEpisode); diff --git a/NzbDrone.Core/Providers/XbmcProvider.cs b/NzbDrone.Core/Providers/XbmcProvider.cs index e94200971..84fc392c9 100644 --- a/NzbDrone.Core/Providers/XbmcProvider.cs +++ b/NzbDrone.Core/Providers/XbmcProvider.cs @@ -138,7 +138,7 @@ namespace NzbDrone.Core.Providers Logger.Trace("Failed to get TV Shows from XBMC"); else - path = xbmcShows.FirstOrDefault(s => s.ImdbNumber == series.SeriesId || s.Label == series.Title); + path = xbmcShows.FirstOrDefault(s => s.ImdbNumber == series.OID || s.Label == series.Title); //var hostOnly = GetHostWithoutPort(host); @@ -179,7 +179,7 @@ namespace NzbDrone.Core.Providers Logger.Trace("Failed to get TV Shows from XBMC"); else - path = xbmcShows.FirstOrDefault(s => s.ImdbNumber == series.SeriesId || s.Label == series.Title); + path = xbmcShows.FirstOrDefault(s => s.ImdbNumber == series.OID || s.Label == series.Title); var postJson = new JObject(); postJson.Add(new JProperty("jsonrpc", "2.0")); @@ -221,7 +221,7 @@ namespace NzbDrone.Core.Providers try { Logger.Trace("Sending Update DB Request to XBMC Host: {0}", host); - var xbmcSeriesPath = GetXbmcSeriesPath(host, series.SeriesId, username, password); + var xbmcSeriesPath = GetXbmcSeriesPath(host, series.OID, username, password); //If the path is found update it, else update the whole library if (!String.IsNullOrEmpty(xbmcSeriesPath)) diff --git a/NzbDrone.Core/Providers/XemProvider.cs b/NzbDrone.Core/Providers/XemProvider.cs index 5b421aaad..780ac8e9c 100644 --- a/NzbDrone.Core/Providers/XemProvider.cs +++ b/NzbDrone.Core/Providers/XemProvider.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using NLog; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Tv; using NzbDrone.Core.Repository; @@ -37,7 +38,7 @@ namespace NzbDrone.Core.Providers { var ids = _xemCommunicationProvider.GetXemSeriesIds(); var series = _seriesRepository.All(); - var wantedSeries = series.Where(s => ids.Contains(s.SeriesId)).ToList(); + var wantedSeries = series.Where(s => ids.Contains(s.OID)).ToList(); foreach(var ser in wantedSeries) { @@ -81,7 +82,7 @@ namespace NzbDrone.Core.Providers try { var episodesToUpdate = new List(); - var mappings = _xemCommunicationProvider.GetSceneTvdbMappings(series.SeriesId); + var mappings = _xemCommunicationProvider.GetSceneTvdbMappings(series.OID); if (mappings == null) { diff --git a/NzbDrone.Core/Tv/EpisodeService.cs b/NzbDrone.Core/Tv/EpisodeService.cs index 0521663d1..3b7fc537d 100644 --- a/NzbDrone.Core/Tv/EpisodeService.cs +++ b/NzbDrone.Core/Tv/EpisodeService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using NLog; using NzbDrone.Common.Eventing; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Download; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; @@ -94,7 +95,7 @@ namespace NzbDrone.Core.Tv return new List(); } - var episodeInfo = GetEpisode(parseResult.Series.OID, parseResult.AirDate.Value); + var episodeInfo = GetEpisode(((ModelBase)parseResult.Series).OID, parseResult.AirDate.Value); if (episodeInfo != null) { @@ -116,14 +117,14 @@ namespace NzbDrone.Core.Tv Episode episodeInfo = null; if (parseResult.SceneSource && parseResult.Series.UseSceneNumbering) - episodeInfo = GetEpisodeBySceneNumbering(parseResult.Series.OID, parseResult.SeasonNumber, episodeNumber); + episodeInfo = GetEpisodeBySceneNumbering(((ModelBase)parseResult.Series).OID, parseResult.SeasonNumber, episodeNumber); if (episodeInfo == null) { - episodeInfo = GetEpisode(parseResult.Series.OID, parseResult.SeasonNumber, episodeNumber); + episodeInfo = GetEpisode(((ModelBase)parseResult.Series).OID, parseResult.SeasonNumber, episodeNumber); if (episodeInfo == null && parseResult.AirDate != null) { - episodeInfo = GetEpisode(parseResult.Series.OID, parseResult.AirDate.Value); + episodeInfo = GetEpisode(((ModelBase)parseResult.Series).OID, parseResult.AirDate.Value); } } @@ -180,7 +181,7 @@ namespace NzbDrone.Core.Tv var successCount = 0; var failCount = 0; - var tvdbEpisodes = _tvDbProvider.GetSeries(series.SeriesId, true) + var tvdbEpisodes = _tvDbProvider.GetSeries(series.OID, true) .Episodes .Where(episode => !string.IsNullOrWhiteSpace(episode.EpisodeName) || (episode.FirstAired < DateTime.Now.AddDays(2) && episode.FirstAired.Year > 1900)) diff --git a/NzbDrone.Core/Tv/Series.cs b/NzbDrone.Core/Tv/Series.cs index 03abdacb6..ed71c7b1b 100644 --- a/NzbDrone.Core/Tv/Series.cs +++ b/NzbDrone.Core/Tv/Series.cs @@ -19,7 +19,7 @@ namespace NzbDrone.Core.Tv public class Series : ModelBase { - public virtual int SeriesId { get; set; } + public int TvDbId { get; set; } public string Title { get; set; } diff --git a/NzbDrone.Core/Tv/SeriesService.cs b/NzbDrone.Core/Tv/SeriesService.cs index 92bfc6f7e..a060dcf48 100644 --- a/NzbDrone.Core/Tv/SeriesService.cs +++ b/NzbDrone.Core/Tv/SeriesService.cs @@ -6,6 +6,7 @@ using NLog; using NzbDrone.Common.EnsureThat; using NzbDrone.Common.Eventing; using NzbDrone.Core.Configuration; +using NzbDrone.Core.Datastore; using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.Core; @@ -58,8 +59,8 @@ namespace NzbDrone.Core.Tv public Series UpdateSeriesInfo(int seriesId) { var series = _seriesRepository.Get(seriesId); - var tvDbSeries = _tvDbProvider.GetSeries(series.SeriesId, false, true); - + var tvDbSeries = _tvDbProvider.GetSeries(series.OID, false, true); + series.Title = tvDbSeries.SeriesName; series.AirTime = CleanAirsTime(tvDbSeries.AirsTime); series.AirsDayOfWeek = tvDbSeries.AirsDayOfWeek; @@ -118,7 +119,7 @@ namespace NzbDrone.Core.Tv Ensure.That(() => path).IsNotNullOrWhiteSpace(); var repoSeries = new Series(); - repoSeries.SeriesId = tvDbSeriesId; + repoSeries.TvDbId = tvDbSeriesId; repoSeries.Path = path; repoSeries.Monitored = true; repoSeries.QualityProfileId = qualityProfileId; @@ -145,7 +146,7 @@ namespace NzbDrone.Core.Tv foreach (var series in allSeries) { //Only update parameters that can be changed in MassEdit - var edited = editedSeries.Single(s => s.OID == series.OID); + var edited = editedSeries.Single(s => ((ModelBase)s).OID == series.OID); series.QualityProfileId = edited.QualityProfileId; series.Monitored = edited.Monitored; series.SeasonFolder = edited.SeasonFolder;