Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix image analysis

Browse Source
This commit is contained in:
Luke Pulverenti 2017-10-22 20:43:52 -04:00
parent b54046a6de
commit a59ff27605
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Drawing/ImageProcessor.cs
View File

@ -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); _logger.Info("Getting image size for item {0} {1}", item.GetType().Name, path);
var size = GetImageSize(path, allowSlowMethods); var size = GetImageSize(path, allowSlowMethods);

4
Emby.Server.Implementations/Dto/DtoService.cs
View File

@ -1655,9 +1655,9 @@ namespace Emby.Server.Implementations.Dto
return null; 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; return null;
} }
} }

7
Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
View File

@ -30,8 +30,11 @@ namespace Emby.Server.Implementations.Library.Resolvers
// Must be an image file within a photo collection // Must be an image file within a photo collection
if (args.IsDirectory) if (args.IsDirectory)
{ {
if (string.Equals(args.GetCollectionType(), CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) || // Must be an image file within a photo collection
string.Equals(args.GetCollectionType(), CollectionType.Photos, StringComparison.OrdinalIgnoreCase)) 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)) if (HasPhotos(args))
{ {