Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 07:10:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove exception handler

Browse source
This commit is contained in:
crobibero 2020-04-21 08:02:07 -06:00
parent a96db5f48e
commit 8ab9949db5
1 changed files with 59 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
Jellyfin.Api/Controllers/ScheduledTasksController.cs
View file

@ -41,48 +41,41 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? isHidden = false, [FromQuery] bool? isHidden = false,
[FromQuery] bool? isEnabled = false) [FromQuery] bool? isEnabled = false)
{ {
try IEnumerable<IScheduledTaskWorker> tasks = _taskManager.ScheduledTasks.OrderBy(o => o.Name);
if (isHidden.HasValue)
{ {
IEnumerable<IScheduledTaskWorker> tasks = _taskManager.ScheduledTasks.OrderBy(o => o.Name); var hiddenValue = isHidden.Value;
tasks = tasks.Where(o =>
if (isHidden.HasValue)
{ {
var hiddenValue = isHidden.Value; var itemIsHidden = false;
tasks = tasks.Where(o => if (o.ScheduledTask is IConfigurableScheduledTask configurableScheduledTask)
{ {
var itemIsHidden = false; itemIsHidden = configurableScheduledTask.IsHidden;
if (o.ScheduledTask is IConfigurableScheduledTask configurableScheduledTask) }
{
itemIsHidden = configurableScheduledTask.IsHidden;
}
return itemIsHidden == hiddenValue; return itemIsHidden == hiddenValue;
}); });
}
if (isEnabled.HasValue)
{
var enabledValue = isEnabled.Value;
tasks = tasks.Where(o =>
{
var itemIsEnabled = false;
if (o.ScheduledTask is IConfigurableScheduledTask configurableScheduledTask)
{
itemIsEnabled = configurableScheduledTask.IsEnabled;
}
return itemIsEnabled == enabledValue;
});
}
var taskInfos = tasks.Select(ScheduledTaskHelpers.GetTaskInfo);
return Ok(taskInfos);
} }
catch (Exception e)
if (isEnabled.HasValue)
{ {
return StatusCode(StatusCodes.Status500InternalServerError, e.Message); var enabledValue = isEnabled.Value;
tasks = tasks.Where(o =>
{
var itemIsEnabled = false;
if (o.ScheduledTask is IConfigurableScheduledTask configurableScheduledTask)
{
itemIsEnabled = configurableScheduledTask.IsEnabled;
}
return itemIsEnabled == enabledValue;
});
} }
var taskInfos = tasks.Select(ScheduledTaskHelpers.GetTaskInfo);
return Ok(taskInfos);
} }
/// <summary> /// <summary>
@ -96,23 +89,16 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
public IActionResult GetTask([FromRoute] string taskId) public IActionResult GetTask([FromRoute] string taskId)
{ {
try var task = _taskManager.ScheduledTasks.FirstOrDefault(i =>
{ string.Equals(i.Id, taskId, StringComparison.OrdinalIgnoreCase));
var task = _taskManager.ScheduledTasks.FirstOrDefault(i =>
string.Equals(i.Id, taskId, StringComparison.OrdinalIgnoreCase));
if (task == null) if (task == null)
{
return NotFound();
}
var result = ScheduledTaskHelpers.GetTaskInfo(task);
return Ok(result);
}
catch (Exception e)
{ {
return StatusCode(StatusCodes.Status500InternalServerError, e.Message); return NotFound();
} }
var result = ScheduledTaskHelpers.GetTaskInfo(task);
return Ok(result);
} }
/// <summary> /// <summary>
@ -126,23 +112,16 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
public IActionResult StartTask([FromRoute] string taskId) public IActionResult StartTask([FromRoute] string taskId)
{ {
try var task = _taskManager.ScheduledTasks.FirstOrDefault(o =>
{ o.Id.Equals(taskId, StringComparison.OrdinalIgnoreCase));
var task = _taskManager.ScheduledTasks.FirstOrDefault(o =>
o.Id.Equals(taskId, StringComparison.OrdinalIgnoreCase));
if (task == null) if (task == null)
{
return NotFound();
}
_taskManager.Execute(task, new TaskOptions());
return Ok();
}
catch (Exception e)
{ {
return StatusCode(StatusCodes.Status500InternalServerError, e.Message); return NotFound();
} }
_taskManager.Execute(task, new TaskOptions());
return Ok();
} }
/// <summary> /// <summary>
@ -156,23 +135,16 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
public IActionResult StopTask([FromRoute] string taskId) public IActionResult StopTask([FromRoute] string taskId)
{ {
try var task = _taskManager.ScheduledTasks.FirstOrDefault(o =>
{ o.Id.Equals(taskId, StringComparison.OrdinalIgnoreCase));
var task = _taskManager.ScheduledTasks.FirstOrDefault(o =>
o.Id.Equals(taskId, StringComparison.OrdinalIgnoreCase));
if (task == null) if (task == null)
{
return NotFound();
}
_taskManager.Cancel(task);
return Ok();
}
catch (Exception e)
{ {
return StatusCode(StatusCodes.Status500InternalServerError, e.Message); return NotFound();
} }
_taskManager.Cancel(task);
return Ok();
} }
/// <summary> /// <summary>
@ -185,24 +157,19 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)] [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
public IActionResult UpdateTask([FromRoute] string taskId, [FromBody, BindRequired] TaskTriggerInfo[] triggerInfos) public IActionResult UpdateTask(
[FromRoute] string taskId,
[FromBody, BindRequired] TaskTriggerInfo[] triggerInfos)
{ {
try var task = _taskManager.ScheduledTasks.FirstOrDefault(o =>
o.Id.Equals(taskId, StringComparison.OrdinalIgnoreCase));
if (task == null)
{ {
var task = _taskManager.ScheduledTasks.FirstOrDefault(o => return NotFound();
o.Id.Equals(taskId, StringComparison.OrdinalIgnoreCase)); }
if (task == null)
{
return NotFound();
}
task.Triggers = triggerInfos; task.Triggers = triggerInfos;
return Ok(); return Ok();
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
} }
} }
} }