michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

separate task buttons script

Browse Source
This commit is contained in:
Luke Pulverenti 2015-01-20 16:32:48 -05:00
parent 449485d3d2
commit 9e809b06c4
6 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
View File

@ -32,6 +32,9 @@ namespace MediaBrowser.Api.ScheduledTasks
{
[ApiMember(Name = "IsHidden", Description = "Optional filter tasks that are hidden, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool? IsHidden { get; set; }
[ApiMember(Name = "IsEnabled", Description = "Optional filter tasks that are enabled, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool? IsEnabled { get; set; }
}
/// <summary>
@ -132,6 +135,25 @@ namespace MediaBrowser.Api.ScheduledTasks
});
}
if (request.IsEnabled.HasValue)
{
var val = request.IsEnabled.Value;
result = result.Where(i =>
{
var isEnabled = false;
var configurableTask = i.ScheduledTask as IConfigurableScheduledTask;
if (configurableTask != null)
{
isEnabled = configurableTask.IsEnabled;
}
return isEnabled == val;
});
}
var infos = result
.Select(ScheduledTaskHelpers.GetTaskInfo)
.ToList();

9
MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
View File

@ -54,10 +54,13 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
return _config.GetAutoOrganizeOptions().TvOptions;
}
public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
{
return new TvFolderOrganizer(_libraryManager, _logger, _fileSystem, _libraryMonitor, _organizationService, _config, _providerManager)
.Organize(GetTvOptions(), cancellationToken, progress);
if (GetTvOptions().IsEnabled)
{
await new TvFolderOrganizer(_libraryManager, _logger, _fileSystem, _libraryMonitor, _organizationService, _config, _providerManager)
.Organize(GetTvOptions(), cancellationToken, progress).ConfigureAwait(false);
}
}
public IEnumerable<ITaskTrigger> GetDefaultTriggers()

2
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@ -47,7 +47,7 @@
"LabelDashboardSourcePath": "Web client source path:",
"LabelDashboardSourcePathHelp": "If running the server from source, specify the path to the dashboard-ui folder. All web client files will be served from this location.",
"ButtonConvertMedia": "Convert media",
"ButtonOrganizeNow": "Organize now",
"ButtonOrganize": "Organize",
"ButtonOk": "Ok",
"ButtonCancel": "Cancel",
"ButtonNew": "New",

4
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -532,9 +532,9 @@ namespace MediaBrowser.Server.Startup.Common
SetStaticProperties();
await ((UserManager)UserManager).Initialize().ConfigureAwait(false);
SetKernelProperties();
await ((UserManager)UserManager).Initialize().ConfigureAwait(false);
}
protected override INetworkManager CreateNetworkManager(ILogger logger)

1
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -366,6 +366,7 @@ namespace MediaBrowser.WebDashboard.Api
"mediaplayer-video.js",
"nowplayingbar.js",
"nowplayingpage.js",
"taskbutton.js",
"ratingdialog.js",
"aboutpage.js",

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -126,6 +126,9 @@
<Content Include="dashboard-ui\scripts\syncsettings.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\taskbutton.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\usernew.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>