Merge pull request #2971 from MediaBrowser/dev

Dev

3 files changed, 35 insertions, 11 deletions

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index a0176e406..0a316fcf1 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1655,9 +1655,9 @@ namespace Emby.Server.Implementations.Dto
                         return null;
                     }
                 }
-                catch
+                catch (Exception ex)
                 {
-                    //_logger.ErrorException("Failed to determine primary image aspect ratio for {0}", ex, path);
+                    //_logger.ErrorException("Failed to determine primary image aspect ratio for {0}", ex, imageInfo.Path);
                     return null;
                 }
             }
diff --git a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
index 3fdd05135..ef95b47c3 100644
--- a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
@@ -320,8 +320,6 @@ namespace Emby.Server.Implementations.HttpClientManager
 
         private async Task<HttpResponseInfo> GetCachedResponse(string responseCachePath, TimeSpan cacheLength, string url)
         {
-            _logger.Info("Checking for cache file {0}", responseCachePath);
-
             try
             {
                 if (_fileSystem.GetLastWriteTimeUtc(responseCachePath).Add(cacheLength) > DateTime.UtcNow)
@@ -399,10 +397,19 @@ namespace Emby.Server.Implementations.HttpClientManager
             {
                 try
                 {
-                    var bytes = options.RequestContentBytes ??
-                                Encoding.UTF8.GetBytes(options.RequestContent ?? string.Empty);
+                    // TODO: We can always put this in the options object if needed
+                    var requestEncoding = Encoding.UTF8;
+
+                    var bytes = options.RequestContentBytes ?? requestEncoding.GetBytes(options.RequestContent ?? string.Empty);
+
+                    var contentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
+
+                    if (options.AppendCharsetToMimeType)
+                    {
+                        contentType = contentType.TrimEnd(';') + "; charset=\"utf-8\"";
+                    }
 
-                    httpWebRequest.ContentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
+                    httpWebRequest.ContentType = contentType;
 
                     httpWebRequest.ContentLength = bytes.Length;
                     (await httpWebRequest.GetRequestStreamAsync().ConfigureAwait(false)).Write(bytes, 0, bytes.Length);
@@ -430,7 +437,14 @@ namespace Emby.Server.Implementations.HttpClientManager
 
             if (options.LogRequest)
             {
-                _logger.Info("HttpClientManager {0}: {1}", httpMethod.ToUpper(), options.Url);
+                if (options.LogRequestAsDebug)
+                {
+                    _logger.Debug("HttpClientManager {0}: {1}", httpMethod.ToUpper(), options.Url);
+                }
+                else
+                {
+                    _logger.Info("HttpClientManager {0}: {1}", httpMethod.ToUpper(), options.Url);
+                }
             }
 
             try
@@ -597,7 +611,14 @@ namespace Emby.Server.Implementations.HttpClientManager
 
             if (options.LogRequest)
             {
-                _logger.Info("HttpClientManager.GetTempFileResponse url: {0}", options.Url);
+                if (options.LogRequestAsDebug)
+                {
+                    _logger.Debug("HttpClientManager.GetTempFileResponse url: {0}", options.Url);
+                }
+                else
+                {
+                    _logger.Info("HttpClientManager.GetTempFileResponse url: {0}", options.Url);
+                }
             }
 
             var client = GetHttpClient(GetHostFromUrl(options.Url), options.EnableHttpCompression);
diff --git a/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
index a9cfea34d..311abf14e 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
@@ -30,8 +30,11 @@ namespace Emby.Server.Implementations.Library.Resolvers
             // Must be an image file within a photo collection
             if (args.IsDirectory)
             {
-                if (string.Equals(args.GetCollectionType(), CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(args.GetCollectionType(), CollectionType.Photos, StringComparison.OrdinalIgnoreCase))
+                // Must be an image file within a photo collection
+                var collectionType = args.GetCollectionType();
+
+                if (string.Equals(collectionType, CollectionType.Photos, StringComparison.OrdinalIgnoreCase) ||
+                    (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) && args.GetLibraryOptions().EnablePhotos))
                 {
                     if (HasPhotos(args))
                     {