moved the http server to common, added more http handlers

11 files changed, 6 insertions, 228 deletions

diff --git a/MediaBrowser.Controller/Events/ItemResolveEventArgs.cs b/MediaBrowser.Controller/Events/ItemResolveEventArgs.cs
index 831eb29d46..c05c139fb0 100644
--- a/MediaBrowser.Controller/Events/ItemResolveEventArgs.cs
+++ b/MediaBrowser.Controller/Events/ItemResolveEventArgs.cs
@@ -60,7 +60,7 @@ namespace MediaBrowser.Controller.Events
     public class PreBeginResolveEventArgs : EventArgs

     {

         public string Path { get; set; }

-        public BaseItem Parent { get; set; }

+        public Folder Parent { get; set; }

 

         public bool Cancel { get; set; }

 

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 455a63f679..b99d84616a 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -7,11 +7,11 @@ using System.Text;
 using System.Threading.Tasks;

 using MediaBrowser.Common.Json;

 using MediaBrowser.Common.Logging;

+using MediaBrowser.Common.Net;

 using MediaBrowser.Common.Plugins;

 using MediaBrowser.Controller.Events;

 using MediaBrowser.Controller.IO;

 using MediaBrowser.Controller.Library;

-using MediaBrowser.Controller.Net;

 using MediaBrowser.Controller.Resolvers;

 using MediaBrowser.Model.Configuration;

 using MediaBrowser.Model.Entities;

@@ -84,6 +84,7 @@ namespace MediaBrowser.Controller
             // Get users from users folder

             // Load root media folder

             Parallel.Invoke(ReloadUsers, ReloadRoot);

+            var b = true;

         }

 

         private void ReloadConfiguration()

@@ -96,14 +97,6 @@ namespace MediaBrowser.Controller
 

         private void ReloadPlugins()

         {

-            if (Plugins != null)

-            {

-                Parallel.For(0, Plugins.Count(), i =>

-                {

-                    Plugins.ElementAt(i).Dispose();

-                });

-            }

-

             // Find plugins

             Plugins = PluginController.GetAllPlugins();

 

@@ -120,7 +113,7 @@ namespace MediaBrowser.Controller
                 HttpServer.Dispose();

             }

 

-            HttpServer = new HttpServer(Configuration.HttpServerPortNumber);

+            HttpServer = new HttpServer("http://+:" + Configuration.HttpServerPortNumber + "/mediabrowser/");

         }

 

         /// <summary>

@@ -134,16 +127,6 @@ namespace MediaBrowser.Controller
         }

 

         /// <summary>

-        /// Unregisters a new BaseItem subclass

-        /// </summary>

-        public void RemoveBaseItemType<TBaseItemType, TResolverType>()

-            where TBaseItemType : BaseItem, new()

-            where TResolverType : BaseItemResolver<TBaseItemType>, new()

-        {

-            ItemController.RemoveResovler<TBaseItemType, TResolverType>();

-        }

-

-        /// <summary>

         /// Fires when a path is about to be resolved, but before child folders and files 

         /// have been collected from the file system.

         /// This gives us a chance to cancel it if needed, resulting in the path being ignored

diff --git a/MediaBrowser.Controller/Library/ItemController.cs b/MediaBrowser.Controller/Library/ItemController.cs
index 422790c692..f0be2baf9b 100644
--- a/MediaBrowser.Controller/Library/ItemController.cs
+++ b/MediaBrowser.Controller/Library/ItemController.cs
@@ -25,18 +25,6 @@ namespace MediaBrowser.Controller.Library
             Resolvers.Insert(0, new TResolverType());

         }

 

-        /// <summary>

-        /// Registers a new BaseItem resolver.

-        /// </summary>

-        public void RemoveResovler<TBaseItemType, TResolverType>()

-            where TBaseItemType : BaseItem, new()

-            where TResolverType : BaseItemResolver<TBaseItemType>, new()

-        {

-            IBaseItemResolver resolver = Resolvers.First(r => r.GetType() == typeof(TResolverType));

-

-            Resolvers.Remove(resolver);

-        }

-

         #region PreBeginResolvePath Event

         /// <summary>

         /// Fires when a path is about to be resolved, but before child folders and files 

diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 30b1070bc6..ad2289e1f4 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -51,12 +51,6 @@
     <Compile Include="IO\Shortcut.cs" />

     <Compile Include="Library\ItemController.cs" />

     <Compile Include="Kernel.cs" />

-    <Compile Include="Net\CollectionExtensions.cs" />

-    <Compile Include="Net\HttpServer.cs" />

-    <Compile Include="Net\Request.cs" />

-    <Compile Include="Net\RequestContext.cs" />

-    <Compile Include="Net\Response.cs" />

-    <Compile Include="Net\StreamExtensions.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

     <Compile Include="Resolvers\AudioResolver.cs" />

     <Compile Include="Resolvers\BaseItemResolver.cs" />

diff --git a/MediaBrowser.Controller/Net/CollectionExtensions.cs b/MediaBrowser.Controller/Net/CollectionExtensions.cs
deleted file mode 100644
index 137fbe50b7..0000000000
--- a/MediaBrowser.Controller/Net/CollectionExtensions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;

-using System.Collections.Specialized;

-using System.Linq;

-

-namespace MediaBrowser.Controller.Net

-{

-    public static class CollectionExtensions

-    {

-        public static IDictionary<string, IEnumerable<string>> ToDictionary(this NameValueCollection source)

-        {

-            return source.AllKeys.ToDictionary<string, string, IEnumerable<string>>(key => key, source.GetValues);

-        }

-    }

-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Net/HttpServer.cs b/MediaBrowser.Controller/Net/HttpServer.cs
deleted file mode 100644
index bb014ca5ae..0000000000
--- a/MediaBrowser.Controller/Net/HttpServer.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;

-using System.Net;

-using System.Reactive.Linq;

-

-namespace MediaBrowser.Controller.Net

-{

-    public class HttpServer : IObservable<RequestContext>, IDisposable

-    {

-        private readonly HttpListener listener;

-        private readonly IObservable<RequestContext> stream;

-

-        public HttpServer(int port)

-            : this("http://+:" + port + "/")

-        {

-        }

-

-        public HttpServer(string url)

-        {

-            listener = new HttpListener();

-            listener.Prefixes.Add(url);

-            listener.Start();

-            stream = ObservableHttpContext();

-        }

-

-        private IObservable<RequestContext> ObservableHttpContext()

-        {

-            return Observable.Create<RequestContext>(obs =>

-                                Observable.FromAsyncPattern<HttpListenerContext>(listener.BeginGetContext,

-                                                                                 listener.EndGetContext)()

-                                          .Select(c => new RequestContext(c))

-                                          .Subscribe(obs))

-                             .Repeat()

-                             .Retry()

-                             .Publish()

-                             .RefCount();

-        }

-        public void Dispose()

-        {

-            listener.Stop();

-        }

-

-        public IDisposable Subscribe(IObserver<RequestContext> observer)

-        {

-            return stream.Subscribe(observer);

-        }

-    }

-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Net/Request.cs b/MediaBrowser.Controller/Net/Request.cs
deleted file mode 100644
index 751c1e384c..0000000000
--- a/MediaBrowser.Controller/Net/Request.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;

-using System.IO;

-using System.Linq;

-

-namespace MediaBrowser.Controller.Net

-{

-    public class Request

-    {

-        public string HttpMethod { get; set; }

-        public IDictionary<string, IEnumerable<string>> Headers { get; set; }

-        public Stream InputStream { get; set; }

-        public string RawUrl { get; set; }

-        public int ContentLength

-        {

-            get { return int.Parse(Headers["Content-Length"].First()); }

-        }

-    }

-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Net/RequestContext.cs b/MediaBrowser.Controller/Net/RequestContext.cs
deleted file mode 100644
index 531faab840..0000000000
--- a/MediaBrowser.Controller/Net/RequestContext.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Linq;

-using System.Net;

-using System.IO.Compression;

-

-namespace MediaBrowser.Controller.Net

-{

-    public class RequestContext

-    {

-        public HttpListenerRequest Request { get; private set; }

-        public HttpListenerResponse Response { get; private set; }

-

-        public RequestContext(HttpListenerContext context)

-        {

-            Response = context.Response;

-            Request = context.Request;

-        }

-

-        public void Respond(Response response)

-        {

-            Response.AddHeader("Access-Control-Allow-Origin", "*");

-

-            foreach (var header in response.Headers)

-            {

-                Response.AddHeader(header.Key, header.Value);

-            }

-

-            Response.ContentType = response.ContentType;

-            Response.StatusCode = response.StatusCode;

-

-            Response.SendChunked = true;

-

-            GZipStream gzipStream = new GZipStream(Response.OutputStream, CompressionMode.Compress, false);

-

-            response.WriteStream(Response.OutputStream);

-        }

-    }

-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Net/Response.cs b/MediaBrowser.Controller/Net/Response.cs
deleted file mode 100644
index a119198cb3..0000000000
--- a/MediaBrowser.Controller/Net/Response.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.IO;

-using System.Text;

-

-namespace MediaBrowser.Controller.Net

-{

-    public class Response

-    {

-        protected RequestContext RequestContext { get; private set; }

-        

-        public Response(RequestContext ctx)

-        {

-            RequestContext = ctx;

-            

-            WriteStream = s => { };

-            StatusCode = 200;

-            Headers = new Dictionary<string, string>();

-            CacheDuration = TimeSpan.FromTicks(0);

-            ContentType = "text/html";

-        }

-

-        public int StatusCode { get; set; }

-        public string ContentType { get; set; }

-        public IDictionary<string, string> Headers { get; set; }

-        public TimeSpan CacheDuration { get; set; }

-        public Action<Stream> WriteStream { get; set; }

-    }

-

-    /*public class ByteResponse : Response

-    {

-        public ByteResponse(byte[] bytes)

-        {

-            WriteStream = async s => 

-            {

-                await s.WriteAsync(bytes, 0, bytes.Length);

-                s.Close();

-            };

-        }

-    }

-

-    public class StringResponse : ByteResponse

-    {

-        public StringResponse(string message)

-            : base(Encoding.UTF8.GetBytes(message))

-        {

-        }

-    }*/

-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Net/StreamExtensions.cs b/MediaBrowser.Controller/Net/StreamExtensions.cs
deleted file mode 100644
index 451a43acba..0000000000
--- a/MediaBrowser.Controller/Net/StreamExtensions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.IO;

-using System.Reactive.Linq;

-

-namespace MediaBrowser.Controller.Net

-{

-    public static class StreamExtensions

-    {

-        public static IObservable<byte[]> ReadBytes(this Stream stream, int count)

-        {

-            var buffer = new byte[count];

-            return Observable.FromAsyncPattern((cb, state) => stream.BeginRead(buffer, 0, count, cb, state), ar =>

-            {

-                stream.EndRead(ar);

-                return buffer;

-            })();

-        }

-    }

-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs b/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
index ed815037e6..e2c49e90c1 100644
--- a/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
@@ -23,11 +23,9 @@ namespace MediaBrowser.Controller.Resolvers
                 item.Path = args.Path;

             }

 

-            Folder parentFolder = args.Parent as Folder;

-

-            if (parentFolder != null)

+            if (args.Parent != null)

             {

-                item.Parent = parentFolder;

+                item.Parent = args.Parent;

             }

 

             item.Id = Kernel.GetMD5(item.Path);