Replace TagLib.Portable.dll with taglib-sharp submodule

.gitmodules

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

Emby.Photos/Emby.Photos.csproj

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

Emby.Photos/PhotoProvider.cs

@@ -57,118 +57,115 @@ namespace Emby.Photos
             {
                 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 image = file as TagLib.Image.File;
+
+                        var tag = file.GetTag(TagTypes.TiffIFD) as IFDTag;
 
-                            var tag = file.GetTag(TagTypes.TiffIFD) as IFDTag;
+                        if (tag != null)
+                        {
+                            var structure = tag.Structure;
 
-                            if (tag != null)
+                            if (structure != 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;
-
-                                            if (entry != null)
-                                            {
-                                                double val = entry.Value.Numerator;
-                                                val /= entry.Value.Denominator;
-                                                item.Aperture = val;
-                                            }
-
-                                            entry = exifStructure.GetEntry(0, (ushort)ExifEntryTag.ShutterSpeedValue) as RationalIFDEntry;
-
-                                            if (entry != null)
-                                            {
-                                                double val = entry.Value.Numerator;
-                                                val /= entry.Value.Denominator;
-                                                item.ShutterSpeed = val;
-                                            }
+                                            double val = entry.Value.Numerator;
+                                            val /= entry.Value.Denominator;
+                                            item.Aperture = val;
+                                        }
+
+                                        entry = exifStructure.GetEntry(0, (ushort)ExifEntryTag.ShutterSpeedValue) as RationalIFDEntry;
+
+                                        if (entry != null)
+                                        {
+                                            double val = entry.Value.Numerator;
+                                            val /= entry.Value.Denominator;
+                                            item.ShutterSpeed = val;
                                         }
                                     }
                                 }
                             }
+                        }
 
-                            if (image != null)
-                            {
-                                item.CameraMake = image.ImageTag.Make;
-                                item.CameraModel = image.ImageTag.Model;
+                        if (image != null)
+                        {
+                            item.CameraMake = image.ImageTag.Make;
+                            item.CameraModel = image.ImageTag.Model;
 
-                                item.Width = image.Properties.PhotoWidth;
-                                item.Height = image.Properties.PhotoHeight;
+                            item.Width = image.Properties.PhotoWidth;
+                            item.Height = image.Properties.PhotoHeight;
 
-                                var rating = image.ImageTag.Rating;
-                                if (rating.HasValue)
-                                {
-                                    item.CommunityRating = rating;
-                                }
-                                else
-                                {
-                                    item.CommunityRating = null;
-                                }
+                            var rating = image.ImageTag.Rating;
+                            if (rating.HasValue)
+                            {
+                                item.CommunityRating = rating;
+                            }
+                            else
+                            {
+                                item.CommunityRating = null;
+                            }
 
-                                item.Overview = image.ImageTag.Comment;
+                            item.Overview = image.ImageTag.Comment;
 
-                                if (!string.IsNullOrWhiteSpace(image.ImageTag.Title))
+                            if (!string.IsNullOrWhiteSpace(image.ImageTag.Title))
+                            {
+                                if (!item.LockedFields.Contains(MetadataFields.Name))
                                 {
-                                    if (!item.LockedFields.Contains(MetadataFields.Name))
-                                    {
-                                        item.Name = image.ImageTag.Title;
-                                    }
+                                    item.Name = image.ImageTag.Title;
                                 }
+                            }
 
-                                var dateTaken = image.ImageTag.DateTime;
-                                if (dateTaken.HasValue)
-                                {
-                                    item.DateCreated = dateTaken.Value;
-                                    item.PremiereDate = dateTaken.Value;
-                                    item.ProductionYear = dateTaken.Value.Year;
-                                }
+                            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;
+                            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
+                            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))
                                 {
-                                    MediaBrowser.Model.Drawing.ImageOrientation orientation;
-                                    if (Enum.TryParse(image.ImageTag.Orientation.ToString(), true, out orientation))
-                                    {
-                                        item.Orientation = orientation;
-                                    }
+                                    item.Orientation = orientation;
                                 }
+                            }
 
-                                item.ExposureTime = image.ImageTag.ExposureTime;
-                                item.FocalLength = image.ImageTag.FocalLength;
+                            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;
+                            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;
-                                }
+                            if (image.ImageTag.ISOSpeedRatings.HasValue)
+                            {
+                                item.IsoSpeedRating = Convert.ToInt32(image.ImageTag.ISOSpeedRatings.Value);
+                            }
+                            else
+                            {
+                                item.IsoSpeedRating = null;
                             }
                         }
                     }