starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixes #552 - Add parental control usage limits

Browse Source
This commit is contained in:
Luke Pulverenti
2014-10-14 20:05:09 -04:00
parent 52776df012
commit bd1bd5e87e
34 changed files with 326 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@@ -1429,35 +1429,21 @@ namespace MediaBrowser.Server.Implementations.Dto
// See if we can avoid a file system lookup by looking for the file in ResolveArgs
var dateModified = imageInfo.DateModified;
double? width = imageInfo.Width;
double? height = imageInfo.Height;
ImageSize size;
if (!width.HasValue || !height.HasValue)
try
{
try
{
size = _imageProcessor.GetImageSize(path, dateModified);
}
catch (FileNotFoundException)
{
_logger.Error("Image file does not exist: {0}", path);
return;
}
catch (Exception ex)
{
_logger.ErrorException("Failed to determine primary image aspect ratio for {0}", ex, path);
return;
}
size = _imageProcessor.GetImageSize(path, dateModified);
}
else
catch (FileNotFoundException)
{
size = new ImageSize
{
Height = height.Value,
Width = width.Value
};
_logger.Error("Image file does not exist: {0}", path);
return;
}
catch (Exception ex)
{
_logger.ErrorException("Failed to determine primary image aspect ratio for {0}", ex, path);
return;
}
dto.OriginalPrimaryImageAspectRatio = size.Width / size.Height;