aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-02-08 13:27:08 -0500
committerLuke <luke.pulverenti@gmail.com>2016-02-08 13:27:08 -0500
commit063fd568323ed94dd220610b5bd8b0b6ac4d9835 (patch)
treee8fbbc43a25af2f982034fe279bc22ddf8e6d8c6 /MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
parent00ff642f1955b082649ef7a31f925ccae4661fa8 (diff)
parente94467d34b6b753cdb5420e33904bffa41da8053 (diff)
Merge pull request #1436 from MediaBrowser/dev
Merge from dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs')
-rw-r--r--MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
index f1fe5539f..ace3b5af7 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
@@ -50,17 +50,17 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
get { return "Library"; }
}
- private TvFileOrganizationOptions GetTvOptions()
+ private AutoOrganizeOptions GetAutoOrganizeOptions()
{
- return _config.GetAutoOrganizeOptions().TvOptions;
+ return _config.GetAutoOrganizeOptions();
}
public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
{
- if (GetTvOptions().IsEnabled)
+ if (GetAutoOrganizeOptions().TvOptions.IsEnabled)
{
await new TvFolderOrganizer(_libraryManager, _logger, _fileSystem, _libraryMonitor, _organizationService, _config, _providerManager)
- .Organize(GetTvOptions(), cancellationToken, progress).ConfigureAwait(false);
+ .Organize(GetAutoOrganizeOptions(), cancellationToken, progress).ConfigureAwait(false);
}
}
@@ -74,12 +74,12 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
public bool IsHidden
{
- get { return !GetTvOptions().IsEnabled; }
+ get { return !GetAutoOrganizeOptions().TvOptions.IsEnabled; }
}
public bool IsEnabled
{
- get { return GetTvOptions().IsEnabled; }
+ get { return GetAutoOrganizeOptions().TvOptions.IsEnabled; }
}
public bool IsActivityLogged