Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

9 files changed, 33 insertions, 20 deletions

diff --git a/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs b/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
index 227bd954a..8c9815134 100644
--- a/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
+++ b/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Api.Playback
                 {
                     using (var remoteStream = await _msg.Content.ReadAsStreamAsync().ConfigureAwait(false))
                     {
-                        await remoteStream.CopyToAsync(responseStream, 8192000).ConfigureAwait(false);
+                        await remoteStream.CopyToAsync(responseStream, 819200).ConfigureAwait(false);
                     }
                 }
             }
diff --git a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
index 9986f90ec..1d8849648 100644
--- a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
@@ -67,12 +67,15 @@ namespace MediaBrowser.Model.Querying
         /// <value>The sort by.</value>
         public string[] SortBy { get; set; }
 
+        public ImageType[] ImageTypes { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemsByNameQuery"/> class.
         /// </summary>
         public ItemsByNameQuery()
         {
-            Fields = new ItemFields[] {};
+            ImageTypes = new ImageType[] { };
+            Fields = new ItemFields[] { };
             Recursive = true;
             MediaTypes = new string[] { };
             SortBy = new string[] { };
diff --git a/MediaBrowser.Model/Querying/PersonsQuery.cs b/MediaBrowser.Model/Querying/PersonsQuery.cs
index a4b7eab71..a859ece1f 100644
--- a/MediaBrowser.Model/Querying/PersonsQuery.cs
+++ b/MediaBrowser.Model/Querying/PersonsQuery.cs
@@ -1,4 +1,5 @@
-
+using MediaBrowser.Model.Entities;
+
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index e605a5daa..959ec44c8 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -72,7 +72,13 @@ namespace MediaBrowser.Model.System
         /// </summary>
         /// <value>The program data path.</value>
         public string ProgramDataPath { get; set; }
-        
+
+        /// <summary>
+        /// Gets or sets the HTTP server port number.
+        /// </summary>
+        /// <value>The HTTP server port number.</value>
+        public int HttpServerPortNumber { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SystemInfo"/> class.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
index 59217bc17..089b8a505 100644
--- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
+++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
@@ -219,7 +219,7 @@ namespace MediaBrowser.Server.Implementations.Providers
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("{0} failed refreshing {1}", ex, provider.GetType().Name, item.Name);
+                _logger.ErrorException("{0} failed refreshing {1} {2}", ex, provider.GetType().Name, item.Name, item.Path ?? string.Empty);
 
                 provider.SetLastRefreshed(item, DateTime.UtcNow, ProviderRefreshStatus.Failure);
 
diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
index 3612b85b9..4bab10ee0 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
@@ -132,10 +132,17 @@ namespace MediaBrowser.Server.Implementations.ServerManager
         {
             LastActivityDate = DateTime.UtcNow;
 
+            if (!message.StartsWith("{", StringComparison.OrdinalIgnoreCase))
+            {
+                _logger.Error("Received web socket message that is not a json structure: " + message);
+                return;
+            }
+
             if (OnReceive == null)
             {
                 return;
             }
+
             try
             {
                 var stub = (WebSocketMessage<object>)_jsonSerializer.DeserializeFromString(message, typeof(WebSocketMessage<object>));
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 61bf0a0d1..322420545 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -607,7 +607,8 @@ namespace MediaBrowser.ServerApplication
                 CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(),
                 Id = _systemId,
                 ProgramDataPath = ApplicationPaths.ProgramDataPath,
-                MacAddress = GetMacAddress()
+                MacAddress = GetMacAddress(),
+                HttpServerPortNumber = ServerConfigurationManager.Configuration.HttpServerPortNumber
             };
         }
 
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index af785eb3e..4bdd3f779 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -20,9 +20,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
         if (!serverHostName) {
             throw new Error("Must supply serverHostName, e.g. 192.168.1.1 or myServerName");
         }
-        if (!serverPortNumber) {
-            throw new Error("Must supply a serverPortNumber");
-        }
 
         var self = this;
         var deviceName = "Web Browser";
@@ -39,14 +36,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
         };
 
         /**
-         * Gets the server port number.
-         */
-        self.serverPortNumber = function () {
-
-            return serverPortNumber;
-        };
-
-        /**
          * Gets or sets the current user id.
          */
         self.currentUserId = function (val) {
@@ -152,7 +141,13 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("Url name cannot be empty");
             }
 
-            var url = serverProtocol + "//" + serverHostName + ":" + serverPortNumber + "/mediabrowser/" + name;
+            var url = serverProtocol + "//" + serverHostName;
+
+            if (serverPortNumber) {
+                url += ":" + serverPortNumber;
+            }
+
+            url += "/mediabrowser/" + name;
 
             if (params) {
                 url += "?" + $.param(params);
@@ -3384,7 +3379,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
 
                 var deferred = $.Deferred();
 
-                var  msgData = itemId + "|" + (positionTicks == null ? "" : positionTicks) + "|" + (isPaused == null ? "" : isPaused) + "|" + (isMuted == null ? "" : isMuted);
+                var msgData = itemId + "|" + (positionTicks == null ? "" : positionTicks) + "|" + (isPaused == null ? "" : isPaused) + "|" + (isMuted == null ? "" : isMuted);
 
                 self.sendWebSocketMessage("PlaybackProgress", msgData);
 
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 395c46b56..f111dfc5a 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.170" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.171" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.58" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.58" targetFramework="net45" />
 </packages>
\ No newline at end of file