merged master

.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">
+    <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj" />
-      <HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup>

Emby.Photos/PhotoProvider.cs

@@ -57,9 +57,7 @@ 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;
 
@@ -172,7 +170,6 @@ namespace Emby.Photos
                         }
                     }
                 }
-                }
                 catch (Exception e)
                 {
                     _logger.ErrorException("Image Provider - Error reading image tag for {0}", e, item.Path);

README.md

@@ -13,34 +13,52 @@ While our first priority is a stable build, we will eventually add features that
 
 [Feature Requests](http://feathub.com/jellyfin/jellyfin)
 
-## Building Jellyfin packages
+## Prebuilt Jellyfin packages
+
+Prebuild packages are available for Debian/Ubuntu and Arch, and via Docker Hub.
+
+### Docker
+
+The Jellyfin Docker image is available on Docker Hub at https://hub.docker.com/r/jellyfin/jellyfin/
+
+### Arch
+
+The Jellyfin package is in the AUR at https://aur.archlinux.org/packages/jellyfin-git/
+
+### Debian/Ubuntu
+
+A package repository is available at https://repo.jellyfin.org. To use it:
+
+0. Install the `dotnet-runtime-2.1` package via [Microsoft's repositories](https://dotnet.microsoft.com/download/dotnet-core/2.1).
+0. Import the GPG signing key (signed by Joshua):
+    ```
+    wget -O - https://repo.jellyfin.org/debian/jellyfin-signing-key-joshua.gpg.key | sudo apt-key add -
+    ```
+0. Add an entry to `/etc/apt/sources.list.d/jellyfin.list` (note that Ubuntu will get `buster` but this should work fine):
+    ```
+    echo "deb https://repo.jellyfin.org/debian $( grep -Ewo -m1 --color=none 'jessie|stretch|buster' /etc/os-release || echo buster ) main" | sudo tee /etc/apt/sources.list.d/jellyfin.list
+    ```
+0. Update APT repositories:
+    ```
+    sudo apt update
+    ```
+0. Install Jellyfin:
+    ```
+    sudo apt install jellyfin
+    ```
+
+## Building Jellyfin packages from source
 
 Jellyfin seeks to integrate build facilities for any desired packaging format. Instructions for the various formats can be found below.
 
+NOTE: When building from source, only cloning the full Git repository is supported, rather than using a `.zip`/`.tar` archive, in order to support submodules.
+
 ### Debian/Ubuntu
 
 Debian build facilities are integrated into the repo at `debian/`.
 
-1. Install the `dotnet-sdk-2.1` package via [Microsoft's repositories](https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-2.1.500).
+1. Install the `dotnet-sdk-2.1` package via [Microsoft's repositories](https://dotnet.microsoft.com/download/dotnet-core/2.1).
-2. Run `dpkg-buildpackage -us -uc -jX`, where X is your core count.
+2. Run `dpkg-buildpackage -us -uc`.
-3. Install the resulting `jellyfin*.deb` file on your system.
+3. Install the resulting `jellyfin_*.deb` file on your system.
 
-A huge thanks to Carlos Hernandez who created the Debian build configuration for Emby 3.1.1.
+A huge thanks to Carlos Hernandez who created the original Debian build configuration for Emby 3.1.1.
-
-### Windows (64 bit)
-A pre-built windows installer will be available at [The JellyFin Repository](https://repo.jellyfin.org/).
-
-1. Install the dotnet core SDK 2.1 from [Microsoft's Webpage](https://dotnet.microsoft.com/download/thank-you/dotnet-sdk-2.1.500-windows-x64-installer)
-2. Clone Jellyfin into a directory of your choice. From that directory run in powershell `dotnet publish -c Release -r win10-x64 MediaBrowser.sln -o $Env:APPDATA\Jellyfin-Server` or in CMD `dotnet publish -c Release -r win10-x64 MediaBrowser.sln -o %APPDATA%\Jellyfin-Server`
-3. (Optional) Copy the ffmpeg binaries into the Jellyfin directory:
-```
-Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-4.1-win64-static.zip -UseBasicParsing -OutFile $env:TEMP\fmmpeg.zip
-Expand-Archive $env:TEMP\fmmpeg.zip -DestinationPath $env:TEMP\ffmpeg\
-Get-ChildItem "$env:temp\ffmpeg\ffmpeg-4.1-win64-static\bin" | ForEach-Object {
-    Copy-Item $_ -Destination $Env:AppData\JellyFin-Server\
-}
-Remove-Item $env:TEMP\ffmpeg\ -Recurse -Force
-Remove-Item $env:TEMP\fmmpeg.zip -Force
-```
-4. (Optional) Use [NSSM](https://nssm.cc/) to configure JellyFin to run as a service
-5. Jellyfin is now available in your Appdata\Roaming directory. To start it from a powershell window, `&"$env:APPDATA\Jellyfin-Server\EmbyServer.exe"`