removed unused dependencies.
This commit is contained in:
parent
4877ce405e
commit
10f4dd5a60
|
@ -8,7 +8,6 @@ namespace NzbDrone.Common.SysTray
|
|||
{
|
||||
public class SysTrayApp : Form
|
||||
{
|
||||
private readonly ConfigFileProvider _configFileProvider;
|
||||
private readonly ProcessProvider _processProvider;
|
||||
private readonly IHostController _hostController;
|
||||
private readonly EnvironmentProvider _environmentProvider;
|
||||
|
@ -16,10 +15,8 @@ namespace NzbDrone.Common.SysTray
|
|||
private readonly NotifyIcon _trayIcon = new NotifyIcon();
|
||||
private readonly ContextMenu _trayMenu = new ContextMenu();
|
||||
|
||||
public SysTrayApp(ConfigFileProvider configFileProvider, ProcessProvider processProvider,
|
||||
IHostController hostController, EnvironmentProvider environmentProvider)
|
||||
public SysTrayApp(ProcessProvider processProvider, IHostController hostController, EnvironmentProvider environmentProvider)
|
||||
{
|
||||
_configFileProvider = configFileProvider;
|
||||
_processProvider = processProvider;
|
||||
_hostController = hostController;
|
||||
_environmentProvider = environmentProvider;
|
||||
|
@ -34,7 +31,7 @@ namespace NzbDrone.Common.SysTray
|
|||
_trayMenu.MenuItems.Add("Launch Browser", LaunchBrowser);
|
||||
_trayMenu.MenuItems.Add("-");
|
||||
_trayMenu.MenuItems.Add("Exit", OnExit);
|
||||
|
||||
|
||||
_trayIcon.Text = String.Format("NzbDrone - {0}", _environmentProvider.Version);
|
||||
_trayIcon.Icon = new Icon(Assembly.GetEntryAssembly().GetManifestResourceStream("NzbDrone.NzbDrone.ico"));
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests
|
|||
public TestSearch(ISeriesService seriesService, IEpisodeService episodeService, DownloadProvider downloadProvider,
|
||||
IIndexerService indexerService, SceneMappingService sceneMappingService,
|
||||
AllowedDownloadSpecification allowedDownloadSpecification, ISeriesRepository seriesRepository)
|
||||
: base(seriesService, seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingService,
|
||||
: base(seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingService,
|
||||
allowedDownloadSpecification)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -1,25 +1,13 @@
|
|||
using System.Linq;
|
||||
using NLog;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Model;
|
||||
|
||||
namespace NzbDrone.Core.DecisionEngine
|
||||
{
|
||||
public class LanguageSpecification
|
||||
{
|
||||
private readonly IConfigService _configService;
|
||||
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public LanguageSpecification(IConfigService configService)
|
||||
{
|
||||
_configService = configService;
|
||||
}
|
||||
|
||||
public LanguageSpecification()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public virtual bool IsSatisfiedBy(EpisodeParseResult subject)
|
||||
{
|
||||
logger.Trace("Checking if report meets language requirements. {0}", subject.Language);
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
using System.Linq;
|
||||
using NLog;
|
||||
using NzbDrone.Common;
|
||||
|
||||
namespace NzbDrone.Core.Instrumentation
|
||||
{
|
||||
|
@ -13,17 +11,10 @@ namespace NzbDrone.Core.Instrumentation
|
|||
public class LogService : ILogService
|
||||
{
|
||||
private readonly ILogRepository _logRepository;
|
||||
private readonly DiskProvider _diskProvider;
|
||||
private readonly EnvironmentProvider _environmentProvider;
|
||||
private readonly Logger _logger;
|
||||
|
||||
public LogService(ILogRepository logRepository, DiskProvider diskProvider,
|
||||
EnvironmentProvider environmentProvider, Logger logger)
|
||||
public LogService(ILogRepository logRepository)
|
||||
{
|
||||
_logRepository = logRepository;
|
||||
_diskProvider = diskProvider;
|
||||
_environmentProvider = environmentProvider;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public void DeleteAll()
|
||||
|
|
|
@ -12,16 +12,14 @@ namespace NzbDrone.Core.Jobs.Implementations
|
|||
{
|
||||
public class DiskScanJob : IJob
|
||||
{
|
||||
private readonly ISeriesService _seriesService;
|
||||
private readonly DiskScanProvider _diskScanProvider;
|
||||
private readonly IConfigService _configService;
|
||||
private readonly ISeriesRepository _seriesRepository;
|
||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public DiskScanJob(ISeriesService seriesService, DiskScanProvider diskScanProvider,
|
||||
public DiskScanJob(DiskScanProvider diskScanProvider,
|
||||
IConfigService configService, ISeriesRepository seriesRepository)
|
||||
{
|
||||
_seriesService = seriesService;
|
||||
_diskScanProvider = diskScanProvider;
|
||||
_configService = configService;
|
||||
_seriesRepository = seriesRepository;
|
||||
|
|
|
@ -16,8 +16,6 @@ namespace NzbDrone.Core.Jobs.Implementations
|
|||
/// </summary>
|
||||
public class ImportNewSeriesJob : IJob
|
||||
{
|
||||
private readonly ISeriesService _seriesService;
|
||||
private readonly IEpisodeService _episodeService;
|
||||
private readonly IMediaFileService _mediaFileService;
|
||||
private readonly UpdateInfoJob _updateInfoJob;
|
||||
private readonly DiskScanJob _diskScanJob;
|
||||
|
@ -30,13 +28,10 @@ namespace NzbDrone.Core.Jobs.Implementations
|
|||
|
||||
private List<int> _attemptedSeries;
|
||||
|
||||
public ImportNewSeriesJob(ISeriesService seriesService, IEpisodeService episodeService,
|
||||
IMediaFileService mediaFileService, UpdateInfoJob updateInfoJob,
|
||||
public ImportNewSeriesJob(IMediaFileService mediaFileService, UpdateInfoJob updateInfoJob,
|
||||
DiskScanJob diskScanJob,
|
||||
ISeasonRepository seasonRepository, XemUpdateJob xemUpdateJob, ISeriesRepository seriesRepository, ISeasonService seasonService)
|
||||
{
|
||||
_seriesService = seriesService;
|
||||
_episodeService = episodeService;
|
||||
_mediaFileService = mediaFileService;
|
||||
_updateInfoJob = updateInfoJob;
|
||||
_diskScanJob = diskScanJob;
|
||||
|
|
|
@ -2,7 +2,6 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NLog;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Model.Notification;
|
||||
using NzbDrone.Core.Tv;
|
||||
|
||||
|
@ -12,16 +11,13 @@ namespace NzbDrone.Core.Jobs.Implementations
|
|||
{
|
||||
private readonly IEpisodeService _episodeService;
|
||||
private readonly EpisodeSearchJob _episodeSearchJob;
|
||||
private readonly IConfigService _configService;
|
||||
|
||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public PastWeekBacklogSearchJob(IEpisodeService episodeService, EpisodeSearchJob episodeSearchJob,
|
||||
IConfigService configService)
|
||||
public PastWeekBacklogSearchJob(IEpisodeService episodeService, EpisodeSearchJob episodeSearchJob)
|
||||
{
|
||||
_episodeService = episodeService;
|
||||
_episodeSearchJob = episodeSearchJob;
|
||||
_configService = configService;
|
||||
}
|
||||
|
||||
public string Name
|
||||
|
|
|
@ -11,16 +11,13 @@ namespace NzbDrone.Core.Jobs.Implementations
|
|||
public class RefreshEpisodeMetadata : IJob
|
||||
{
|
||||
private readonly IMediaFileService _mediaFileService;
|
||||
private readonly ISeriesService _seriesService;
|
||||
private readonly ISeriesRepository _seriesRepository;
|
||||
|
||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public RefreshEpisodeMetadata(IMediaFileService mediaFileService, ISeriesService seriesService,
|
||||
ISeriesRepository seriesRepository)
|
||||
public RefreshEpisodeMetadata(IMediaFileService mediaFileService, ISeriesRepository seriesRepository)
|
||||
{
|
||||
_mediaFileService = mediaFileService;
|
||||
_seriesService = seriesService;
|
||||
_seriesRepository = seriesRepository;
|
||||
}
|
||||
|
||||
|
@ -44,10 +41,10 @@ namespace NzbDrone.Core.Jobs.Implementations
|
|||
else
|
||||
seriesToRefresh = new List<Series> { _seriesRepository.Get(options.SeriesId) };
|
||||
|
||||
foreach(var series in seriesToRefresh)
|
||||
foreach (var series in seriesToRefresh)
|
||||
{
|
||||
RefreshMetadata(notification, series);
|
||||
}
|
||||
RefreshMetadata(notification, series);
|
||||
}
|
||||
}
|
||||
|
||||
private void RefreshMetadata(ProgressNotification notification, Series series)
|
||||
|
|
|
@ -20,7 +20,7 @@ namespace NzbDrone.Core.Jobs.Implementations
|
|||
|
||||
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public RenameSeasonJob(IMediaFileService mediaFileService, DiskScanProvider diskScanProvider, ISeriesService seriesService,
|
||||
public RenameSeasonJob(IMediaFileService mediaFileService, DiskScanProvider diskScanProvider,
|
||||
ISeriesRepository seriesRepository, IEventAggregator eventAggregator)
|
||||
{
|
||||
_mediaFileService = mediaFileService;
|
||||
|
|
|
@ -18,8 +18,7 @@ namespace NzbDrone.Core.Providers
|
|||
private readonly DiskScanProvider _diskScanProvider;
|
||||
private readonly ISeriesRepository _seriesRepository;
|
||||
|
||||
public PostDownloadProvider(DiskProvider diskProvider, DiskScanProvider diskScanProvider,
|
||||
ISeriesService seriesService, ISeriesRepository seriesRepository)
|
||||
public PostDownloadProvider(DiskProvider diskProvider, DiskScanProvider diskScanProvider, ISeriesRepository seriesRepository)
|
||||
{
|
||||
_diskProvider = diskProvider;
|
||||
_diskScanProvider = diskScanProvider;
|
||||
|
|
|
@ -18,16 +18,14 @@ namespace NzbDrone.Core.Providers.Search
|
|||
{
|
||||
public class DailyEpisodeSearch : SearchBase
|
||||
{
|
||||
private readonly ISeriesRepository _seriesRepository;
|
||||
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public DailyEpisodeSearch(ISeriesService seriesService, IEpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
|
||||
public DailyEpisodeSearch(IEpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
|
||||
SceneMappingService sceneMappingService, AllowedDownloadSpecification allowedDownloadSpecification,
|
||||
ISeriesRepository seriesRepository)
|
||||
: base(seriesService, seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingService,
|
||||
: base(seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingService,
|
||||
allowedDownloadSpecification)
|
||||
{
|
||||
_seriesRepository = seriesRepository;
|
||||
}
|
||||
|
||||
public DailyEpisodeSearch()
|
||||
|
|
|
@ -20,10 +20,10 @@ namespace NzbDrone.Core.Providers.Search
|
|||
{
|
||||
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public EpisodeSearch(ISeriesService seriesService, IEpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
|
||||
public EpisodeSearch(IEpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
|
||||
SceneMappingService sceneMappingService, AllowedDownloadSpecification allowedDownloadSpecification,
|
||||
ISeriesRepository seriesRepository)
|
||||
: base(seriesService,seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingService,
|
||||
: base(seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingService,
|
||||
allowedDownloadSpecification)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -20,10 +20,10 @@ namespace NzbDrone.Core.Providers.Search
|
|||
{
|
||||
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public PartialSeasonSearch(ISeriesService seriesService, IEpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
|
||||
public PartialSeasonSearch(IEpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
|
||||
SceneMappingService sceneMappingService, AllowedDownloadSpecification allowedDownloadSpecification,
|
||||
ISeriesRepository seriesRepository)
|
||||
: base(seriesService, seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingService,
|
||||
: base(seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingService,
|
||||
allowedDownloadSpecification)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -17,7 +17,6 @@ namespace NzbDrone.Core.Providers.Search
|
|||
{
|
||||
public abstract class SearchBase
|
||||
{
|
||||
protected readonly ISeriesService _seriesService;
|
||||
private readonly ISeriesRepository _seriesRepository;
|
||||
protected readonly IEpisodeService _episodeService;
|
||||
protected readonly DownloadProvider _downloadProvider;
|
||||
|
@ -27,11 +26,10 @@ namespace NzbDrone.Core.Providers.Search
|
|||
|
||||
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
protected SearchBase(ISeriesService seriesService,ISeriesRepository seriesRepository, IEpisodeService episodeService, DownloadProvider downloadProvider,
|
||||
protected SearchBase(ISeriesRepository seriesRepository, IEpisodeService episodeService, DownloadProvider downloadProvider,
|
||||
IIndexerService indexerService, SceneMappingService sceneMappingService,
|
||||
AllowedDownloadSpecification allowedDownloadSpecification)
|
||||
{
|
||||
_seriesService = seriesService;
|
||||
_seriesRepository = seriesRepository;
|
||||
_episodeService = episodeService;
|
||||
_downloadProvider = downloadProvider;
|
||||
|
|
|
@ -1,32 +1,22 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using NLog;
|
||||
using NzbDrone.Core.Tv;
|
||||
using NzbDrone.Core.Model;
|
||||
using NzbDrone.Core.Model.Notification;
|
||||
using NzbDrone.Core.DecisionEngine;
|
||||
using NzbDrone.Core.Providers.Search;
|
||||
using NzbDrone.Core.Repository;
|
||||
using NzbDrone.Core.Repository.Search;
|
||||
|
||||
namespace NzbDrone.Core.Providers
|
||||
{
|
||||
public class SearchProvider
|
||||
{
|
||||
private readonly ISeriesService _seriesService;
|
||||
private readonly IEpisodeService _episodeService;
|
||||
private readonly PartialSeasonSearch _partialSeasonSearch;
|
||||
private readonly ISeriesRepository _seriesRepository;
|
||||
|
||||
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public SearchProvider(ISeriesService seriesService, IEpisodeService episodeService,
|
||||
PartialSeasonSearch partialSeasonSearch,ISeriesRepository seriesRepository)
|
||||
public SearchProvider(IEpisodeService episodeService, PartialSeasonSearch partialSeasonSearch, ISeriesRepository seriesRepository)
|
||||
{
|
||||
_seriesService = seriesService;
|
||||
_episodeService = episodeService;
|
||||
_partialSeasonSearch = partialSeasonSearch;
|
||||
_seriesRepository = seriesRepository;
|
||||
|
@ -89,7 +79,7 @@ namespace NzbDrone.Core.Providers
|
|||
return new List<int>();
|
||||
}
|
||||
|
||||
return _partialSeasonSearch.Search(series, new {SeasonNumber = seasonNumber, Episodes = episodes}, notification);
|
||||
return _partialSeasonSearch.Search(series, new { SeasonNumber = seasonNumber, Episodes = episodes }, notification);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,27 +1,21 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using NLog;
|
||||
using NzbDrone.Core.Datastore;
|
||||
using NzbDrone.Core.Tv;
|
||||
using NzbDrone.Core.Repository;
|
||||
|
||||
namespace NzbDrone.Core.Providers
|
||||
{
|
||||
public class XemProvider
|
||||
{
|
||||
private readonly ISeriesService _seriesService;
|
||||
private readonly IEpisodeService _episodeService;
|
||||
private readonly XemCommunicationProvider _xemCommunicationProvider;
|
||||
private readonly ISeriesRepository _seriesRepository;
|
||||
|
||||
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public XemProvider(ISeriesService seriesService, IEpisodeService episodeService,
|
||||
XemCommunicationProvider xemCommunicationProvider,ISeriesRepository seriesRepository)
|
||||
public XemProvider(IEpisodeService episodeService,XemCommunicationProvider xemCommunicationProvider,ISeriesRepository seriesRepository)
|
||||
{
|
||||
_seriesService = seriesService;
|
||||
_episodeService = episodeService;
|
||||
_xemCommunicationProvider = xemCommunicationProvider;
|
||||
_seriesRepository = seriesRepository;
|
||||
|
|
|
@ -6,7 +6,6 @@ using NLog;
|
|||
using NzbDrone.Common;
|
||||
using NzbDrone.Core.Datastore;
|
||||
using NzbDrone.Core.Tv;
|
||||
using NzbDrone.Core.Providers;
|
||||
|
||||
namespace NzbDrone.Core.RootFolders
|
||||
{
|
||||
|
@ -25,14 +24,12 @@ namespace NzbDrone.Core.RootFolders
|
|||
private readonly IBasicRepository<RootFolder> _rootFolderRepository;
|
||||
private readonly DiskProvider _diskProvider;
|
||||
private readonly ISeriesRepository _seriesRepository;
|
||||
private readonly ISeriesService _seriesService;
|
||||
|
||||
public RootFolderService(IBasicRepository<RootFolder> rootFolderRepository, ISeriesService seriesService, DiskProvider diskProvider,ISeriesRepository seriesRepository)
|
||||
public RootFolderService(IBasicRepository<RootFolder> rootFolderRepository, DiskProvider diskProvider,ISeriesRepository seriesRepository)
|
||||
{
|
||||
_rootFolderRepository = rootFolderRepository;
|
||||
_diskProvider = diskProvider;
|
||||
_seriesRepository = seriesRepository;
|
||||
_seriesService = seriesService;
|
||||
}
|
||||
|
||||
public virtual List<RootFolder> All()
|
||||
|
|
Loading…
Reference in New Issue