diff options
Diffstat (limited to 'MediaBrowser.Api')
30 files changed, 40 insertions, 91 deletions
diff --git a/MediaBrowser.Api/EnvironmentService.cs b/MediaBrowser.Api/EnvironmentService.cs index db768d0e8..83678c3f2 100644 --- a/MediaBrowser.Api/EnvironmentService.cs +++ b/MediaBrowser.Api/EnvironmentService.cs @@ -1,11 +1,9 @@ -using MediaBrowser.Common.IO; -using MediaBrowser.Common.Net; +using MediaBrowser.Common.Net; using MediaBrowser.Controller.IO; using MediaBrowser.Model.IO; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Globalization; using System.IO; using System.Linq; @@ -59,7 +57,6 @@ namespace MediaBrowser.Api /// <summary> /// Class EnvironmentService /// </summary> - [Export(typeof(IRestfulService))] public class EnvironmentService : BaseRestService { /// <summary> diff --git a/MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs b/MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs index 7e0d27e49..9de3e2791 100644 --- a/MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs @@ -5,7 +5,6 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Model.Connectivity; using MediaBrowser.Model.Dto; using System; -using System.ComponentModel.Composition; using System.Threading.Tasks; namespace MediaBrowser.Api.HttpHandlers @@ -13,7 +12,6 @@ namespace MediaBrowser.Api.HttpHandlers /// <summary> /// Provides a handler to set played status for an item /// </summary> - [Export(typeof(IHttpServerHandler))] public class PlaybackCheckInHandler : BaseSerializationHandler<Kernel, UserItemDataDto> { /// <summary> diff --git a/MediaBrowser.Api/HttpHandlers/UpdateMediaLibraryHandler.cs b/MediaBrowser.Api/HttpHandlers/UpdateMediaLibraryHandler.cs index e5c42008e..df6edd6f9 100644 --- a/MediaBrowser.Api/HttpHandlers/UpdateMediaLibraryHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/UpdateMediaLibraryHandler.cs @@ -1,19 +1,17 @@ -using MediaBrowser.Common.IO; -using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using System; -using System.ComponentModel.Composition; using System.IO; using System.Linq; using System.Threading.Tasks; +using MediaBrowser.Controller.IO; namespace MediaBrowser.Api.HttpHandlers { /// <summary> /// Makes changes to the user's media library /// </summary> - [Export(typeof(IHttpServerHandler))] public class UpdateMediaLibraryHandler : BaseActionHandler<Kernel> { /// <summary> diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index 5e5888b3e..113bad083 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -6,7 +6,6 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using ServiceStack.ServiceHost; using System; -using System.ComponentModel.Composition; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -114,7 +113,6 @@ namespace MediaBrowser.Api.Images /// <summary> /// Class ImageService /// </summary> - [Export(typeof(IRestfulService))] public class ImageService : BaseRestService { /// <summary> diff --git a/MediaBrowser.Api/Images/UploadImageHandler.cs b/MediaBrowser.Api/Images/UploadImageHandler.cs index 13ea86563..758e96d85 100644 --- a/MediaBrowser.Api/Images/UploadImageHandler.cs +++ b/MediaBrowser.Api/Images/UploadImageHandler.cs @@ -5,7 +5,6 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using System; -using System.ComponentModel.Composition; using System.IO; using System.Threading; using System.Threading.Tasks; @@ -15,7 +14,6 @@ namespace MediaBrowser.Api.Images /// <summary> /// Class UploadImageHandler /// </summary> - [Export(typeof(IHttpServerHandler))] class UploadImageHandler : BaseActionHandler<Kernel> { /// <summary> diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs index bcf87ab67..4ca073c10 100644 --- a/MediaBrowser.Api/LibraryService.cs +++ b/MediaBrowser.Api/LibraryService.cs @@ -7,7 +7,6 @@ using MediaBrowser.Model.Entities; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Linq; namespace MediaBrowser.Api @@ -96,7 +95,6 @@ namespace MediaBrowser.Api /// <summary> /// Class LibraryService /// </summary> - [Export(typeof(IRestfulService))] public class LibraryService : BaseRestService { /// <summary> diff --git a/MediaBrowser.Api/LocalizationService.cs b/MediaBrowser.Api/LocalizationService.cs index ce9f175e3..098c9f72a 100644 --- a/MediaBrowser.Api/LocalizationService.cs +++ b/MediaBrowser.Api/LocalizationService.cs @@ -5,7 +5,6 @@ using MediaBrowser.Model.Globalization; using MoreLinq; using ServiceStack.ServiceHost; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Globalization; using System.Linq; @@ -38,7 +37,6 @@ namespace MediaBrowser.Api /// <summary> /// Class CulturesService /// </summary> - [Export(typeof(IRestfulService))] public class LocalizationService : BaseRestService { /// <summary> diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index 1d204cc7a..f6045ddd1 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -64,7 +64,6 @@ <HintPath>..\packages\ServiceStack.Text.3.9.37\lib\net35\ServiceStack.Text.dll</HintPath> </Reference> <Reference Include="System" /> - <Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.Core" /> <Reference Include="System.Drawing" /> <Reference Include="System.Runtime.Serialization" /> diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs index 924c33937..028242e72 100644 --- a/MediaBrowser.Api/PackageService.cs +++ b/MediaBrowser.Api/PackageService.cs @@ -6,7 +6,6 @@ using MediaBrowser.Model.Updates; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -93,7 +92,6 @@ namespace MediaBrowser.Api /// <summary> /// Class PackageService /// </summary> - [Export(typeof(IRestfulService))] public class PackageService : BaseRestService { /// <summary> diff --git a/MediaBrowser.Api/Plugin.cs b/MediaBrowser.Api/Plugin.cs index c9e1d7c95..58c0ffcfa 100644 --- a/MediaBrowser.Api/Plugin.cs +++ b/MediaBrowser.Api/Plugin.cs @@ -3,7 +3,6 @@ using MediaBrowser.Model.Plugins; using System; using System.Collections.Generic; using System.ComponentModel; -using System.ComponentModel.Composition; using System.Diagnostics; using System.Linq; using System.Threading; @@ -14,7 +13,6 @@ namespace MediaBrowser.Api /// <summary> /// Class Plugin /// </summary> - [Export(typeof(IPlugin))] public class Plugin : BasePlugin<BasePluginConfiguration> { /// <summary> diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs index 73bafd9fd..f982602bf 100644 --- a/MediaBrowser.Api/PluginService.cs +++ b/MediaBrowser.Api/PluginService.cs @@ -7,10 +7,8 @@ using MediaBrowser.Model.Plugins; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.IO; using System.Linq; -using System.Threading.Tasks; using ServiceStack.Text.Controller; namespace MediaBrowser.Api @@ -119,7 +117,6 @@ namespace MediaBrowser.Api /// <summary> /// Class PluginsService /// </summary> - [Export(typeof(IRestfulService))] public class PluginService : BaseRestService { /// <summary> 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)); } } diff --git a/MediaBrowser.Api/Streaming/AudioHandler.cs b/MediaBrowser.Api/Streaming/AudioHandler.cs index b7d5afbb9..2332f29d3 100644 --- a/MediaBrowser.Api/Streaming/AudioHandler.cs +++ b/MediaBrowser.Api/Streaming/AudioHandler.cs @@ -5,7 +5,6 @@ using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Dto; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Linq; using System.Net; @@ -14,7 +13,6 @@ namespace MediaBrowser.Api.Streaming /// <summary> /// Providers a progressive streaming audio api /// </summary> - [Export(typeof(IHttpServerHandler))] public class AudioHandler : BaseProgressiveStreamingHandler<Audio> { /// <summary> diff --git a/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs b/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs index d800a40fe..8c5fd34b1 100644 --- a/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs +++ b/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs @@ -859,11 +859,11 @@ namespace MediaBrowser.Api.Streaming { var video = LibraryItem as Video; - if (video != null && video.VideoType == VideoType.Iso && - video.IsoType.HasValue && Kernel.IsoManager.CanMount(video.Path)) - { - IsoMount = await Kernel.IsoManager.Mount(video.Path, CancellationToken.None).ConfigureAwait(false); - } + //if (video != null && video.VideoType == VideoType.Iso && + // video.IsoType.HasValue && Kernel.IsoManager.CanMount(video.Path)) + //{ + // IsoMount = await Kernel.IsoManager.Mount(video.Path, CancellationToken.None).ConfigureAwait(false); + //} var process = new Process { diff --git a/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs b/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs index 7aea163af..e9ae3a005 100644 --- a/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs +++ b/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs @@ -2,7 +2,6 @@ using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Model.Dto; using System; -using System.ComponentModel.Composition; using System.Net; namespace MediaBrowser.Api.Streaming @@ -10,7 +9,6 @@ namespace MediaBrowser.Api.Streaming /// <summary> /// Class HlsAudioPlaylistHandler /// </summary> - [Export(typeof(IHttpServerHandler))] public class HlsAudioPlaylistHandler : BaseHlsPlaylistHandler<Audio> { /// <summary> diff --git a/MediaBrowser.Api/Streaming/HlsSegmentHandler.cs b/MediaBrowser.Api/Streaming/HlsSegmentHandler.cs index 5b022ab3d..4305fd8a7 100644 --- a/MediaBrowser.Api/Streaming/HlsSegmentHandler.cs +++ b/MediaBrowser.Api/Streaming/HlsSegmentHandler.cs @@ -1,7 +1,6 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; using System; -using System.ComponentModel.Composition; using System.IO; using System.Net; using System.Threading.Tasks; @@ -11,7 +10,6 @@ namespace MediaBrowser.Api.Streaming /// <summary> /// Class HlsSegmentHandler /// </summary> - [Export(typeof(IHttpServerHandler))] public class HlsSegmentHandler : BaseHandler<Kernel> { /// <summary> diff --git a/MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs b/MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs index 97a5b2ce6..70f825f02 100644 --- a/MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs +++ b/MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs @@ -1,7 +1,6 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller.Entities; using System; -using System.ComponentModel.Composition; using System.Net; namespace MediaBrowser.Api.Streaming @@ -9,7 +8,6 @@ namespace MediaBrowser.Api.Streaming /// <summary> /// Class HlsVideoPlaylistHandler /// </summary> - [Export(typeof(IHttpServerHandler))] public class HlsVideoPlaylistHandler : BaseHlsPlaylistHandler<Video> { /// <summary> diff --git a/MediaBrowser.Api/Streaming/VideoHandler.cs b/MediaBrowser.Api/Streaming/VideoHandler.cs index 4a05d2547..da60297f2 100644 --- a/MediaBrowser.Api/Streaming/VideoHandler.cs +++ b/MediaBrowser.Api/Streaming/VideoHandler.cs @@ -1,21 +1,15 @@ -using System.IO; -using System.Threading; -using MediaBrowser.Common.IO; -using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Common.IO; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Resolvers; using System; -using System.ComponentModel.Composition; using System.Linq; using System.Net; -using MediaBrowser.Model.Entities; namespace MediaBrowser.Api.Streaming { /// <summary> /// Providers a progressive streaming video api /// </summary> - [Export(typeof(IHttpServerHandler))] class VideoHandler : BaseProgressiveStreamingHandler<Video> { /// <summary> diff --git a/MediaBrowser.Api/SystemService.cs b/MediaBrowser.Api/SystemService.cs index 9d15feb80..04632aa8e 100644 --- a/MediaBrowser.Api/SystemService.cs +++ b/MediaBrowser.Api/SystemService.cs @@ -5,7 +5,6 @@ using MediaBrowser.Controller; using MediaBrowser.Model.Configuration; using MediaBrowser.Model.System; using ServiceStack.ServiceHost; -using System.ComponentModel.Composition; using System.IO; using System.Threading.Tasks; @@ -47,7 +46,6 @@ namespace MediaBrowser.Api /// <summary> /// Class SystemInfoService /// </summary> - [Export(typeof(IRestfulService))] public class SystemService : BaseRestService { /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs index ea97fea3e..5d72236fa 100644 --- a/MediaBrowser.Api/UserLibrary/GenresService.cs +++ b/MediaBrowser.Api/UserLibrary/GenresService.cs @@ -4,7 +4,6 @@ using MediaBrowser.Controller.Entities; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Linq; using System.Threading.Tasks; @@ -22,7 +21,6 @@ namespace MediaBrowser.Api.UserLibrary /// <summary> /// Class GenresService /// </summary> - [Export(typeof(IRestfulService))] public class GenresService : BaseItemsByNameService<Genre> { /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 3cc503184..0586b2b5e 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -8,7 +8,6 @@ using MediaBrowser.Model.Entities; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Linq; using System.Threading.Tasks; @@ -144,7 +143,6 @@ namespace MediaBrowser.Api.UserLibrary /// <summary> /// Class ItemsService /// </summary> - [Export(typeof(IRestfulService))] public class ItemsService : BaseRestService { /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs index 71dc32b32..181d511a6 100644 --- a/MediaBrowser.Api/UserLibrary/PersonsService.cs +++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs @@ -4,7 +4,6 @@ using MediaBrowser.Controller.Entities; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Linq; using System.Threading.Tasks; @@ -27,7 +26,6 @@ namespace MediaBrowser.Api.UserLibrary /// <summary> /// Class PersonsService /// </summary> - [Export(typeof(IRestfulService))] public class PersonsService : BaseItemsByNameService<Person> { /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/StudiosService.cs b/MediaBrowser.Api/UserLibrary/StudiosService.cs index da9106367..8b1824d83 100644 --- a/MediaBrowser.Api/UserLibrary/StudiosService.cs +++ b/MediaBrowser.Api/UserLibrary/StudiosService.cs @@ -1,10 +1,8 @@ -using MediaBrowser.Common.Net; -using MediaBrowser.Controller; +using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Linq; using System.Threading.Tasks; @@ -22,7 +20,6 @@ namespace MediaBrowser.Api.UserLibrary /// <summary> /// Class StudiosService /// </summary> - [Export(typeof(IRestfulService))] public class StudiosService : BaseItemsByNameService<Studio> { /// <summary> diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs index 016b294ae..576ff8892 100644 --- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs +++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs @@ -9,7 +9,6 @@ using MediaBrowser.Model.Entities; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -252,7 +251,6 @@ namespace MediaBrowser.Api.UserLibrary /// <summary> /// Class UserLibraryService /// </summary> - [Export(typeof(IRestfulService))] public class UserLibraryService : BaseRestService { public object Get(GetSpecialFeatures request) diff --git a/MediaBrowser.Api/UserLibrary/YearsService.cs b/MediaBrowser.Api/UserLibrary/YearsService.cs index c3ea11420..14fa645af 100644 --- a/MediaBrowser.Api/UserLibrary/YearsService.cs +++ b/MediaBrowser.Api/UserLibrary/YearsService.cs @@ -4,7 +4,6 @@ using MediaBrowser.Controller.Entities; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Globalization; using System.Linq; using System.Threading.Tasks; @@ -23,7 +22,6 @@ namespace MediaBrowser.Api.UserLibrary /// <summary> /// Class YearsService /// </summary> - [Export(typeof(IRestfulService))] public class YearsService : BaseItemsByNameService<Year> { /// <summary> diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index c4703a7a0..c76479d19 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -7,7 +7,6 @@ using MediaBrowser.Model.Dto; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -134,7 +133,6 @@ namespace MediaBrowser.Api /// <summary> /// Class UsersService /// </summary> - [Export(typeof(IRestfulService))] public class UserService : BaseRestService { /// <summary> diff --git a/MediaBrowser.Api/WeatherService.cs b/MediaBrowser.Api/WeatherService.cs index 0c04f5ec0..c79c2da28 100644 --- a/MediaBrowser.Api/WeatherService.cs +++ b/MediaBrowser.Api/WeatherService.cs @@ -2,7 +2,6 @@ using MediaBrowser.Controller; using MediaBrowser.Model.Weather; using ServiceStack.ServiceHost; -using System.ComponentModel.Composition; using System.Linq; using System.Threading; @@ -24,7 +23,6 @@ namespace MediaBrowser.Api /// <summary> /// Class WeatherService /// </summary> - [Export(typeof(IRestfulService))] public class WeatherService : BaseRestService { /// <summary> diff --git a/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs b/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs index 144997c73..6e3e10361 100644 --- a/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs +++ b/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs @@ -4,7 +4,6 @@ using MediaBrowser.Controller; using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -14,7 +13,6 @@ namespace MediaBrowser.Api.WebSocket /// <summary> /// Class ScheduledTasksWebSocketListener /// </summary> - [Export(typeof(IWebSocketListener))] public class LogFileWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<string>, LogFileWebSocketState> { /// <summary> @@ -36,8 +34,7 @@ namespace MediaBrowser.Api.WebSocket /// </summary> /// <param name="logger">The logger.</param> /// <param name="kernel">The kernel.</param> - [ImportingConstructor] - public LogFileWebSocketListener([Import("logger")] ILogger logger, [Import("kernel")] Kernel kernel) + public LogFileWebSocketListener(ILogger logger, Kernel kernel) : base(logger) { _kernel = kernel; diff --git a/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs b/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs index c41714581..40c3f2f24 100644 --- a/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs +++ b/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs @@ -2,7 +2,6 @@ using MediaBrowser.Controller; using MediaBrowser.Model.Logging; using MediaBrowser.Model.System; -using System.ComponentModel.Composition; using System.Threading.Tasks; namespace MediaBrowser.Api.WebSocket @@ -10,7 +9,6 @@ namespace MediaBrowser.Api.WebSocket /// <summary> /// Class SystemInfoWebSocketListener /// </summary> - [Export(typeof(IWebSocketListener))] public class SystemInfoWebSocketListener : BasePeriodicWebSocketListener<SystemInfo, object> { /// <summary> @@ -32,8 +30,7 @@ namespace MediaBrowser.Api.WebSocket /// </summary> /// <param name="kernel">The kernel.</param> /// <param name="logger">The logger.</param> - [ImportingConstructor] - public SystemInfoWebSocketListener([Import("kernel")] Kernel kernel, [Import("logger")] ILogger logger) + public SystemInfoWebSocketListener(Kernel kernel, ILogger logger) : base(logger) { _kernel = kernel; |