From 9b998a068a2622f43ac813800654e357f94d0c21 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 28 Oct 2015 15:40:38 -0400
Subject: update image encoding

---
 MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index e8bb40ba1..6abfa0674 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -92,7 +92,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 {typeof (FileNotFoundException), 404},
                 {typeof (DirectoryNotFoundException), 404},
                 {typeof (SecurityException), 401},
-                {typeof (UnauthorizedAccessException), 500}
+                {typeof (PaymentRequiredException), 402},
+                {typeof (UnauthorizedAccessException), 500},
+                {typeof (ApplicationException), 500}
             };
 
             HostConfig.Instance.DebugMode = true;
-- 
cgit v1.2.3


From 9abdf5a0450dbd8925b9360d59c4b27d6c0d5c8b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 30 Oct 2015 12:58:36 -0400
Subject: update components

---
 MediaBrowser.Controller/MediaBrowser.Controller.csproj    |  1 -
 MediaBrowser.Controller/Net/PaymentRequiredException.cs   | 15 ---------------
 .../HttpServer/HttpListenerHost.cs                        |  1 +
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Net/PaymentRequiredException.cs

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 600674114..bcf4de2a2 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -248,7 +248,6 @@
     <Compile Include="Net\IWebSocketConnection.cs" />
     <Compile Include="Net\IWebSocketListener.cs" />
     <Compile Include="Net\LoggedAttribute.cs" />
-    <Compile Include="Net\PaymentRequiredException.cs" />
     <Compile Include="Net\SecurityException.cs" />
     <Compile Include="Net\ServiceStackServiceRequest.cs" />
     <Compile Include="Net\StaticResultOptions.cs" />
diff --git a/MediaBrowser.Controller/Net/PaymentRequiredException.cs b/MediaBrowser.Controller/Net/PaymentRequiredException.cs
deleted file mode 100644
index e09fe092e..000000000
--- a/MediaBrowser.Controller/Net/PaymentRequiredException.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Net
-{
-    /// <summary>
-    /// Corresponds to a 402 response code
-    /// </summary>
-    public class PaymentRequiredException : Exception
-    {
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 6abfa0674..e8ed91615 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -19,6 +19,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Security;
 
 namespace MediaBrowser.Server.Implementations.HttpServer
 {
-- 
cgit v1.2.3


From ab6fefbbbdb1afedecc68fe2330bde081cbdbc47 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 14 Nov 2015 14:09:49 -0500
Subject: fixes #1248 - Browsing to /web/ causes error

---
 .../HttpServer/HttpListenerHost.cs                             | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 1ac47016d..6ade9a8f6 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -330,6 +330,16 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 httpRes.RedirectToUrl("emby/" + DefaultRedirectPath);
                 return Task.FromResult(true);
             }
+            if (string.Equals(localPath, "/web", StringComparison.OrdinalIgnoreCase))
+            {
+                httpRes.RedirectToUrl(DefaultRedirectPath);
+                return Task.FromResult(true);
+            }
+            if (string.Equals(localPath, "/web/", StringComparison.OrdinalIgnoreCase))
+            {
+                httpRes.RedirectToUrl("../" + DefaultRedirectPath);
+                return Task.FromResult(true);
+            }
             if (string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase))
             {
                 httpRes.RedirectToUrl(DefaultRedirectPath);
-- 
cgit v1.2.3


From d27cd521b54d0d9c0d2256218e927bb88fd2aac0 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 14 Dec 2015 09:45:42 -0500
Subject: rework dialog

---
 .../Networking/BaseNetworkManager.cs                  |  2 +-
 MediaBrowser.Common/Net/INetworkManager.cs            |  7 +++++++
 .../HttpServer/HttpListenerHost.cs                    | 13 ++++++-------
 .../HttpServer/ServerFactory.cs                       |  5 ++++-
 MediaBrowser.Server.Startup.Common/ApplicationHost.cs |  2 +-
 MediaBrowser.WebDashboard/Api/DashboardService.cs     | 19 +++++++++++++++++++
 .../MediaBrowser.WebDashboard.csproj                  |  5 +----
 7 files changed, 39 insertions(+), 14 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
index 703fec68d..1708206dc 100644
--- a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
+++ b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
@@ -84,7 +84,7 @@ namespace MediaBrowser.Common.Implementations.Networking
             return true;
         }
 
-        private bool IsInPrivateAddressSpace(string endpoint)
+        public bool IsInPrivateAddressSpace(string endpoint)
         {
             if (string.Equals(endpoint, "::1", StringComparison.OrdinalIgnoreCase))
             {
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 8fc947e8f..a3bf1aac8 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -25,6 +25,13 @@ namespace MediaBrowser.Common.Net
         /// <returns>[string] MAC Address</returns>
         string GetMacAddress();
 
+        /// <summary>
+        /// Determines whether [is in private address space] [the specified endpoint].
+        /// </summary>
+        /// <param name="endpoint">The endpoint.</param>
+        /// <returns><c>true</c> if [is in private address space] [the specified endpoint]; otherwise, <c>false</c>.</returns>
+        bool IsInPrivateAddressSpace(string endpoint);
+
         /// <summary>
         /// Gets the network shares.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 6ade9a8f6..847982976 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -19,6 +19,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Security;
 
 namespace MediaBrowser.Server.Implementations.HttpServer
@@ -46,6 +47,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         public string CertificatePath { get; private set; }
 
         private readonly IServerConfigurationManager _config;
+        private readonly INetworkManager _networkManager;
 
         /// <summary>
         /// Gets the local end points.
@@ -69,10 +71,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             ILogManager logManager,
             IServerConfigurationManager config,
             string serviceName,
-            string defaultRedirectPath, params Assembly[] assembliesWithServices)
+            string defaultRedirectPath, INetworkManager networkManager, params Assembly[] assembliesWithServices)
             : base(serviceName, assembliesWithServices)
         {
             DefaultRedirectPath = defaultRedirectPath;
+            _networkManager = networkManager;
             _config = config;
 
             _logger = logManager.GetLogger("HttpServer");
@@ -175,11 +178,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private void OnRequestReceived(string localEndPoint)
         {
-            var ignore = localEndPoint.IndexOf("::", StringComparison.OrdinalIgnoreCase) != -1 ||
-
-                localEndPoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
-                localEndPoint.StartsWith("localhost", StringComparison.OrdinalIgnoreCase) ||
-                localEndPoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
+            var ignore = _networkManager.IsInPrivateAddressSpace(localEndPoint);
 
             if (ignore)
             {
@@ -188,7 +187,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             if (_localEndpointLock.TryEnterWriteLock(100))
             {
-                var list = _localEndpoints.ToList();
+                var list = _localEndpoints;
 
                 list.Remove(localEndPoint);
                 list.Insert(0, localEndPoint);
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
index 4d81ec157..cc351f6b3 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Logging;
@@ -17,18 +18,20 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// <param name="applicationHost">The application host.</param>
         /// <param name="logManager">The log manager.</param>
         /// <param name="config">The configuration.</param>
+        /// <param name="_networkmanager">The _networkmanager.</param>
         /// <param name="serverName">Name of the server.</param>
         /// <param name="defaultRedirectpath">The default redirectpath.</param>
         /// <returns>IHttpServer.</returns>
         public static IHttpServer CreateServer(IApplicationHost applicationHost,
             ILogManager logManager,
             IServerConfigurationManager config, 
+            INetworkManager _networkmanager,
             string serverName, 
             string defaultRedirectpath)
         {
             LogManager.LogFactory = new ServerLogFactory(logManager);
 
-            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath);
+            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, _networkmanager);
         }
     }
 }
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index f0fe68dd8..f4da52f2e 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -436,7 +436,7 @@ namespace MediaBrowser.Server.Startup.Common
 
             RegisterSingleInstance<ISearchEngine>(() => new SearchEngine(LogManager, LibraryManager, UserManager));
 
-            HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, "Emby", "web/index.html");
+            HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, "Emby", "web/index.html");
             HttpServer.GlobalResponse = LocalizationManager.GetLocalizedString("StartupEmbyServerIsLoading");
             RegisterSingleInstance(HttpServer, false);
             progress.Report(10);
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 0ee62cb96..2fc77dff4 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -310,6 +310,7 @@ namespace MediaBrowser.WebDashboard.Api
             DeleteFilesByExtension(bowerPath, ".md");
             DeleteFilesByExtension(bowerPath, ".json");
             DeleteFilesByExtension(bowerPath, ".gz");
+            DeleteFilesByExtension(bowerPath, ".bat");
             DeleteFilesByName(bowerPath, "copying", true);
             DeleteFilesByName(bowerPath, "license", true);
             DeleteFilesByName(bowerPath, "license-mit", true);
@@ -330,6 +331,8 @@ namespace MediaBrowser.WebDashboard.Api
             DeleteFoldersByName(bowerPath, "grunt");
             DeleteFoldersByName(bowerPath, "rollups");
 
+            DeleteCryptoFiles(Path.Combine(bowerPath, "cryptojslib", "components"));
+
             DeleteFoldersByName(Path.Combine(bowerPath, "jquery"), "src");
             DeleteFoldersByName(Path.Combine(bowerPath, "jstree"), "src");
             DeleteFoldersByName(Path.Combine(bowerPath, "Sortable"), "meteor");
@@ -357,6 +360,22 @@ namespace MediaBrowser.WebDashboard.Api
             return "";
         }
 
+        private void DeleteCryptoFiles(string path)
+        {
+            var files = _fileSystem.GetFiles(path)
+                .ToList();
+
+            var keepFiles = new[] { "core-min.js", "md5-min.js", "sha1-min.js" };
+
+            foreach (var file in files)
+            {
+                if (!keepFiles.Contains(file.Name, StringComparer.OrdinalIgnoreCase))
+                {
+                    _fileSystem.DeleteFile(file.FullName);
+                }
+            }
+        }
+
         private void DeleteFilesByExtension(string path, string extension)
         {
             var files = _fileSystem.GetFiles(path, true)
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 4ce05415b..975c60a0b 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -116,15 +116,12 @@
     <Content Include="dashboard-ui\apiclient\sync\serversync.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\components\buttonenabled.js">
+    <Content Include="dashboard-ui\legacy\buttonenabled.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="dashboard-ui\components\collectioneditor\collectioneditor.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\components\dialog.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\components\directorybrowser\directorybrowser.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
cgit v1.2.3


From b46ef16ba838dafbd79f6e9ffbea37afa2104b0b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 28 Dec 2015 22:39:38 -0500
Subject: update local address detection

---
 MediaBrowser.Api/System/SystemService.cs           | 11 ++++
 .../Networking/BaseNetworkManager.cs               |  4 +-
 MediaBrowser.Controller/IServerApplicationHost.cs  |  4 +-
 MediaBrowser.Controller/Net/IHttpServer.cs         |  6 --
 MediaBrowser.Dlna/Main/DlnaEntryPoint.cs           | 44 +++++++------
 MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs          |  7 ++-
 .../HttpServer/HttpListenerHost.cs                 | 38 ------------
 .../ApplicationHost.cs                             | 72 +++++++++++++++-------
 8 files changed, 95 insertions(+), 91 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
index a95fcb542..4faff8780 100644
--- a/MediaBrowser.Api/System/SystemService.cs
+++ b/MediaBrowser.Api/System/SystemService.cs
@@ -32,6 +32,12 @@ namespace MediaBrowser.Api.System
 
     }
 
+    [Route("/System/Ping", "POST")]
+    public class PingSystem : IReturnVoid
+    {
+
+    }
+
     /// <summary>
     /// Class RestartApplication
     /// </summary>
@@ -117,6 +123,11 @@ namespace MediaBrowser.Api.System
             return ToOptimizedResult(result);
         }
 
+        public void Post(PingSystem request)
+        {
+            
+        }
+
         public object Get(GetServerLogs request)
         {
             List<FileSystemMetadata> files;
diff --git a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
index 789cde5fc..9b278b889 100644
--- a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
+++ b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
@@ -69,7 +69,7 @@ namespace MediaBrowser.Common.Implementations.Networking
 				list.AddRange(GetLocalIpAddressesFallback());
             }
 
-			return list.Where(i => !IPAddress.IsLoopback(i)).Where(FilterIpAddress).DistinctBy(i => i.ToString());
+			return list.Where(FilterIpAddress).DistinctBy(i => i.ToString());
         }
 
 		private bool FilterIpAddress(IPAddress address)
@@ -232,7 +232,7 @@ namespace MediaBrowser.Common.Implementations.Networking
 
 					return properties.UnicastAddresses
                         .Select(i => i.Address)
-                        .Where(i => i.AddressFamily == AddressFamily.InterNetwork && !IPAddress.IsLoopback(i))
+                        .Where(i => i.AddressFamily == AddressFamily.InterNetwork)
 						.ToList();
 				}
 				catch (Exception ex)
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 1b842a5f6..fb843d191 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -1,6 +1,8 @@
 using MediaBrowser.Common;
 using MediaBrowser.Model.System;
 using System;
+using System.Collections.Generic;
+using System.Net;
 
 namespace MediaBrowser.Controller
 {
@@ -63,7 +65,7 @@ namespace MediaBrowser.Controller
         /// Gets the local ip address.
         /// </summary>
         /// <value>The local ip address.</value>
-        string LocalIpAddress { get; }
+        List<IPAddress> LocalIpAddresses { get; }
 
         /// <summary>
         /// Gets the local API URL.
diff --git a/MediaBrowser.Controller/Net/IHttpServer.cs b/MediaBrowser.Controller/Net/IHttpServer.cs
index 91da5fab2..97c5dd31b 100644
--- a/MediaBrowser.Controller/Net/IHttpServer.cs
+++ b/MediaBrowser.Controller/Net/IHttpServer.cs
@@ -28,12 +28,6 @@ namespace MediaBrowser.Controller.Net
         /// the ssl certificate localtion on the file system.</param>
         void StartServer(IEnumerable<string> urlPrefixes, string certificatePath);
 
-        /// <summary>
-        /// Gets the local end points.
-        /// </summary>
-        /// <value>The local end points.</value>
-        IEnumerable<string> LocalEndPoints { get; }
-
         /// <summary>
         /// Stops this instance.
         /// </summary>
diff --git a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
index 37cca43eb..d79ef9eaf 100644
--- a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
+++ b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
@@ -43,19 +43,19 @@ namespace MediaBrowser.Dlna.Main
         private readonly List<string> _registeredServerIds = new List<string>();
         private bool _dlnaServerStarted;
 
-        public DlnaEntryPoint(IServerConfigurationManager config, 
-            ILogManager logManager, 
-            IServerApplicationHost appHost, 
-            INetworkManager network, 
-            ISessionManager sessionManager, 
-            IHttpClient httpClient, 
-            ILibraryManager libraryManager, 
-            IUserManager userManager, 
-            IDlnaManager dlnaManager, 
-            IImageProcessor imageProcessor, 
-            IUserDataManager userDataManager, 
-            ILocalizationManager localization, 
-            IMediaSourceManager mediaSourceManager, 
+        public DlnaEntryPoint(IServerConfigurationManager config,
+            ILogManager logManager,
+            IServerApplicationHost appHost,
+            INetworkManager network,
+            ISessionManager sessionManager,
+            IHttpClient httpClient,
+            ILibraryManager libraryManager,
+            IUserManager userManager,
+            IDlnaManager dlnaManager,
+            IImageProcessor imageProcessor,
+            IUserDataManager userDataManager,
+            ILocalizationManager localization,
+            IMediaSourceManager mediaSourceManager,
             ISsdpHandler ssdpHandler, IDeviceDiscovery deviceDiscovery)
         {
             _config = config;
@@ -148,14 +148,20 @@ namespace MediaBrowser.Dlna.Main
 
         private void RegisterServerEndpoints()
         {
-            foreach (var address in _network.GetLocalIpAddresses())
+            foreach (var address in _appHost.LocalIpAddresses)
             {
-				var addressString = address.ToString ();
-				var guid = addressString.GetMD5();
+                //if (IPAddress.IsLoopback(address))
+                //{
+                //    // Should we allow this?
+                //    continue;
+                //}
+
+                var addressString = address.ToString();
+                var guid = addressString.GetMD5();
 
                 var descriptorURI = "/dlna/" + guid.ToString("N") + "/description.xml";
 
-				var uri = new Uri(_appHost.GetLocalApiUrl(addressString) + descriptorURI);
+                var uri = new Uri(_appHost.GetLocalApiUrl(addressString) + descriptorURI);
 
                 var services = new List<string>
                 {
@@ -166,8 +172,8 @@ namespace MediaBrowser.Dlna.Main
                     "urn:microsoft.com:service:X_MS_MediaReceiverRegistrar:1",
                     "uuid:" + guid.ToString("N")
                 };
-                
-				_ssdpHandler.RegisterNotification(guid, uri, address, services);
+
+                _ssdpHandler.RegisterNotification(guid, uri, address, services);
 
                 _registeredServerIds.Add(guid.ToString("N"));
             }
diff --git a/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs b/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
index 457134913..279979550 100644
--- a/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
+++ b/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
@@ -110,8 +110,11 @@ namespace MediaBrowser.Dlna.Ssdp
             {
                 if (e.LocalEndPoint == null)
                 {
-                    var ip = _appHost.LocalIpAddress;
-                    e.LocalEndPoint = new IPEndPoint(IPAddress.Parse(ip), 0);
+                    var ip = _appHost.LocalIpAddresses.FirstOrDefault(i => !IPAddress.IsLoopback(i));
+                    if (ip != null)
+                    {
+                        e.LocalEndPoint = new IPEndPoint(ip, 0);
+                    }
                 }
 
                 if (e.LocalEndPoint != null)
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 847982976..0283c1f7a 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -40,33 +40,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         public event EventHandler<WebSocketConnectEventArgs> WebSocketConnected;
         public event EventHandler<WebSocketConnectingEventArgs> WebSocketConnecting;
 
-        private readonly List<string> _localEndpoints = new List<string>();
-
-        private readonly ReaderWriterLockSlim _localEndpointLock = new ReaderWriterLockSlim();
-
         public string CertificatePath { get; private set; }
 
         private readonly IServerConfigurationManager _config;
         private readonly INetworkManager _networkManager;
 
-        /// <summary>
-        /// Gets the local end points.
-        /// </summary>
-        /// <value>The local end points.</value>
-        public IEnumerable<string> LocalEndPoints
-        {
-            get
-            {
-                _localEndpointLock.EnterReadLock();
-
-                var list = _localEndpoints.ToList();
-
-                _localEndpointLock.ExitReadLock();
-
-                return list;
-            }
-        }
-
         public HttpListenerHost(IApplicationHost applicationHost,
             ILogManager logManager,
             IServerConfigurationManager config,
@@ -178,22 +156,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private void OnRequestReceived(string localEndPoint)
         {
-            var ignore = _networkManager.IsInPrivateAddressSpace(localEndPoint);
-
-            if (ignore)
-            {
-                return;
-            }
-
-            if (_localEndpointLock.TryEnterWriteLock(100))
-            {
-                var list = _localEndpoints;
-
-                list.Remove(localEndPoint);
-                list.Insert(0, localEndPoint);
-
-                _localEndpointLock.ExitWriteLock();
-            }
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 2bdb138d7..a4760f3af 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -91,10 +91,12 @@ using MediaBrowser.Server.Startup.Common.Migrations;
 using MediaBrowser.WebDashboard.Api;
 using MediaBrowser.XbmcMetadata.Providers;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -207,6 +209,7 @@ namespace MediaBrowser.Server.Startup.Common
         private readonly string _remotePackageName;
 
         internal INativeApp NativeApp { get; set; }
+        private Timer _ipAddressCacheTimer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ApplicationHost" /> class.
@@ -230,6 +233,8 @@ namespace MediaBrowser.Server.Startup.Common
             NativeApp = nativeApp;
 
             SetBaseExceptionMessage();
+
+            _ipAddressCacheTimer = new Timer(OnCacheClearTimerFired, null, TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(3));
         }
 
         private Version _version;
@@ -1116,14 +1121,14 @@ namespace MediaBrowser.Server.Startup.Common
                 try
                 {
                     // Return the first matched address, if found, or the first known local address
-                    var address = LocalIpAddress;
+                    var address = LocalIpAddresses.FirstOrDefault(i => !IPAddress.IsLoopback(i));
 
-                    if (!string.IsNullOrWhiteSpace(address))
+                    if (address != null)
                     {
-                        address = GetLocalApiUrl(address);
+                        return GetLocalApiUrl(address.ToString());
                     }
 
-                    return address;
+                    return null;
                 }
                 catch (Exception ex)
                 {
@@ -1141,39 +1146,60 @@ namespace MediaBrowser.Server.Startup.Common
                 HttpPort.ToString(CultureInfo.InvariantCulture));
         }
 
-        public string LocalIpAddress
+        public List<IPAddress> LocalIpAddresses
         {
             get
             {
-                return HttpServerIpAddresses.FirstOrDefault();
+                var localAddresses = NetworkManager.GetLocalIpAddresses()
+                    .Where(IsIpAddressValid)
+                    .ToList();
+
+                return localAddresses;
             }
         }
 
-        private IEnumerable<string> HttpServerIpAddresses
+        private readonly ConcurrentDictionary<string, bool> _validAddressResults = new ConcurrentDictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
+        private bool IsIpAddressValid(IPAddress address)
         {
-            get
+            if (IPAddress.IsLoopback(address))
             {
-                var localAddresses = NetworkManager.GetLocalIpAddresses()
-					.Select(i => i.ToString())
-                    .ToList();
+                return true;
+            }
 
-                var httpServerAddresses = HttpServer.LocalEndPoints
-                    .Select(i => i.Split(':').FirstOrDefault())
-                    .Where(i => !string.IsNullOrEmpty(i))
-                    .ToList();
+            var apiUrl = GetLocalApiUrl(address.ToString());
+            apiUrl += "/system/ping";
 
-                // Cross-check the local ip addresses with addresses that have been received on with the http server
-                var matchedAddresses = httpServerAddresses
-                    .Where(i => localAddresses.Contains(i, StringComparer.OrdinalIgnoreCase))
-                    .ToList();
+            bool cachedResult;
+            if (_validAddressResults.TryGetValue(apiUrl, out cachedResult))
+            {
+                return cachedResult;
+            }
 
-                if (matchedAddresses.Count == 0)
+            try
+            {
+                using (var response = HttpClient.SendAsync(new HttpRequestOptions
                 {
-                    return localAddresses;
-                }
+                    Url = apiUrl,
+                    BufferContent = false,
+                    LogErrorResponseBody = false,
+                    LogErrors = false
 
-                return matchedAddresses;
+                }, "POST").Result)
+                {
+                    _validAddressResults.AddOrUpdate(apiUrl, true, (k, v) => true);
+                    return true;
+                }
             }
+            catch
+            {
+                _validAddressResults.AddOrUpdate(apiUrl, true, (k, v) => false);
+                return false;
+            }
+        }
+
+        private void OnCacheClearTimerFired(object state)
+        {
+            _validAddressResults.Clear();
         }
 
         public string FriendlyName
-- 
cgit v1.2.3


From 984274964365c3c0435d7c885e00dcf261fa061e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 21 Jan 2016 14:45:52 -0500
Subject: trim logging

---
 .../TV/MissingEpisodeProvider.cs                   |  2 +-
 .../HttpServer/HttpListenerHost.cs                 |  6 +--
 .../SocketSharp/WebSocketSharpListener.cs          | 56 ++++++++++++----------
 3 files changed, 34 insertions(+), 30 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs b/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
index 19eda4905..9c0e0b873 100644
--- a/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
@@ -53,7 +53,7 @@ namespace MediaBrowser.Providers.TV
                 }
                 catch (DirectoryNotFoundException)
                 {
-                    _logger.Warn("Series files missing for series id {0}", seriesGroup.Key);
+                    //_logger.Warn("Series files missing for series id {0}", seriesGroup.Key);
                 }
                 catch (Exception ex)
                 {
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 0283c1f7a..6a23a8497 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -154,10 +154,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return this;
         }
 
-        private void OnRequestReceived(string localEndPoint)
-        {
-        }
-
         /// <summary>
         /// Starts the Web Service
         /// </summary>
@@ -177,7 +173,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private IHttpListener GetListener()
         {
-            return new WebSocketSharpListener(_logger, OnRequestReceived, CertificatePath);
+            return new WebSocketSharpListener(_logger, CertificatePath);
         }
 
         private void OnWebSocketConnecting(WebSocketConnectingEventArgs args)
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index 9f80c8ac9..a91b1e3ed 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -7,6 +7,7 @@ using ServiceStack.Web;
 using SocketHttpListener.Net;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -18,14 +19,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         private HttpListener _listener;
 
         private readonly ILogger _logger;
-        private readonly Action<string> _endpointListener;
         private readonly string _certificatePath;
 
-        public WebSocketSharpListener(ILogger logger, Action<string> endpointListener,
-            string certificatePath)
+        public WebSocketSharpListener(ILogger logger, string certificatePath)
         {
             _logger = logger;
-            _endpointListener = endpointListener;
             _certificatePath = certificatePath;
         }
 
@@ -80,7 +78,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         {
             var request = context.Request;
 
-            LogHttpRequest(request);
+            LogRequest(_logger, request);
 
             if (request.IsWebSocketRequest)
             {
@@ -96,24 +94,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             return RequestHandler(httpReq, request.Url);
         }
 
-        /// <summary>
-        /// Logs the HTTP request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        private void LogHttpRequest(HttpListenerRequest request)
-        {
-            var endpoint = request.LocalEndPoint;
-
-            if (endpoint != null)
-            {
-                var address = endpoint.ToString();
-
-                _endpointListener(address);
-            }
-
-            LogRequest(_logger, request);
-        }
-
         private void ProcessWebSocketRequest(HttpListenerContext ctx)
         {
             try
@@ -183,7 +163,35 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         /// <param name="request">The request.</param>
         private static void LogRequest(ILogger logger, HttpListenerRequest request)
         {
-            logger.Info("{0} {1}. UserAgent: {2}", (request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod), request.Url, request.UserAgent ?? string.Empty);
+            var url = request.Url.ToString();
+            var extension = Path.GetExtension(url);
+
+            if (string.Equals(extension, ".js", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+            if (string.Equals(extension, ".css", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+            if (string.Equals(extension, ".woff", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+            if (string.Equals(extension, ".woff2", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+            if (string.Equals(extension, ".ttf", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+            if (string.Equals(extension, ".html", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            logger.Info("{0} {1}. UserAgent: {2}", (request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod), url, request.UserAgent ?? string.Empty);
         }
 
         private void HandleError(Exception ex, HttpListenerContext context)
-- 
cgit v1.2.3


From 3b0b607836ad1ecd89579c72b019668bd4675a73 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 22 Jan 2016 22:10:21 -0500
Subject: trim logging

---
 .../HttpServer/HttpListenerHost.cs                 | 34 ++++++++++++++++--
 .../HttpServer/LoggerUtils.cs                      | 19 ++++++++++
 .../SocketSharp/WebSocketSharpListener.cs          | 42 ++--------------------
 3 files changed, 52 insertions(+), 43 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 6a23a8497..8d8d7f6f7 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -256,6 +256,25 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             }
         }
 
+        private readonly Dictionary<string, int> _skipLogExtensions = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase)
+        {
+            {".js", 0},
+            {".css", 0},
+            {".woff", 0},
+            {".woff2", 0},
+            {".ttf", 0},
+            {".html", 0}
+        };
+
+        private bool EnableLogging(string url)
+        {
+            var parts = url.Split(new[] { '?' }, 2);
+
+            var extension = Path.GetExtension(parts[0]);
+
+            return string.IsNullOrWhiteSpace(extension) || !_skipLogExtensions.ContainsKey(extension);
+        }
+
         /// <summary>
         /// Overridable method that can be used to implement a custom hnandler
         /// </summary>
@@ -271,6 +290,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             var operationName = httpReq.OperationName;
             var localPath = url.LocalPath;
 
+            var urlString = url.ToString();
+            var enableLog = EnableLogging(urlString);
+
+            if (enableLog)
+            {
+                LoggerUtils.LogRequest(_logger, urlString, httpReq.HttpMethod, httpReq.UserAgent);
+            }
+            
             if (string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(localPath, "/emby/", StringComparison.OrdinalIgnoreCase))
             {
@@ -333,15 +360,16 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 task.ContinueWith(x => httpRes.Close(), TaskContinuationOptions.OnlyOnRanToCompletion | TaskContinuationOptions.AttachedToParent);
                 //Matches Exceptions handled in HttpListenerBase.InitTask()
 
-                var urlString = url.ToString();
-
                 task.ContinueWith(x =>
                 {
                     var statusCode = httpRes.StatusCode;
 
                     var duration = DateTime.Now - date;
 
-                    LoggerUtils.LogResponse(_logger, statusCode, urlString, remoteIp, duration);
+                    if (enableLog)
+                    {
+                        LoggerUtils.LogResponse(_logger, statusCode, urlString, remoteIp, duration);
+                    }
 
                 }, TaskContinuationOptions.None);
                 return task;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs b/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
index fae702023..0b8caaa6e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
@@ -1,11 +1,30 @@
 using MediaBrowser.Model.Logging;
 using System;
 using System.Globalization;
+using System.IO;
+using SocketHttpListener.Net;
 
 namespace MediaBrowser.Server.Implementations.HttpServer
 {
     public static class LoggerUtils
     {
+        /// <summary>
+        /// Logs the request.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="request">The request.</param>
+        public static void LogRequest(ILogger logger, HttpListenerRequest request)
+        {
+            var url = request.Url.ToString();
+
+            logger.Info("{0} {1}. UserAgent: {2}", (request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod), url, request.UserAgent ?? string.Empty);
+        }
+
+        public static void LogRequest(ILogger logger, string url, string method, string userAgent)
+        {
+            logger.Info("{0} {1}. UserAgent: {2}", ("HTTP " + method), url, userAgent ?? string.Empty);
+        }
+
         /// <summary>
         /// Logs the response.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index a91b1e3ed..a029e0955 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -78,10 +78,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         {
             var request = context.Request;
 
-            LogRequest(_logger, request);
-
             if (request.IsWebSocketRequest)
             {
+                LoggerUtils.LogRequest(_logger, request);
+
                 ProcessWebSocketRequest(context);
                 return Task.FromResult(true);
             }
@@ -156,44 +156,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             return req;
         }
 
-        /// <summary>
-        /// Logs the request.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="request">The request.</param>
-        private static void LogRequest(ILogger logger, HttpListenerRequest request)
-        {
-            var url = request.Url.ToString();
-            var extension = Path.GetExtension(url);
-
-            if (string.Equals(extension, ".js", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-            if (string.Equals(extension, ".css", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-            if (string.Equals(extension, ".woff", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-            if (string.Equals(extension, ".woff2", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-            if (string.Equals(extension, ".ttf", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-            if (string.Equals(extension, ".html", StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            logger.Info("{0} {1}. UserAgent: {2}", (request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod), url, request.UserAgent ?? string.Empty);
-        }
-
         private void HandleError(Exception ex, HttpListenerContext context)
         {
             var httpReq = GetRequest(context);
-- 
cgit v1.2.3


From 0474a225c4347e2eee86b66b123f44f63b3667d7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 27 Jan 2016 13:35:37 -0500
Subject: fixes #1421 - LogRequest() in WebSocketSharpListener broken for
 Reports

---
 MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 8d8d7f6f7..038116703 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -290,7 +290,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             var operationName = httpReq.OperationName;
             var localPath = url.LocalPath;
 
-            var urlString = url.ToString();
+            var urlString = url.OriginalString;
             var enableLog = EnableLogging(urlString);
 
             if (enableLog)
-- 
cgit v1.2.3


From 96120099cb2a1d23e46fc32b2985cabd1fa2a84a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 1 Feb 2016 14:54:49 -0500
Subject: add message for db upgrade

---
 .../HttpServer/HttpListenerHost.cs                 | 17 ++++++++--
 .../Localization/Core/core.json                    |  3 +-
 .../Localization/Core/en-US.json                   |  3 +-
 .../Persistence/CleanDatabaseScheduledTask.cs      | 36 ++++++++++++++++++++--
 .../Persistence/SqliteItemRepository.cs            |  2 +-
 .../Migrations/DbMigration.cs                      |  4 ++-
 6 files changed, 55 insertions(+), 10 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 038116703..78d7a480e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -268,13 +268,18 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private bool EnableLogging(string url)
         {
-            var parts = url.Split(new[] { '?' }, 2);
-
-            var extension = Path.GetExtension(parts[0]);
+            var extension = GetExtension(url);
 
             return string.IsNullOrWhiteSpace(extension) || !_skipLogExtensions.ContainsKey(extension);
         }
 
+        private string GetExtension(string url)
+        {
+            var parts = url.Split(new[] { '?' }, 2);
+
+            return Path.GetExtension(parts[0]);
+        }
+
         /// <summary>
         /// Overridable method that can be used to implement a custom hnandler
         /// </summary>
@@ -339,6 +344,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             {
                 httpRes.Write(GlobalResponse);
                 httpRes.ContentType = "text/plain";
+
+                if (!string.Equals(GetExtension(urlString), "html", StringComparison.OrdinalIgnoreCase))
+                {
+                    httpRes.StatusCode = 503;
+                }
+
                 return Task.FromResult(true);
             }
 
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/core.json b/MediaBrowser.Server.Implementations/Localization/Core/core.json
index 5f11b9436..976faa8cb 100644
--- a/MediaBrowser.Server.Implementations/Localization/Core/core.json
+++ b/MediaBrowser.Server.Implementations/Localization/Core/core.json
@@ -174,5 +174,6 @@
     "HeaderWriter": "Writers",
     "HeaderParentalRatings": "Parental Ratings",
     "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly.",
+    "DbUpgradeMessage":  "Please wait while your Emby Server database is upgraded. {0}% complete."
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/en-US.json b/MediaBrowser.Server.Implementations/Localization/Core/en-US.json
index e444c0e93..b1e8658de 100644
--- a/MediaBrowser.Server.Implementations/Localization/Core/en-US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Core/en-US.json
@@ -173,5 +173,6 @@
     "HeaderWriter": "Writers",
     "HeaderParentalRatings": "Parental Ratings",
     "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly.",
+    "DbUpgradeMessage":  "Please wait while your Emby Server database is upgraded. {0}% complete."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
index 69ddb4d13..f4eb4ef8a 100644
--- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
@@ -9,11 +9,14 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Localization;
+using MediaBrowser.Controller.Net;
 
 namespace MediaBrowser.Server.Implementations.Persistence
 {
@@ -24,16 +27,21 @@ namespace MediaBrowser.Server.Implementations.Persistence
         private readonly ILogger _logger;
         private readonly IServerConfigurationManager _config;
         private readonly IFileSystem _fileSystem;
+        private readonly IHttpServer _httpServer;
+        private readonly ILocalizationManager _localization;
 
-        public const int MigrationVersion = 7;
+        public const int MigrationVersion = 12;
+        public static bool EnableUnavailableMessage = false;
 
-        public CleanDatabaseScheduledTask(ILibraryManager libraryManager, IItemRepository itemRepo, ILogger logger, IServerConfigurationManager config, IFileSystem fileSystem)
+        public CleanDatabaseScheduledTask(ILibraryManager libraryManager, IItemRepository itemRepo, ILogger logger, IServerConfigurationManager config, IFileSystem fileSystem, IHttpServer httpServer, ILocalizationManager localization)
         {
             _libraryManager = libraryManager;
             _itemRepo = itemRepo;
             _logger = logger;
             _config = config;
             _fileSystem = fileSystem;
+            _httpServer = httpServer;
+            _localization = localization;
         }
 
         public string Name
@@ -54,7 +62,23 @@ namespace MediaBrowser.Server.Implementations.Persistence
         public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
         {
             var innerProgress = new ActionableProgress<double>();
-            innerProgress.RegisterAction(p => progress.Report(.4 * p));
+            innerProgress.RegisterAction(p =>
+            {
+                double newPercentCommplete = .4 * p;
+                if (EnableUnavailableMessage)
+                {
+                    var html = "<!doctype html><html><head><title>Emby</title></head><body>";
+                    var text = _localization.GetLocalizedString("DbUpgradeMessage");
+                    html += string.Format(text, newPercentCommplete.ToString("N2", CultureInfo.InvariantCulture));
+
+                    html += "<script>setTimeout(function(){window.location.reload(true);}, 5000);</script>";
+                    html += "</body></html>";
+
+                    _httpServer.GlobalResponse = html;
+                }
+
+                progress.Report(newPercentCommplete);
+            });
 
             await UpdateToLatestSchema(cancellationToken, innerProgress).ConfigureAwait(false);
 
@@ -69,6 +93,12 @@ namespace MediaBrowser.Server.Implementations.Persistence
             progress.Report(100);
 
             await _itemRepo.UpdateInheritedValues(cancellationToken).ConfigureAwait(false);
+
+            if (EnableUnavailableMessage)
+            {
+                EnableUnavailableMessage = false;
+                _httpServer.GlobalResponse = null;
+            }
         }
 
         private async Task UpdateToLatestSchema(CancellationToken cancellationToken, IProgress<double> progress)
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 3d5ddcf49..7898dc1ef 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -82,7 +82,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
         private IDbCommand _updateInheritedRatingCommand;
         
-        private const int LatestSchemaVersion = 40;
+        private const int LatestSchemaVersion = 44;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs b/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
index cdb69025a..1df49845b 100644
--- a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
+++ b/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
@@ -20,9 +20,11 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
         {
             if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)
             {
+                CleanDatabaseScheduledTask.EnableUnavailableMessage = true;
+                
                 Task.Run(async () =>
                 {
-                    await Task.Delay(2000).ConfigureAwait(false);
+                    await Task.Delay(1000).ConfigureAwait(false);
 
                     _taskManager.QueueScheduledTask<CleanDatabaseScheduledTask>();
                 });
-- 
cgit v1.2.3


From 07cfac913b0920b986b837fc8afd9fdefac7d57b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 3 Feb 2016 16:56:00 -0500
Subject: update upgrade process

---
 .../HttpServer/HttpListenerHost.cs                         | 14 +++++++++++---
 .../Persistence/CleanDatabaseScheduledTask.cs              | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 78d7a480e..d91d80dbd 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -266,11 +266,19 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             {".html", 0}
         };
 
-        private bool EnableLogging(string url)
+        private bool EnableLogging(string url, string localPath)
         {
             var extension = GetExtension(url);
 
-            return string.IsNullOrWhiteSpace(extension) || !_skipLogExtensions.ContainsKey(extension);
+            if (string.IsNullOrWhiteSpace(extension) || !_skipLogExtensions.ContainsKey(extension))
+            {
+                if (string.IsNullOrWhiteSpace(localPath) || localPath.IndexOf("system/ping", StringComparison.OrdinalIgnoreCase) == -1)
+                {
+                    return true;
+                }
+            }
+
+            return false;
         }
 
         private string GetExtension(string url)
@@ -296,7 +304,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             var localPath = url.LocalPath;
 
             var urlString = url.OriginalString;
-            var enableLog = EnableLogging(urlString);
+            var enableLog = EnableLogging(urlString, localPath);
 
             if (enableLog)
             {
diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
index 76a6e6d40..f7c6fe502 100644
--- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
@@ -64,6 +64,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
         public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
         {
+            OnProgress(0);
+
             var innerProgress = new ActionableProgress<double>();
             innerProgress.RegisterAction(p =>
             {
@@ -146,6 +148,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 if (itemId != Guid.Empty)
                 {
+                    LogMessage(string.Format("Querying item {0}", itemId));
+
                     // Somehow some invalid data got into the db. It probably predates the boundary checking
                     var item = _libraryManager.GetItemById(itemId);
 
@@ -153,6 +157,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     {
                         try
                         {
+                            LogMessage(string.Format("Saving item {0}", itemId));
+
                             await _itemRepo.SaveItem(item, cancellationToken).ConfigureAwait(false);
                         }
                         catch (OperationCanceledException)
@@ -175,6 +181,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
             progress.Report(100);
         }
 
+        private void LogMessage(string msg)
+        {
+            if (EnableUnavailableMessage)
+            {
+                _logger.Info(msg);
+            }
+        }
+
         private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
         {
             var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
-- 
cgit v1.2.3


From 94c70af4ad44bc0b0f507cea79dc1d97db66855c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 4 Feb 2016 13:04:04 -0500
Subject: update db migration

---
 .../HttpServer/HttpListenerHost.cs                           | 12 +++++++-----
 .../Persistence/CleanDatabaseScheduledTask.cs                | 11 ++---------
 .../Persistence/SqliteItemRepository.cs                      |  6 ------
 MediaBrowser.Server.Startup.Common/ApplicationHost.cs        |  3 ++-
 MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs |  3 ++-
 5 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index d91d80dbd..a11eb3aaa 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -241,7 +241,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             }
             catch (Exception errorEx)
             {
-                _logger.ErrorException("Error this.ProcessRequest(context)(Exception while writing error to the response)", errorEx);
+                //_logger.ErrorException("Error this.ProcessRequest(context)(Exception while writing error to the response)", errorEx);
             }
         }
 
@@ -350,10 +350,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             if (!string.IsNullOrWhiteSpace(GlobalResponse))
             {
-                httpRes.Write(GlobalResponse);
-                httpRes.ContentType = "text/plain";
-
-                if (!string.Equals(GetExtension(urlString), "html", StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(GetExtension(urlString), "html", StringComparison.OrdinalIgnoreCase))
+                {
+                    httpRes.Write(GlobalResponse);
+                    httpRes.ContentType = "text/plain";
+                }
+                else
                 {
                     httpRes.StatusCode = 503;
                 }
diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
index 5c600c249..0959e2123 100644
--- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
@@ -67,7 +67,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
         {
             OnProgress(0);
 
-            // Ensure these objects are out of the database.
+            // Ensure these objects are lazy loaded.
+            // Without this there is a deadlock that will need to be investigated
             var rootChildren = _libraryManager.RootFolder.Children.ToList();
             rootChildren = _libraryManager.GetUserRootFolder().Children.ToList();
 
@@ -182,14 +183,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
             progress.Report(100);
         }
 
-        private void LogMessage(string msg)
-        {
-            if (EnableUnavailableMessage)
-            {
-                _logger.Info(msg);
-            }
-        }
-
         private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
         {
             var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 3dc37110e..7898dc1ef 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -583,22 +583,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             CheckDisposed();
 
-            _logger.Info("SaveItems waiting on write lock");
-
             await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
 
             IDbTransaction transaction = null;
 
             try
             {
-                _logger.Info("SaveItems creating transaction");
-                
                 transaction = _connection.BeginTransaction();
 
                 foreach (var item in items)
                 {
-                    _logger.Info("Saving {0}", item.Id);
-                    
                     cancellationToken.ThrowIfCancellationRequested();
 
                     var index = 0;
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 46dfd4469..36d15b95a 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -317,7 +317,8 @@ namespace MediaBrowser.Server.Startup.Common
         /// <returns>Task.</returns>
         public override async Task RunStartupTasks()
         {
-            if (ServerConfigurationManager.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)
+            if (ServerConfigurationManager.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion &&
+                ServerConfigurationManager.Configuration.IsStartupWizardCompleted)
             {
                 TaskManager.SuspendTriggers = true;
             }
diff --git a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs b/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
index 5a70467f7..3cd92bcde 100644
--- a/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
+++ b/MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
@@ -18,7 +18,8 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
 
         public void Run()
         {
-            if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)
+            if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion && 
+                _config.Configuration.IsStartupWizardCompleted)
             {
                 _taskManager.SuspendTriggers = true;
                 CleanDatabaseScheduledTask.EnableUnavailableMessage = true;
-- 
cgit v1.2.3