Moved the http server to it's own assembly. added comments and made other minor re-organizations.

3 files changed, 11 insertions, 7 deletions

diff --git a/MediaBrowser.HtmlBrowser/Handlers/EmbeddedResourceHandler.cs b/MediaBrowser.HtmlBrowser/Handlers/EmbeddedResourceHandler.cs
index a153eb119..c62c6bbf6 100644
--- a/MediaBrowser.HtmlBrowser/Handlers/EmbeddedResourceHandler.cs
+++ b/MediaBrowser.HtmlBrowser/Handlers/EmbeddedResourceHandler.cs
@@ -1,14 +1,14 @@
 using System.IO;

 using System.Reflection;

-using MediaBrowser.Common.Net;

-using MediaBrowser.Common.Net.Handlers;

+using MediaBrowser.Net;

+using MediaBrowser.Net.Handlers;

 

 namespace MediaBrowser.HtmlBrowser.Handlers

 {

     class EmbeddedResourceHandler : BaseEmbeddedResourceHandler

     {

-        public EmbeddedResourceHandler(RequestContext ctx, string resourcePath)

-            : base(ctx, resourcePath)

+        public EmbeddedResourceHandler(string resourcePath)

+            : base(resourcePath)

         {

       

         }

diff --git a/MediaBrowser.HtmlBrowser/MediaBrowser.HtmlBrowser.csproj b/MediaBrowser.HtmlBrowser/MediaBrowser.HtmlBrowser.csproj
index 219ec35c5..b496e5697 100644
--- a/MediaBrowser.HtmlBrowser/MediaBrowser.HtmlBrowser.csproj
+++ b/MediaBrowser.HtmlBrowser/MediaBrowser.HtmlBrowser.csproj
@@ -59,6 +59,10 @@
       <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>

       <Name>MediaBrowser.Model</Name>

     </ProjectReference>

+    <ProjectReference Include="..\MediaBrowser.Net\MediaBrowser.Net.csproj">

+      <Project>{5da08d1c-0d52-4b1b-aa66-e4a171d938f6}</Project>

+      <Name>MediaBrowser.Net</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <None Include="packages.config" />

diff --git a/MediaBrowser.HtmlBrowser/Plugin.cs b/MediaBrowser.HtmlBrowser/Plugin.cs
index 1599881d0..db3f72f6f 100644
--- a/MediaBrowser.HtmlBrowser/Plugin.cs
+++ b/MediaBrowser.HtmlBrowser/Plugin.cs
@@ -1,6 +1,6 @@
 using System;

 using System.Reactive.Linq;

-using MediaBrowser.Common.Net.Handlers;

+using MediaBrowser.Net.Handlers;

 using MediaBrowser.Common.Plugins;

 using MediaBrowser.Controller;

 using MediaBrowser.HtmlBrowser.Handlers;

@@ -13,7 +13,7 @@ namespace MediaBrowser.HtmlBrowser
         {

             var httpServer = Kernel.Instance.HttpServer;

 

-            httpServer.Where(ctx => ctx.LocalPath.IndexOf("/browser/", StringComparison.OrdinalIgnoreCase) != -1).Subscribe(ctx =>

+            /*httpServer.Where(ctx => ctx.LocalPath.IndexOf("/browser/", StringComparison.OrdinalIgnoreCase) != -1).Subscribe(ctx =>

             {

                 string localPath = ctx.LocalPath;

                 string srch = "/browser/";

@@ -24,7 +24,7 @@ namespace MediaBrowser.HtmlBrowser
 

                 ctx.Respond(new EmbeddedResourceHandler(ctx, resource));

 

-            });

+            });*/

         }

     }

 }