update plugin interfaces

5 files changed, 34 insertions, 11 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 999634a92..71704f8e2 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -17,9 +17,9 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Security;
+using MediaBrowser.Controller;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Services;
@@ -34,7 +34,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         private readonly ILogger _logger;
         public IEnumerable<string> UrlPrefixes { get; private set; }
 
-        private readonly List<IRestfulService> _restServices = new List<IRestfulService>();
+        private readonly List<IService> _restServices = new List<IService>();
 
         private IHttpListener _listener;
 
@@ -49,13 +49,16 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         private readonly INetworkManager _networkManager;
         private readonly IMemoryStreamProvider _memoryStreamProvider;
 
-        public HttpListenerHost(IApplicationHost applicationHost,
+        private readonly IServerApplicationHost _appHost;
+
+        public HttpListenerHost(IServerApplicationHost applicationHost,
             ILogManager logManager,
             IServerConfigurationManager config,
             string serviceName,
             string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamProvider memoryStreamProvider, params Assembly[] assembliesWithServices)
             : base(serviceName, assembliesWithServices)
         {
+            _appHost = applicationHost;
             DefaultRedirectPath = defaultRedirectPath;
             _networkManager = networkManager;
             _memoryStreamProvider = memoryStreamProvider;
@@ -116,6 +119,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             //    }
             //});
 
+            var requestFilters = _appHost.GetExports<IRequestFilter>().ToList();
+            foreach (var filter in requestFilters)
+            {
+                HostContext.GlobalRequestFilters.Add(filter.Filter);
+            }
+
             HostContext.GlobalResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
         }
 
@@ -569,7 +578,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// Adds the rest handlers.
         /// </summary>
         /// <param name="services">The services.</param>
-        public void Init(IEnumerable<IRestfulService> services)
+        public void Init(IEnumerable<IService> services)
         {
             _restServices.AddRange(services);
 
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
index b2cbf2387..4dff2d5a3 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
@@ -1,6 +1,5 @@
-using MediaBrowser.Common;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.IO;
@@ -18,17 +17,17 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// Creates the server.
         /// </summary>
         /// <returns>IHttpServer.</returns>
-        public static IHttpServer CreateServer(IApplicationHost applicationHost,
+        public static IHttpServer CreateServer(IServerApplicationHost applicationHost,
             ILogManager logManager,
             IServerConfigurationManager config, 
-            INetworkManager _networkmanager,
+            INetworkManager networkmanager,
             IMemoryStreamProvider streamProvider,
             string serverName, 
             string defaultRedirectpath)
         {
             LogManager.LogFactory = new ServerLogFactory(logManager);
 
-            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, _networkmanager, streamProvider);
+            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, networkmanager, streamProvider);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
index 7d4d0a968..54ee5fbb2 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs
@@ -5,7 +5,7 @@ using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Server.Implementations.HttpServer
 {
-    public class SwaggerService : IHasResultFactory, IRestfulService
+    public class SwaggerService : IHasResultFactory, IService
     {
         private readonly IServerApplicationPaths _appPaths;
 
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index fd978f3d6..23d373ac4 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -270,6 +270,7 @@
     <Compile Include="Persistence\DataExtensions.cs" />
     <Compile Include="Persistence\IDbConnector.cs" />
     <Compile Include="Persistence\MediaStreamColumns.cs" />
+    <Compile Include="Reflection\AssemblyInfo.cs" />
     <Compile Include="Social\SharingManager.cs" />
     <Compile Include="Social\SharingRepository.cs" />
     <Compile Include="Sorting\StartDateComparer.cs" />
diff --git a/MediaBrowser.Server.Implementations/Reflection/AssemblyInfo.cs b/MediaBrowser.Server.Implementations/Reflection/AssemblyInfo.cs
new file mode 100644
index 000000000..ec25e7951
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Reflection/AssemblyInfo.cs
@@ -0,0 +1,14 @@
+using System;
+using System.IO;
+using MediaBrowser.Model.Reflection;
+
+namespace MediaBrowser.Server.Implementations.Reflection
+{
+    public class AssemblyInfo : IAssemblyInfo
+    {
+        public Stream GetManifestResourceStream(Type type, string resource)
+        {
+            return type.Assembly.GetManifestResourceStream(resource);
+        }
+    }
+}