Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed circular dependency issue that stopped the app from starting.

This commit is contained in:
Keivan Beigi 2013-04-09 17:45:39 -07:00
parent 401ed9a8f6
commit e436072dcc
3 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
NzbDrone.Core/DataAugmentation/Scene/SceneMappingProvider.cs → NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs
View File

2
NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -188,7 +188,7 @@
<Compile Include="DataAugmentation\DailySeries\DailySeriesDataProxy.cs" /> <Compile Include="DataAugmentation\DailySeries\DailySeriesDataProxy.cs" />
<Compile Include="DataAugmentation\DailySeries\DailySeriesService.cs" /> <Compile Include="DataAugmentation\DailySeries\DailySeriesService.cs" />
<Compile Include="DataAugmentation\Scene\SceneMapping.cs" /> <Compile Include="DataAugmentation\Scene\SceneMapping.cs" />
<Compile Include="DataAugmentation\Scene\SceneMappingProvider.cs" /> <Compile Include="DataAugmentation\Scene\SceneMappingService.cs" />
<Compile Include="DataAugmentation\Scene\SceneMappingProxy.cs" /> <Compile Include="DataAugmentation\Scene\SceneMappingProxy.cs" />
<Compile Include="DataAugmentation\Scene\SceneMappingRepository.cs" /> <Compile Include="DataAugmentation\Scene\SceneMappingRepository.cs" />
<Compile Include="Datastore\Converters\BooleanIntConverter.cs" /> <Compile Include="Datastore\Converters\BooleanIntConverter.cs" />

29
NzbDrone.Core/Tv/SeriesService.cs
View File

@ -5,12 +5,8 @@ using NLog;
using NzbDrone.Common.EnsureThat; using NzbDrone.Common.EnsureThat;
using NzbDrone.Common.Eventing; using NzbDrone.Common.Eventing;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.DataAugmentation;
using NzbDrone.Core.DataAugmentation.Scene;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.MetadataSource; using NzbDrone.Core.MetadataSource;
using NzbDrone.Core.Model; using NzbDrone.Core.Model;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv.Events; using NzbDrone.Core.Tv.Events;
namespace NzbDrone.Core.Tv namespace NzbDrone.Core.Tv
@ -19,7 +15,6 @@ namespace NzbDrone.Core.Tv
{ {
bool IsMonitored(int id); bool IsMonitored(int id);
Series UpdateSeriesInfo(int seriesId); Series UpdateSeriesInfo(int seriesId);
Series FindSeries(string title);
Series GetSeries(int seriesId); Series GetSeries(int seriesId);
void AddSeries(Series newSeries); void AddSeries(Series newSeries);
void UpdateFromSeriesEditor(IList<Series> editedSeries); void UpdateFromSeriesEditor(IList<Series> editedSeries);
@ -34,22 +29,15 @@ namespace NzbDrone.Core.Tv
private readonly IConfigService _configService; private readonly IConfigService _configService;
private readonly IProvideSeriesInfo _seriesInfoProxy; private readonly IProvideSeriesInfo _seriesInfoProxy;
private readonly IEventAggregator _eventAggregator; private readonly IEventAggregator _eventAggregator;
private readonly IQualityProfileService _qualityProfileService;
private readonly Logger _logger; private readonly Logger _logger;
public SeriesService(ISeriesRepository seriesRepository, IConfigService configServiceService, IProvideSeriesInfo seriesInfoProxy,
private readonly ISceneMappingService _sceneNameMappingService; IEventAggregator eventAggregator, Logger logger)
public SeriesService(ISeriesRepository seriesRepository, IConfigService configServiceService,
IProvideSeriesInfo seriesInfoProxy, ISceneMappingService sceneNameMappingService,
IEventAggregator eventAggregator, IQualityProfileService qualityProfileService, Logger logger)
{ {
_seriesRepository = seriesRepository; _seriesRepository = seriesRepository;
_configService = configServiceService; _configService = configServiceService;
_seriesInfoProxy = seriesInfoProxy; _seriesInfoProxy = seriesInfoProxy;
_sceneNameMappingService = sceneNameMappingService;
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
_qualityProfileService = qualityProfileService;
_logger = logger; _logger = logger;
} }
@ -82,19 +70,6 @@ namespace NzbDrone.Core.Tv
return series; 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) public Series GetSeries(int seriesId)
{ {