fix image analysis

Emby.Drawing/ImageProcessor.cs

@@ -461,7 +461,7 @@ namespace Emby.Drawing
                 };
             }
 
-            var path = item.Path;
+            var path = info.Path;
             _logger.Info("Getting image size for item {0} {1}", item.GetType().Name, path);
 
             var size = GetImageSize(path, allowSlowMethods);

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;
                 }
             }

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))
                     {