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

adjust photo provider

Browse Source
This commit is contained in:
Luke Pulverenti 2015-03-12 10:51:41 -04:00
parent ceb88b1359
commit 7dc19a8262
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MediaBrowser.Providers/Photos/PhotoProvider.cs
View File

@ -1,5 +1,4 @@
using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
@ -18,12 +17,10 @@ namespace MediaBrowser.Providers.Photos
public class PhotoProvider : ICustomMetadataProvider<Photo>, IHasItemChangeMonitor, IForcedProvider public class PhotoProvider : ICustomMetadataProvider<Photo>, IHasItemChangeMonitor, IForcedProvider
{ {
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IImageProcessor _imageProcessor;
public PhotoProvider(ILogger logger, IImageProcessor imageProcessor) public PhotoProvider(ILogger logger)
{ {
_logger = logger; _logger = logger;
_imageProcessor = imageProcessor;
} }
public Task<ItemUpdateType> FetchAsync(Photo item, MetadataRefreshOptions options, CancellationToken cancellationToken) public Task<ItemUpdateType> FetchAsync(Photo item, MetadataRefreshOptions options, CancellationToken cancellationToken)
@ -75,10 +72,13 @@ namespace MediaBrowser.Providers.Photos
} }
} }
} }
item.CameraMake = image.ImageTag.Make; item.CameraMake = image.ImageTag.Make;
item.CameraModel = image.ImageTag.Model; item.CameraModel = image.ImageTag.Model;
item.Width = image.Properties.PhotoWidth;
item.Height = image.Properties.PhotoHeight;
var rating = image.ImageTag.Rating; var rating = image.ImageTag.Rating;
if (rating.HasValue) if (rating.HasValue)
{ {
@ -142,20 +142,6 @@ namespace MediaBrowser.Providers.Photos
_logger.ErrorException("Image Provider - Error reading image tag for {0}", e, item.Path); _logger.ErrorException("Image Provider - Error reading image tag for {0}", e, item.Path);
} }
var imageInfo = item.GetImageInfo(ImageType.Primary, 0);
try
{
var size = _imageProcessor.GetImageSize(imageInfo);
item.Width = Convert.ToInt32(size.Width);
item.Height = Convert.ToInt32(size.Height);
}
catch
{
}
const ItemUpdateType result = ItemUpdateType.ImageUpdate | ItemUpdateType.MetadataImport; const ItemUpdateType result = ItemUpdateType.ImageUpdate | ItemUpdateType.MetadataImport;
return Task.FromResult(result); return Task.FromResult(result);
} }