From 40442f887ba717ae47620b152315f21b252fe049 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 9 Aug 2017 15:56:38 -0400 Subject: consolidate emby.server.core into emby.server.implementations --- MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs | 12 ++---------- MediaBrowser.Model/Tasks/TaskInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'MediaBrowser.Model/Tasks') diff --git a/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs b/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs index 66f5294e7..2dec79e93 100644 --- a/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs +++ b/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; - + namespace MediaBrowser.Model.Tasks { /// @@ -26,12 +24,6 @@ namespace MediaBrowser.Model.Tasks string key = task.ScheduledTask.Key; - var triggers = task.Triggers - .OrderBy(i => i.Type) - .ThenBy(i => i.DayOfWeek ?? DayOfWeek.Sunday) - .ThenBy(i => i.TimeOfDayTicks ?? 0) - .ToList(); - return new TaskInfo { Name = task.Name, @@ -40,7 +32,7 @@ namespace MediaBrowser.Model.Tasks Id = task.Id, LastExecutionResult = task.LastExecutionResult, - Triggers = triggers, + Triggers = task.Triggers, Description = task.Description, Category = task.Category, diff --git a/MediaBrowser.Model/Tasks/TaskInfo.cs b/MediaBrowser.Model/Tasks/TaskInfo.cs index 50276f8eb..8792ce952 100644 --- a/MediaBrowser.Model/Tasks/TaskInfo.cs +++ b/MediaBrowser.Model/Tasks/TaskInfo.cs @@ -41,7 +41,7 @@ namespace MediaBrowser.Model.Tasks /// Gets or sets the triggers. /// /// The triggers. - public List Triggers { get; set; } + public TaskTriggerInfo[] Triggers { get; set; } /// /// Gets or sets the description. @@ -72,7 +72,7 @@ namespace MediaBrowser.Model.Tasks /// public TaskInfo() { - Triggers = new List(); + Triggers = new TaskTriggerInfo[]{}; } } } -- cgit v1.2.3