From 9d40b684bf6af4e987e226c78c11d6daf6f5cd9b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 22 Jan 2014 12:05:06 -0500 Subject: #680 - episode organization --- .../FileOrganization/OrganizerScheduledTask.cs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs') diff --git a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs index 35a3ba087..340038e4b 100644 --- a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs +++ b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs @@ -14,21 +14,21 @@ namespace MediaBrowser.Server.Implementations.FileOrganization { public class OrganizerScheduledTask : IScheduledTask, IConfigurableScheduledTask { - private readonly IServerConfigurationManager _config; - private readonly ILogger _logger; + private readonly IDirectoryWatchers _directoryWatchers; private readonly ILibraryManager _libraryManager; + private readonly ILogger _logger; private readonly IFileSystem _fileSystem; - private readonly IFileOrganizationService _iFileSortingRepository; - private readonly IDirectoryWatchers _directoryWatchers; + private readonly IServerConfigurationManager _config; + private readonly IFileOrganizationService _organizationService; - public OrganizerScheduledTask(IServerConfigurationManager config, ILogger logger, ILibraryManager libraryManager, IFileSystem fileSystem, IFileOrganizationService iFileSortingRepository, IDirectoryWatchers directoryWatchers) + public OrganizerScheduledTask(IDirectoryWatchers directoryWatchers, ILibraryManager libraryManager, ILogger logger, IFileSystem fileSystem, IServerConfigurationManager config, IFileOrganizationService organizationService) { - _config = config; - _logger = logger; + _directoryWatchers = directoryWatchers; _libraryManager = libraryManager; + _logger = logger; _fileSystem = fileSystem; - _iFileSortingRepository = iFileSortingRepository; - _directoryWatchers = directoryWatchers; + _config = config; + _organizationService = organizationService; } public string Name @@ -48,7 +48,8 @@ namespace MediaBrowser.Server.Implementations.FileOrganization public Task Execute(CancellationToken cancellationToken, IProgress progress) { - return new TvFileSorter(_libraryManager, _logger, _fileSystem, _iFileSortingRepository, _directoryWatchers).Sort(_config.Configuration.TvFileOrganizationOptions, cancellationToken, progress); + return new TvFolderOrganizer(_libraryManager, _logger, _fileSystem, _directoryWatchers, _organizationService, _config) + .Organize(_config.Configuration.TvFileOrganizationOptions, cancellationToken, progress); } public IEnumerable GetDefaultTriggers() -- cgit v1.2.3