lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41 from Bond-009/taglib

Browse Source 
Replace TagLib.Portable.dll with taglib-sharp submodule
This commit is contained in:
Vasily 2018-12-11 23:06:07 +03:00 committed by GitHub
commit f81633468c
3 changed files with 86 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "ThirdParty/taglib-sharp"]
path = ThirdParty/taglib-sharp
url = git@github.com:mono/taglib-sharp.git

4
Emby.Photos/Emby.Photos.csproj
View File

@ -3,9 +3,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" /> <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
<ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" /> <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
<Reference Include="TagLib.Portable"> <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj" />
<HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

167
Emby.Photos/PhotoProvider.cs
View File

@ -57,118 +57,115 @@ namespace Emby.Photos
{ {
try try
{ {
using (var fileStream = _fileSystem.OpenRead(item.Path)) using (var file = TagLib.File.Create(item.Path))
{ {
using (var file = TagLib.File.Create(new StreamFileAbstraction(Path.GetFileName(item.Path), fileStream, null))) var image = file as TagLib.Image.File;
var tag = file.GetTag(TagTypes.TiffIFD) as IFDTag;
if (tag != null)
{ {
var image = file as TagLib.Image.File; var structure = tag.Structure;
var tag = file.GetTag(TagTypes.TiffIFD) as IFDTag; if (structure != null)
if (tag != null)
{ {
var structure = tag.Structure; var exif = structure.GetEntry(0, (ushort)IFDEntryTag.ExifIFD) as SubIFDEntry;
if (structure != null) if (exif != null)
{ {
var exif = structure.GetEntry(0, (ushort)IFDEntryTag.ExifIFD) as SubIFDEntry; var exifStructure = exif.Structure;
if (exif != null) if (exifStructure != null)
{ {
var exifStructure = exif.Structure; var entry = exifStructure.GetEntry(0, (ushort)ExifEntryTag.ApertureValue) as RationalIFDEntry;
if (exifStructure != null) if (entry != null)
{ {
var entry = exifStructure.GetEntry(0, (ushort)ExifEntryTag.ApertureValue) as RationalIFDEntry; double val = entry.Value.Numerator;
val /= entry.Value.Denominator;
item.Aperture = val;
}
if (entry != null) entry = exifStructure.GetEntry(0, (ushort)ExifEntryTag.ShutterSpeedValue) as RationalIFDEntry;
{
double val = entry.Value.Numerator;
val /= entry.Value.Denominator;
item.Aperture = val;
}
entry = exifStructure.GetEntry(0, (ushort)ExifEntryTag.ShutterSpeedValue) as RationalIFDEntry; if (entry != null)
{
if (entry != null) double val = entry.Value.Numerator;
{ val /= entry.Value.Denominator;
double val = entry.Value.Numerator; item.ShutterSpeed = val;
val /= entry.Value.Denominator;
item.ShutterSpeed = val;
}
} }
} }
} }
} }
}
if (image != null) if (image != null)
{
item.CameraMake = image.ImageTag.Make;
item.CameraModel = image.ImageTag.Model;
item.Width = image.Properties.PhotoWidth;
item.Height = image.Properties.PhotoHeight;
var rating = image.ImageTag.Rating;
if (rating.HasValue)
{ {
item.CameraMake = image.ImageTag.Make; item.CommunityRating = rating;
item.CameraModel = image.ImageTag.Model; }
else
{
item.CommunityRating = null;
}
item.Width = image.Properties.PhotoWidth; item.Overview = image.ImageTag.Comment;
item.Height = image.Properties.PhotoHeight;
var rating = image.ImageTag.Rating; if (!string.IsNullOrWhiteSpace(image.ImageTag.Title))
if (rating.HasValue) {
if (!item.LockedFields.Contains(MetadataFields.Name))
{ {
item.CommunityRating = rating; item.Name = image.ImageTag.Title;
} }
else }
var dateTaken = image.ImageTag.DateTime;
if (dateTaken.HasValue)
{
item.DateCreated = dateTaken.Value;
item.PremiereDate = dateTaken.Value;
item.ProductionYear = dateTaken.Value.Year;
}
item.Genres = image.ImageTag.Genres;
item.Tags = image.ImageTag.Keywords;
item.Software = image.ImageTag.Software;
if (image.ImageTag.Orientation == TagLib.Image.ImageOrientation.None)
{
item.Orientation = null;
}
else
{
MediaBrowser.Model.Drawing.ImageOrientation orientation;
if (Enum.TryParse(image.ImageTag.Orientation.ToString(), true, out orientation))
{ {
item.CommunityRating = null; item.Orientation = orientation;
} }
}
item.Overview = image.ImageTag.Comment; item.ExposureTime = image.ImageTag.ExposureTime;
item.FocalLength = image.ImageTag.FocalLength;
if (!string.IsNullOrWhiteSpace(image.ImageTag.Title)) item.Latitude = image.ImageTag.Latitude;
{ item.Longitude = image.ImageTag.Longitude;
if (!item.LockedFields.Contains(MetadataFields.Name)) item.Altitude = image.ImageTag.Altitude;
{
item.Name = image.ImageTag.Title;
}
}
var dateTaken = image.ImageTag.DateTime; if (image.ImageTag.ISOSpeedRatings.HasValue)
if (dateTaken.HasValue) {
{ item.IsoSpeedRating = Convert.ToInt32(image.ImageTag.ISOSpeedRatings.Value);
item.DateCreated = dateTaken.Value; }
item.PremiereDate = dateTaken.Value; else
item.ProductionYear = dateTaken.Value.Year; {
} item.IsoSpeedRating = null;
item.Genres = image.ImageTag.Genres;
item.Tags = image.ImageTag.Keywords;
item.Software = image.ImageTag.Software;
if (image.ImageTag.Orientation == TagLib.Image.ImageOrientation.None)
{
item.Orientation = null;
}
else
{
MediaBrowser.Model.Drawing.ImageOrientation orientation;
if (Enum.TryParse(image.ImageTag.Orientation.ToString(), true, out orientation))
{
item.Orientation = orientation;
}
}
item.ExposureTime = image.ImageTag.ExposureTime;
item.FocalLength = image.ImageTag.FocalLength;
item.Latitude = image.ImageTag.Latitude;
item.Longitude = image.ImageTag.Longitude;
item.Altitude = image.ImageTag.Altitude;
if (image.ImageTag.ISOSpeedRatings.HasValue)
{
item.IsoSpeedRating = Convert.ToInt32(image.ImageTag.ISOSpeedRatings.Value);
}
else
{
item.IsoSpeedRating = null;
}
} }
} }
} }