diff options
Diffstat (limited to 'MediaBrowser.Api/ScheduledTasks')
| -rw-r--r-- | MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs | 27 | ||||
| -rw-r--r-- | MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs | 18 |
2 files changed, 28 insertions, 17 deletions
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs index bd12454a0..1ca744542 100644 --- a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs +++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs @@ -6,7 +6,6 @@ using MediaBrowser.Model.Tasks; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.IO; using System.Linq; using ServiceStack.Text.Controller; @@ -83,17 +82,27 @@ namespace MediaBrowser.Api.ScheduledTasks /// <summary> /// Class ScheduledTasksService /// </summary> - [Export(typeof(IRestfulService))] public class ScheduledTaskService : BaseRestService { /// <summary> + /// Gets or sets the task manager. + /// </summary> + /// <value>The task manager.</value> + private ITaskManager TaskManager { get; set; } + + public ScheduledTaskService(ITaskManager taskManager) + { + TaskManager = taskManager; + } + + /// <summary> /// Gets the specified request. /// </summary> /// <param name="request">The request.</param> /// <returns>IEnumerable{TaskInfo}.</returns> public object Get(GetScheduledTasks request) { - var result = Kernel.ScheduledTasks.OrderBy(i => i.Name) + var result = TaskManager.ScheduledTasks.OrderBy(i => i.Name) .Select(ScheduledTaskHelpers.GetTaskInfo).ToList(); return ToOptimizedResult(result); @@ -106,7 +115,7 @@ namespace MediaBrowser.Api.ScheduledTasks /// <returns>IEnumerable{TaskInfo}.</returns> public object Get(GetScheduledTask request) { - var task = Kernel.ScheduledTasks.FirstOrDefault(i => i.Id == request.Id); + var task = TaskManager.ScheduledTasks.FirstOrDefault(i => i.Id == request.Id); if (task == null) { @@ -124,7 +133,7 @@ namespace MediaBrowser.Api.ScheduledTasks /// <param name="request">The request.</param> public void Post(StartScheduledTask request) { - var task = Kernel.ScheduledTasks.FirstOrDefault(i => i.Id == request.Id); + var task = TaskManager.ScheduledTasks.FirstOrDefault(i => i.Id == request.Id); if (task == null) { @@ -140,7 +149,7 @@ namespace MediaBrowser.Api.ScheduledTasks /// <param name="request">The request.</param> public void Delete(StopScheduledTask request) { - var task = Kernel.ScheduledTasks.FirstOrDefault(i => i.Id == request.Id); + var task = TaskManager.ScheduledTasks.FirstOrDefault(i => i.Id == request.Id); if (task == null) { @@ -160,8 +169,8 @@ namespace MediaBrowser.Api.ScheduledTasks // https://code.google.com/p/servicestack/source/browse/trunk/Common/ServiceStack.Text/ServiceStack.Text/Controller/PathInfo.cs var pathInfo = PathInfo.Parse(Request.PathInfo); var id = new Guid(pathInfo.GetArgumentValue<string>(1)); - - var task = Kernel.ScheduledTasks.FirstOrDefault(i => i.Id == id); + + var task = TaskManager.ScheduledTasks.FirstOrDefault(i => i.Id == id); if (task == null) { @@ -170,7 +179,7 @@ namespace MediaBrowser.Api.ScheduledTasks var triggerInfos = JsonSerializer.DeserializeFromStream<TaskTriggerInfo[]>(request.RequestStream); - task.Triggers = triggerInfos.Select(t => ScheduledTaskHelpers.GetTrigger(t, Kernel)); + task.Triggers = triggerInfos.Select(ScheduledTaskHelpers.GetTrigger); } } } diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs index cb7863d84..72c23a0ef 100644 --- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs +++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs @@ -1,10 +1,8 @@ using MediaBrowser.Common.Kernel; using MediaBrowser.Common.ScheduledTasks; -using MediaBrowser.Controller; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Tasks; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Linq; using System.Threading.Tasks; @@ -13,10 +11,15 @@ namespace MediaBrowser.Api.ScheduledTasks /// <summary> /// Class ScheduledTasksWebSocketListener /// </summary> - [Export(typeof(IWebSocketListener))] public class ScheduledTasksWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<TaskInfo>, object> { /// <summary> + /// Gets or sets the task manager. + /// </summary> + /// <value>The task manager.</value> + private ITaskManager TaskManager { get; set; } + + /// <summary> /// Gets the name. /// </summary> /// <value>The name.</value> @@ -33,13 +36,12 @@ namespace MediaBrowser.Api.ScheduledTasks /// <summary> /// Initializes a new instance of the <see cref="ScheduledTasksWebSocketListener" /> class. /// </summary> - /// <param name="kernel">The kernel.</param> /// <param name="logger">The logger.</param> - [ImportingConstructor] - public ScheduledTasksWebSocketListener([Import("kernel")] Kernel kernel, [Import("logger")] ILogger logger) + /// <param name="taskManager">The task manager.</param> + public ScheduledTasksWebSocketListener(ILogger logger, ITaskManager taskManager) : base(logger) { - _kernel = kernel; + TaskManager = taskManager; } /// <summary> @@ -49,7 +51,7 @@ namespace MediaBrowser.Api.ScheduledTasks /// <returns>Task{IEnumerable{TaskInfo}}.</returns> protected override Task<IEnumerable<TaskInfo>> GetDataToSend(object state) { - return Task.FromResult(_kernel.ScheduledTasks.OrderBy(i => i.Name) + return Task.FromResult(TaskManager.ScheduledTasks.OrderBy(i => i.Name) .Select(ScheduledTaskHelpers.GetTaskInfo)); } } |