Merge pull request #2930 from MediaBrowser/dev

Dev
MediaBrowser · Oct 2, 2017 · fc557de · fc557de
2 parents f314bcc + 9d55504
commit fc557de
Show file tree

Hide file tree

Showing 53 changed files with 190 additions and 120 deletions.
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1642,6 +1642,7 @@ public void AttachPrimaryImageAspectRatio(IItemDto dto, IHasMetadata item)
                     return null;
                 }
 
+                return null;
                 _logger.Info("Getting image size for item type {0}", item.GetType().Name);
 
                 try

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1406,11 +1406,19 @@ private async Task<AuthenticationResult> AuthenticateNewSessionInternal(Authenti
                     .FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
             }
 
-            if (user != null && !string.IsNullOrWhiteSpace(request.DeviceId))
+            if (user != null)
             {
-                if (!_deviceManager.CanAccessDevice(user.Id.ToString("N"), request.DeviceId))
+                if (!user.IsParentalScheduleAllowed())
+                {
+                    throw new SecurityException("User is not allowed access at this time.");
+                }
+
+                if (!string.IsNullOrWhiteSpace(request.DeviceId))
                 {
-                    throw new SecurityException("User is not allowed access from this device.");
+                    if (!_deviceManager.CanAccessDevice(user.Id.ToString("N"), request.DeviceId))
+                    {
+                        throw new SecurityException("User is not allowed access from this device.");
+                    }
                 }
             }
 

diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -43,12 +43,12 @@ public override bool SupportsPeople
             }
         }
 
-        public override double? GetDefaultPrimaryImageAspectRatio()
-        {
-            double value = 16;
-            value /= 9;
+        //public override double? GetDefaultPrimaryImageAspectRatio()
+        //{
+        //    double value = 16;
+        //    value /= 9;
 
-            return value;
-        }
+        //    return value;
+        //}
     }
 }
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -31,13 +31,13 @@ public CollectionFolder()
             PhysicalFolderIds = EmptyGuidArray;
         }
 
-        public override double? GetDefaultPrimaryImageAspectRatio()
-        {
-            double value = 16;
-            value /= 9;
+        //public override double? GetDefaultPrimaryImageAspectRatio()
+        //{
+        //    double value = 16;
+        //    value /= 9;
 
-            return value;
-        }
+        //    return value;
+        //}
 
         [IgnoreDataMember]
         public override bool SupportsPlayedStatus

diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
@@ -58,13 +58,13 @@ public override bool SupportsPlayedStatus
             }
         }
 
-        public override double? GetDefaultPrimaryImageAspectRatio()
-        {
-            double value = 16;
-            value /= 9;
+        //public override double? GetDefaultPrimaryImageAspectRatio()
+        //{
+        //    double value = 16;
+        //    value /= 9;
 
-            return value;
-        }
+        //    return value;
+        //}
 
         public override int GetChildCount(User user)
         {

diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
@@ -78,6 +78,14 @@ public override bool SupportsPositionTicksResume
             }
         }
 
+        public override double? GetDefaultPrimaryImageAspectRatio()
+        {
+            double value = 16;
+            value /= 9;
+
+            return value;
+        }
+
         public override string CreatePresentationUniqueKey()
         {
             if (!string.IsNullOrWhiteSpace(PrimaryVersionId))

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -530,7 +530,8 @@ public string GetTextSubtitleParam(EncodingJobInfo state)
         {
             var seconds = Math.Round(TimeSpan.FromTicks(state.StartTimeTicks ?? 0).TotalSeconds);
 
-            var setPtsParam = state.CopyTimestamps
+            // hls always copies timestamps
+            var setPtsParam = state.CopyTimestamps || state.TranscodingType != TranscodingJobType.Progressive
                 ? string.Empty
                 : string.Format(",setpts=PTS -{0}/TB", seconds.ToString(_usCulture));
 
@@ -1083,7 +1084,8 @@ public string GetAudioFilterParam(EncodingJobInfo state, EncodingOptions encodin
                 }
             }
 
-            if (state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode && !state.CopyTimestamps)
+            var isCopyingTimestamps = state.CopyTimestamps || state.TranscodingType != TranscodingJobType.Progressive;
+            if (state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode && !isCopyingTimestamps)
             {
                 var seconds = TimeSpan.FromTicks(state.StartTimeTicks ?? 0).TotalSeconds;
 

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -163,6 +163,14 @@ public bool CopyTimestamps
 
         public bool DeInterlace(string videoCodec, bool forceDeinterlaceIfSourceIsInterlaced)
         {
+            var videoStream = VideoStream;
+            var isInputInterlaced = videoStream != null && videoStream.IsInterlaced;
+
+            if (!isInputInterlaced)
+            {
+                return false;
+            }
+
             // Support general param
             if (BaseRequest.DeInterlace)
             {
@@ -179,8 +187,7 @@ public bool DeInterlace(string videoCodec, bool forceDeinterlaceIfSourceIsInterl
 
             if (forceDeinterlaceIfSourceIsInterlaced)
             {
-                var videoStream = VideoStream;
-                if (videoStream != null && videoStream.IsInterlaced)
+                if (isInputInterlaced)
                 {
                     return true;
                 }

diff --git a/...ard/dashboard-ui/bower_components/emby-webcomponents/playbacksettings/playbacksettings.js b/...ard/dashboard-ui/bower_components/emby-webcomponents/playbacksettings/playbacksettings.js
diff --git a/...rd-ui/bower_components/emby-webcomponents/playbacksettings/playbacksettings.template.html b/...rd-ui/bower_components/emby-webcomponents/playbacksettings/playbacksettings.template.html
@@ -24,6 +24,9 @@ <h1 class="sectionTitle">
             <div class="selectContainer fldVideoInternetQuality hide">
                 <select is="emby-select" class="selectVideoInternetQuality" label="${LabelInternetQuality}"></select>
             </div>
+            <div class="selectContainer fldChromecastQuality hide">
+                <select is="emby-select" class="selectChromecastVideoQuality" label="${LabelMaxChromecastBitrate}"></select>
+            </div>
         </div>
 
         <div class="verticalSection musicQualitySection hide">

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/ar.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Home Screen",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Latest Channel Items",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Library Order",
     "HideWatchedContentFromLatestMedia": "Hide watched content from latest media",
     "HeaderOnNow": "On Now",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Enable cinema mode",
     "LabelInternetQuality": "Internet quality:",
     "HeaderMusicQuality": "Music Quality",
-    "LabelHomeNetworkQuality": "Home network quality:"
+    "LabelHomeNetworkQuality": "Home network quality:",
+    "HeaderLatestMedia": "Latest Media"
 }
diff --git a/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/bg-bg.json b/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/bg-bg.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Home Screen",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Latest Channel Items",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "\u041f\u043e\u0434\u0440\u0435\u0434\u0431\u0430 \u043d\u0430 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430\u0442\u0430",
     "HideWatchedContentFromLatestMedia": "Hide watched content from latest media",
     "HeaderOnNow": "On Now",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "\u0412\u043a\u043b\u044e\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0436\u0438\u043c \"\u041a\u0438\u043d\u043e\u0441\u0430\u043b\u043e\u043d\"",
     "LabelInternetQuality": "\u041a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u043d\u0430 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u043d\u0430\u0442\u0430 \u0432\u0440\u044a\u0437\u043a\u0430:",
     "HeaderMusicQuality": "\u041a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u043d\u0430 \u043c\u0443\u0437\u0438\u043a\u0430\u0442\u0430",
-    "LabelHomeNetworkQuality": "\u041a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u043d\u0430 \u0434\u043e\u043c\u0430\u0448\u043d\u0430\u0442\u0430 \u043c\u0440\u0435\u0436\u0430:"
+    "LabelHomeNetworkQuality": "\u041a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u043d\u0430 \u0434\u043e\u043c\u0430\u0448\u043d\u0430\u0442\u0430 \u043c\u0440\u0435\u0436\u0430:",
+    "HeaderLatestMedia": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438 \u043c\u0435\u0434\u0438\u0438"
 }
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/ca.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "P\u00e0gina d'Inici",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Darrers \u00edtems del canal",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Ordre de la llibreria",
     "HideWatchedContentFromLatestMedia": "Hide watched content from latest media",
     "HeaderOnNow": "En Directe Ara",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Habilitar mode cinema",
     "LabelInternetQuality": "Internet quality:",
     "HeaderMusicQuality": "Music Quality",
-    "LabelHomeNetworkQuality": "Home network quality:"
+    "LabelHomeNetworkQuality": "Home network quality:",
+    "HeaderLatestMedia": "Darrers MItjans"
 }
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/cs.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Domovsk\u00e1 obrazovka",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Nejnov\u011bj\u0161\u00ed polo\u017eky kan\u00e1lu",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Po\u0159ad\u00ed knihovny",
     "HideWatchedContentFromLatestMedia": "Skr\u00fdt p\u0159ehran\u00e9 polo\u017eky ze seznamu nejnov\u011bj\u0161\u00edch m\u00e9di\u00ed",
     "HeaderOnNow": "Pr\u00e1v\u011b te\u010f",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Povolit Cinema M\u00f3d",
     "LabelInternetQuality": "Internet quality:",
     "HeaderMusicQuality": "Kvalita hudby",
-    "LabelHomeNetworkQuality": "Home network quality:"
+    "LabelHomeNetworkQuality": "Home network quality:",
+    "HeaderLatestMedia": "Nejnov\u011bj\u0161\u00ed m\u00e9dia"
 }
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/da.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/da.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Home Screen",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Latest Channel Items",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Library Order",
     "HideWatchedContentFromLatestMedia": "Hide watched content from latest media",
     "HeaderOnNow": "On Now",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Aktiver biograftilstand",
     "LabelInternetQuality": "Internet quality:",
     "HeaderMusicQuality": "Music Quality",
-    "LabelHomeNetworkQuality": "Home network quality:"
+    "LabelHomeNetworkQuality": "Home network quality:",
+    "HeaderLatestMedia": "Latest Media"
 }
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/de.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/de.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Startseite",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Neueste Channelinhalte",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Bibliotheksreihenfolge",
     "HideWatchedContentFromLatestMedia": "Verberge gesehene Inhalte von neuesten Medien.",
     "HeaderOnNow": "Gerade l\u00e4uft",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Aktiviere den Kino-Modus",
     "LabelInternetQuality": "Internetqualit\u00e4t:",
     "HeaderMusicQuality": "Musikqualit\u00e4t",
-    "LabelHomeNetworkQuality": "Heimnetzwerkqualit\u00e4t:"
+    "LabelHomeNetworkQuality": "Heimnetzwerkqualit\u00e4t:",
+    "HeaderLatestMedia": "Neueste Medien"
 }
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/el.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/el.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Home Screen",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Latest Channel Items",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Library Order",
     "HideWatchedContentFromLatestMedia": "Hide watched content from latest media",
     "HeaderOnNow": "On Now",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Enable cinema mode",
     "LabelInternetQuality": "Internet quality:",
     "HeaderMusicQuality": "Music Quality",
-    "LabelHomeNetworkQuality": "Home network quality:"
+    "LabelHomeNetworkQuality": "Home network quality:",
+    "HeaderLatestMedia": "Latest Media"
 }
diff --git a/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/en-gb.json b/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/en-gb.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Home Screen",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Latest Channel Items",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Library Order",
     "HideWatchedContentFromLatestMedia": "Hide watched content from latest media",
     "HeaderOnNow": "On Now",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Enable cinema mode",
     "LabelInternetQuality": "Internet quality:",
     "HeaderMusicQuality": "Music Quality",
-    "LabelHomeNetworkQuality": "Home network quality:"
+    "LabelHomeNetworkQuality": "Home network quality:",
+    "HeaderLatestMedia": "Latest Media"
 }
diff --git a/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/en-us.json b/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/en-us.json
@@ -564,5 +564,6 @@
   "EnableCinemaMode": "Enable cinema mode",
   "LabelInternetQuality": "Internet quality:",
   "HeaderMusicQuality": "Music Quality",
-  "LabelHomeNetworkQuality": "Home network quality:"
+  "LabelHomeNetworkQuality": "Home network quality:",
+  "HeaderLatestMedia":  "Latest Media" 
 }
diff --git a/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/es-ar.json b/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/es-ar.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Home Screen",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Latest Channel Items",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Library Order",
     "HideWatchedContentFromLatestMedia": "Hide watched content from latest media",
     "HeaderOnNow": "On Now",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Enable cinema mode",
     "LabelInternetQuality": "Internet quality:",
     "HeaderMusicQuality": "Music Quality",
-    "LabelHomeNetworkQuality": "Home network quality:"
+    "LabelHomeNetworkQuality": "Home network quality:",
+    "HeaderLatestMedia": "Latest Media"
 }
diff --git a/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/es-mx.json b/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/es-mx.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Pantalla de Inicio",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "\u00cdtems Recientes de Canales",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Orden de Bibliotecas",
     "HideWatchedContentFromLatestMedia": "Ocultar contenido ya visto de Agregadas Recientemente",
     "HeaderOnNow": "Transmiti\u00e9ndo Ahora",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Activar modo cine",
     "LabelInternetQuality": "Calidad en internet:",
     "HeaderMusicQuality": "Calidad de Musica",
-    "LabelHomeNetworkQuality": "Calidad en Red Local:"
+    "LabelHomeNetworkQuality": "Calidad en Red Local:",
+    "HeaderLatestMedia": "Agregadas Recientemente"
 }
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/es.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/es.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Pantalla de inicio",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "\u00daltimos elementos de canales",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Orden de la Biblioteca",
     "HideWatchedContentFromLatestMedia": "Esconder medios vistos de los medios m\u00e1s recientes",
     "HeaderOnNow": "Transmitiendo Ahora",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Activar modo cine",
     "LabelInternetQuality": "Calidad en internet:",
     "HeaderMusicQuality": "Music Quality",
-    "LabelHomeNetworkQuality": "Home network quality:"
+    "LabelHomeNetworkQuality": "Home network quality:",
+    "HeaderLatestMedia": "\u00daltimos medios"
 }
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/fi.json
@@ -408,7 +408,7 @@
     "HeaderHomeScreen": "Home Screen",
     "HeaderHomeScreenContent": "Home Screen Content",
     "HeaderLatestChannelItems": "Latest Channel Items",
-    "LabelSelectHomeScreenItemsFolders": "Allow content to appear on my home screen from:",
+    "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "Library Order",
     "HideWatchedContentFromLatestMedia": "Hide watched content from latest media",
     "HeaderOnNow": "On Now",
@@ -564,5 +564,6 @@
     "EnableCinemaMode": "Enable cinema mode",
     "LabelInternetQuality": "Internet quality:",
     "HeaderMusicQuality": "Music Quality",
-    "LabelHomeNetworkQuality": "Home network quality:"
+    "LabelHomeNetworkQuality": "Home network quality:",
+    "HeaderLatestMedia": "Latest Media"
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                         return null;
                     }
+                    return null;
                     _logger.Info("Getting image size for item type {0}", item.GetType().Name);
                     try
@@ Expand Down @@