From e436072dcc44e04e5ec001b51fa712eca8d6b0d1 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Tue, 9 Apr 2013 17:45:39 -0700 Subject: [PATCH] fixed circular dependency issue that stopped the app from starting. --- ...pingProvider.cs => SceneMappingService.cs} | 0 NzbDrone.Core/NzbDrone.Core.csproj | 2 +- NzbDrone.Core/Tv/SeriesService.cs | 29 ++----------------- 3 files changed, 3 insertions(+), 28 deletions(-) rename NzbDrone.Core/DataAugmentation/Scene/{SceneMappingProvider.cs => SceneMappingService.cs} (100%) diff --git a/NzbDrone.Core/DataAugmentation/Scene/SceneMappingProvider.cs b/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs similarity index 100% rename from NzbDrone.Core/DataAugmentation/Scene/SceneMappingProvider.cs rename to NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index cfa9cdb65..dbbd5a3dc 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -188,7 +188,7 @@ - + diff --git a/NzbDrone.Core/Tv/SeriesService.cs b/NzbDrone.Core/Tv/SeriesService.cs index cefe50207..717d5a238 100644 --- a/NzbDrone.Core/Tv/SeriesService.cs +++ b/NzbDrone.Core/Tv/SeriesService.cs @@ -5,12 +5,8 @@ using NLog; using NzbDrone.Common.EnsureThat; using NzbDrone.Common.Eventing; using NzbDrone.Core.Configuration; -using NzbDrone.Core.DataAugmentation; -using NzbDrone.Core.DataAugmentation.Scene; -using NzbDrone.Core.Datastore; using NzbDrone.Core.MetadataSource; using NzbDrone.Core.Model; -using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv.Events; namespace NzbDrone.Core.Tv @@ -19,7 +15,6 @@ namespace NzbDrone.Core.Tv { bool IsMonitored(int id); Series UpdateSeriesInfo(int seriesId); - Series FindSeries(string title); Series GetSeries(int seriesId); void AddSeries(Series newSeries); void UpdateFromSeriesEditor(IList editedSeries); @@ -34,22 +29,15 @@ namespace NzbDrone.Core.Tv private readonly IConfigService _configService; private readonly IProvideSeriesInfo _seriesInfoProxy; private readonly IEventAggregator _eventAggregator; - private readonly IQualityProfileService _qualityProfileService; private readonly Logger _logger; - - private readonly ISceneMappingService _sceneNameMappingService; - - public SeriesService(ISeriesRepository seriesRepository, IConfigService configServiceService, - IProvideSeriesInfo seriesInfoProxy, ISceneMappingService sceneNameMappingService, - IEventAggregator eventAggregator, IQualityProfileService qualityProfileService, Logger logger) + public SeriesService(ISeriesRepository seriesRepository, IConfigService configServiceService, IProvideSeriesInfo seriesInfoProxy, + IEventAggregator eventAggregator, Logger logger) { _seriesRepository = seriesRepository; _configService = configServiceService; _seriesInfoProxy = seriesInfoProxy; - _sceneNameMappingService = sceneNameMappingService; _eventAggregator = eventAggregator; - _qualityProfileService = qualityProfileService; _logger = logger; } @@ -82,19 +70,6 @@ namespace NzbDrone.Core.Tv return series; } - public Series FindSeries(string title) - { - var normalizeTitle = Parser.NormalizeTitle(title); - - var mapping = _sceneNameMappingService.GetTvDbId(normalizeTitle); - if (mapping.HasValue) - { - var sceneSeries = _seriesRepository.Get(mapping.Value); - return sceneSeries; - } - - return _seriesRepository.GetByTitle(normalizeTitle); - } public Series GetSeries(int seriesId) {