diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-09 15:59:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 15:59:26 -0400 |
| commit | c2996935c8a873662e6d301f139c88df8a542ed2 (patch) | |
| tree | cf405f91e893fe6a3fc20dfa1622f027666d4848 /MediaBrowser.Model/Tasks | |
| parent | ab834f8fdffb64b562ece0512a53f361c62f7f6f (diff) | |
| parent | 7a74c705e584774534b74e11c1ab86144cb454c6 (diff) | |
Merge pull request #2800 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model/Tasks')
| -rw-r--r-- | MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Model/Tasks/TaskInfo.cs | 4 |
2 files changed, 4 insertions, 12 deletions
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 { /// <summary> @@ -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. /// </summary> /// <value>The triggers.</value> - public List<TaskTriggerInfo> Triggers { get; set; } + public TaskTriggerInfo[] Triggers { get; set; } /// <summary> /// Gets or sets the description. @@ -72,7 +72,7 @@ namespace MediaBrowser.Model.Tasks /// </summary> public TaskInfo() { - Triggers = new List<TaskTriggerInfo>(); + Triggers = new TaskTriggerInfo[]{}; } } } |