open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup PhotoProvider.cs using new .NET 8 features

Browse Source
pull/11119/head
Peaches_MLG 2 months ago
parent a597f1e410
commit de750ac8a2
1 changed files with 117 additions and 124 deletions
Show Stats Download Patch File Download Diff File

241
Emby.Photos/PhotoProvider.cs
Unescape View File

@ -16,167 +16,160 @@ using TagLib.IFD;
using TagLib.IFD.Entries; using TagLib.IFD.Entries;
using TagLib.IFD.Tags; using TagLib.IFD.Tags;
namespace Emby.Photos namespace Emby.Photos;
/// <summary>
/// Metadata provider for photos.
/// </summary>
public class PhotoProvider : ICustomMetadataProvider<Photo>, IForcedProvider, IHasItemChangeMonitor
{ {
private readonly ILogger<PhotoProvider> _logger;
private readonly IImageProcessor _imageProcessor;
// These are causing taglib to hang
private readonly string[] _includeExtensions = [".jpg", ".jpeg", ".png", ".tiff", ".cr2", ".webp", ".avif"];
/// <summary> /// <summary>
/// Metadata provider for photos. /// Initializes a new instance of the <see cref="PhotoProvider" /> class.
/// </summary> /// </summary>
public class PhotoProvider : ICustomMetadataProvider<Photo>, IForcedProvider, IHasItemChangeMonitor /// <param name="logger">The logger.</param>
/// <param name="imageProcessor">The image processor.</param>
public PhotoProvider(ILogger<PhotoProvider> logger, IImageProcessor imageProcessor)
{ {
private readonly ILogger<PhotoProvider> _logger; _logger = logger;
private readonly IImageProcessor _imageProcessor; _imageProcessor = imageProcessor;
}
// These are causing taglib to hang
private readonly string[] _includeExtensions = new string[] { ".jpg", ".jpeg", ".png", ".tiff", ".cr2", ".webp", ".avif" };
/// <summary>
/// Initializes a new instance of the <see cref="PhotoProvider" /> class.
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="imageProcessor">The image processor.</param>
public PhotoProvider(ILogger<PhotoProvider> logger, IImageProcessor imageProcessor)
{
_logger = logger;
_imageProcessor = imageProcessor;
}
/// <inheritdoc /> /// <inheritdoc />
public string Name => "Embedded Information"; public string Name => "Embedded Information";
/// <inheritdoc /> /// <inheritdoc />
public bool HasChanged(BaseItem item, IDirectoryService directoryService) public bool HasChanged(BaseItem item, IDirectoryService directoryService)
{
if (item.IsFileProtocol)
{ {
if (item.IsFileProtocol) var file = directoryService.GetFile(item.Path);
{ return file is not null && file.LastWriteTimeUtc != item.DateModified;
var file = directoryService.GetFile(item.Path);
return file is not null && file.LastWriteTimeUtc != item.DateModified;
}
return false;
} }
/// <inheritdoc /> return false;
public Task<ItemUpdateType> FetchAsync(Photo item, MetadataRefreshOptions options, CancellationToken cancellationToken) }
{
item.SetImagePath(ImageType.Primary, item.Path);
// Examples: https://github.com/mono/taglib-sharp/blob/a5f6949a53d09ce63ee7495580d6802921a21f14/tests/fixtures/TagLib.Tests.Images/NullOrientationTest.cs /// <inheritdoc />
if (_includeExtensions.Contains(Path.GetExtension(item.Path.AsSpan()), StringComparison.OrdinalIgnoreCase)) public Task<ItemUpdateType> FetchAsync(Photo item, MetadataRefreshOptions options, CancellationToken cancellationToken)
{
item.SetImagePath(ImageType.Primary, item.Path);
// Examples: https://github.com/mono/taglib-sharp/blob/a5f6949a53d09ce63ee7495580d6802921a21f14/tests/fixtures/TagLib.Tests.Images/NullOrientationTest.cs
if (_includeExtensions.Contains(Path.GetExtension(item.Path.AsSpan()), StringComparison.OrdinalIgnoreCase))
{
try
{ {
try using var file = TagLib.File.Create(item.Path);
if (file.GetTag(TagTypes.TiffIFD) is IFDTag tag)
{ {
using (var file = TagLib.File.Create(item.Path)) var structure = tag.Structure;
if (structure?.GetEntry(0, (ushort)IFDEntryTag.ExifIFD) is SubIFDEntry exif)
{ {
if (file.GetTag(TagTypes.TiffIFD) is IFDTag tag) var exifStructure = exif.Structure;
if (exifStructure is not null)
{ {
var structure = tag.Structure; if (exifStructure.GetEntry(0, (ushort)ExifEntryTag.ApertureValue) is RationalIFDEntry apertureEntry)
if (structure is not null
&& structure.GetEntry(0, (ushort)IFDEntryTag.ExifIFD) is SubIFDEntry exif)
{ {
var exifStructure = exif.Structure; item.Aperture = (double)apertureEntry.Value.Numerator / apertureEntry.Value.Denominator;
if (exifStructure is not null) }
{
var entry = exifStructure.GetEntry(0, (ushort)ExifEntryTag.ApertureValue) as RationalIFDEntry; if (exifStructure.GetEntry(0, (ushort)ExifEntryTag.ShutterSpeedValue) is RationalIFDEntry shutterSpeedEntry)
if (entry is not null) {
{ item.ShutterSpeed = (double)shutterSpeedEntry.Value.Numerator / shutterSpeedEntry.Value.Denominator;
item.Aperture = (double)entry.Value.Numerator / entry.Value.Denominator;
}
entry = exifStructure.GetEntry(0, (ushort)ExifEntryTag.ShutterSpeedValue) as RationalIFDEntry;
if (entry is not null)
{
item.ShutterSpeed = (double)entry.Value.Numerator / entry.Value.Denominator;
}
}
} }
} }
}
}
if (file is TagLib.Image.File image) if (file is TagLib.Image.File image)
{ {
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.Width = image.Properties.PhotoWidth;
item.Height = image.Properties.PhotoHeight; item.Height = image.Properties.PhotoHeight;
var rating = image.ImageTag.Rating; item.CommunityRating = image.ImageTag.Rating;
item.CommunityRating = rating.HasValue ? rating : null;
item.Overview = image.ImageTag.Comment; item.Overview = image.ImageTag.Comment;
if (!string.IsNullOrWhiteSpace(image.ImageTag.Title) if (!string.IsNullOrWhiteSpace(image.ImageTag.Title)
&& !item.LockedFields.Contains(MetadataField.Name)) && !item.LockedFields.Contains(MetadataField.Name))
{ {
item.Name = image.ImageTag.Title; item.Name = image.ImageTag.Title;
} }
var dateTaken = image.ImageTag.DateTime; var dateTaken = image.ImageTag.DateTime;
if (dateTaken.HasValue) if (dateTaken.HasValue)
{ {
item.DateCreated = dateTaken.Value; item.DateCreated = dateTaken.Value;
item.PremiereDate = dateTaken.Value; item.PremiereDate = dateTaken.Value;
item.ProductionYear = dateTaken.Value.Year; item.ProductionYear = dateTaken.Value.Year;
} }
item.Genres = image.ImageTag.Genres; item.Genres = image.ImageTag.Genres;
item.Tags = image.ImageTag.Keywords; item.Tags = image.ImageTag.Keywords;
item.Software = image.ImageTag.Software; item.Software = image.ImageTag.Software;
if (image.ImageTag.Orientation == TagLib.Image.ImageOrientation.None) if (image.ImageTag.Orientation == TagLib.Image.ImageOrientation.None)
{ {
item.Orientation = null; item.Orientation = null;
} }
else if (Enum.TryParse(image.ImageTag.Orientation.ToString(), true, out ImageOrientation orientation)) else if (Enum.TryParse(image.ImageTag.Orientation.ToString(), true, out ImageOrientation orientation))
{ {
item.Orientation = orientation; item.Orientation = orientation;
} }
item.ExposureTime = image.ImageTag.ExposureTime; item.ExposureTime = image.ImageTag.ExposureTime;
item.FocalLength = image.ImageTag.FocalLength; item.FocalLength = image.ImageTag.FocalLength;
item.Latitude = image.ImageTag.Latitude; item.Latitude = image.ImageTag.Latitude;
item.Longitude = image.ImageTag.Longitude; item.Longitude = image.ImageTag.Longitude;
item.Altitude = image.ImageTag.Altitude; item.Altitude = image.ImageTag.Altitude;
if (image.ImageTag.ISOSpeedRatings.HasValue) if (image.ImageTag.ISOSpeedRatings.HasValue)
{ {
item.IsoSpeedRating = Convert.ToInt32(image.ImageTag.ISOSpeedRatings.Value); item.IsoSpeedRating = Convert.ToInt32(image.ImageTag.ISOSpeedRatings.Value);
} }
else else
{ {
item.IsoSpeedRating = null; item.IsoSpeedRating = null;
}
}
} }
}
catch (Exception ex)
{
_logger.LogError(ex, "Image Provider - Error reading image tag for {0}", item.Path);
} }
} }
catch (Exception ex)
if (item.Width <= 0 || item.Height <= 0)
{ {
var img = item.GetImageInfo(ImageType.Primary, 0); _logger.LogError(ex, "Image Provider - Error reading image tag for {0}", item.Path);
}
}
try if (item.Width <= 0 || item.Height <= 0)
{ {
var size = _imageProcessor.GetImageDimensions(item, img); var img = item.GetImageInfo(ImageType.Primary, 0);
if (size.Width > 0 && size.Height > 0) try
{ {
item.Width = size.Width; var size = _imageProcessor.GetImageDimensions(item, img);
item.Height = size.Height;
} if (size.Width > 0 && size.Height > 0)
}
catch (ArgumentException)
{ {
// format not supported item.Width = size.Width;
item.Height = size.Height;
} }
} }
catch (ArgumentException)
const ItemUpdateType Result = ItemUpdateType.ImageUpdate | ItemUpdateType.MetadataImport; {
return Task.FromResult(Result); // format not supported
}
} }
const ItemUpdateType Result = ItemUpdateType.ImageUpdate | ItemUpdateType.MetadataImport;
return Task.FromResult(Result);
} }
} }

Write Preview
Loading…
Cancel
Save