Merge branch 'master' into warn12

CONTRIBUTORS.md

@@ -30,6 +30,7 @@
  - [Khinenw](https://github.com/HelloWorld017)
  - [fhriley](https://github.com/fhriley)
  - [nevado](https://github.com/nevado)
+ - [mark-monteiro](https://github.com/mark-monteiro)
 
 # Emby Contributors
 

Emby.Server.Implementations/ApplicationHost.cs

@@ -838,16 +838,14 @@ namespace Emby.Server.Implementations
             serviceCollection.AddSingleton(ChapterManager);
 
             MediaEncoder = new MediaBrowser.MediaEncoding.Encoder.MediaEncoder(
-                LoggerFactory,
-                JsonSerializer,
-                StartupOptions.FFmpegPath,
+                LoggerFactory.CreateLogger<MediaBrowser.MediaEncoding.Encoder.MediaEncoder>(),
                 ServerConfigurationManager,
                 FileSystemManager,
-                () => SubtitleEncoder,
-                () => MediaSourceManager,
                 ProcessFactory,
-                5000,
-                LocalizationManager);
+                LocalizationManager,
+                () => SubtitleEncoder,
+                _configuration,
+                StartupOptions.FFmpegPath);
             serviceCollection.AddSingleton(MediaEncoder);
 
             EncodingManager = new MediaEncoder.EncodingManager(FileSystemManager, LoggerFactory, MediaEncoder, ChapterManager, LibraryManager);
@@ -864,10 +862,19 @@ namespace Emby.Server.Implementations
             AuthService = new AuthService(LoggerFactory.CreateLogger<AuthService>(), authContext, ServerConfigurationManager, SessionManager, NetworkManager);
             serviceCollection.AddSingleton(AuthService);
 
-            SubtitleEncoder = new MediaBrowser.MediaEncoding.Subtitles.SubtitleEncoder(LibraryManager, LoggerFactory, ApplicationPaths, FileSystemManager, MediaEncoder, JsonSerializer, HttpClient, MediaSourceManager, ProcessFactory);
+            SubtitleEncoder = new MediaBrowser.MediaEncoding.Subtitles.SubtitleEncoder(
+                LibraryManager,
+                LoggerFactory.CreateLogger<MediaBrowser.MediaEncoding.Subtitles.SubtitleEncoder>(),
+                ApplicationPaths,
+                FileSystemManager,
+                MediaEncoder,
+                HttpClient,
+                MediaSourceManager,
+                ProcessFactory);
             serviceCollection.AddSingleton(SubtitleEncoder);
 
             serviceCollection.AddSingleton(typeof(IResourceFileManager), typeof(ResourceFileManager));
+            serviceCollection.AddSingleton<EncodingHelper>();
 
             _displayPreferencesRepository.Initialize();
 

Emby.Server.Implementations/ConfigurationOptions.cs

@@ -1,13 +1,16 @@
 using System.Collections.Generic;
+using static MediaBrowser.Controller.Extensions.ConfigurationExtensions;
 
 namespace Emby.Server.Implementations
 {
     public static class ConfigurationOptions
     {
-        public static readonly Dictionary<string, string> Configuration = new Dictionary<string, string>
+        public static Dictionary<string, string> Configuration => new Dictionary<string, string>
         {
             { "HttpListenerHost:DefaultRedirectPath", "web/index.html" },
-            { "MusicBrainz:BaseUrl", "https://www.musicbrainz.org" }
+            { "MusicBrainz:BaseUrl", "https://www.musicbrainz.org" },
+            { FfmpegProbeSizeKey, "1G" },
+            { FfmpegAnalyzeDurationKey, "200M" }
         };
     }
 }

Emby.Server.Implementations/Emby.Server.Implementations.csproj

@@ -15,12 +15,12 @@
     <ProjectReference Include="..\MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj" />
     <ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
     <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
-    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj" />
     <ProjectReference Include="..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="IPNetwork2" Version="2.4.0.126" />
+    <PackageReference Include="Jellyfin.XmlTv" Version="10.4.3" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.2.0" />
@@ -29,7 +29,6 @@
     <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />

Emby.Server.Implementations/Library/UserDataManager.cs

@@ -227,24 +227,21 @@ namespace Emby.Server.Implementations.Library
             {
                 var pctIn = decimal.Divide(positionTicks, runtimeTicks) * 100;
 
-                // Don't track in very beginning
                 if (pctIn < _config.Configuration.MinResumePct)
                 {
+                    // ignore progress during the beginning
                     positionTicks = 0;
                 }
-
-                // If we're at the end, assume completed
                 else if (pctIn > _config.Configuration.MaxResumePct || positionTicks >= runtimeTicks)
                 {
+                    // mark as completed close to the end
                     positionTicks = 0;
                     data.Played = playedToCompletion = true;
                 }
-
                 else
                 {
                     // Enforce MinResumeDuration
                     var durationSeconds = TimeSpan.FromTicks(runtimeTicks).TotalSeconds;
-
                     if (durationSeconds < _config.Configuration.MinResumeDurationSeconds)
                     {
                         positionTicks = 0;
@@ -264,6 +261,7 @@ namespace Emby.Server.Implementations.Library
                 positionTicks = 0;
                 data.Played = false;
             }
+
             if (!item.SupportsPositionTicksResume)
             {
                 positionTicks = 0;

Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs

@@ -7,8 +7,8 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.XmlTv.Classes;
-using Emby.XmlTv.Entities;
+using Jellyfin.XmlTv;
+using Jellyfin.XmlTv.Entities;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;

Emby.Server.Implementations/LiveTv/LiveTvManager.cs

@@ -304,9 +304,12 @@ namespace Emby.Server.Implementations.LiveTv
         }
 
         private ILiveTvService GetService(string name)
-        {
-            return _services.FirstOrDefault(i => string.Equals(i.Name, name, StringComparison.OrdinalIgnoreCase));
-        }
+            => Array.Find(_services, x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase))
+                ?? throw new KeyNotFoundException(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "No service with the name '{0}' can be found.",
+                        name));
 
         private static void Normalize(MediaSourceInfo mediaSource, ILiveTvService service, bool isVideo)
         {

Emby.Server.Implementations/Localization/Core/ca.json

@@ -1,11 +1,11 @@
 {
     "Albums": "Àlbums",
-    "AppDeviceValues": "App: {0}, Dispositiu: {1}",
-    "Application": "Application",
+    "AppDeviceValues": "Aplicació: {0}, Dispositiu: {1}",
+    "Application": "Aplicació",
     "Artists": "Artistes",
     "AuthenticationSucceededWithUserName": "{0} s'ha autenticat correctament",
     "Books": "Llibres",
-    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "CameraImageUploadedFrom": "Una nova imatge de càmera ha sigut pujada des de {0}",
     "Channels": "Canals",
     "ChapterNameValue": "Episodi {0}",
     "Collections": "Col·leccions",
@@ -15,8 +15,8 @@
     "Favorites": "Preferits",
     "Folders": "Directoris",
     "Genres": "Gèneres",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderAlbumArtists": "Artistes dels Àlbums",
+    "HeaderCameraUploads": "Pujades de Càmera",
     "HeaderContinueWatching": "Continua Veient",
     "HeaderFavoriteAlbums": "Àlbums Preferits",
     "HeaderFavoriteArtists": "Artistes Preferits",
@@ -27,71 +27,71 @@
     "HeaderNextUp": "A continuació",
     "HeaderRecordingGroups": "Grups d'Enregistrament",
     "HomeVideos": "Vídeos domèstics",
-    "Inherit": "Heretat",
-    "ItemAddedWithName": "{0} afegit a la biblioteca",
-    "ItemRemovedWithName": "{0} eliminat de la biblioteca",
+    "Inherit": "Hereta",
+    "ItemAddedWithName": "{0} ha estat afegit a la biblioteca",
+    "ItemRemovedWithName": "{0} ha estat eliminat de la biblioteca",
     "LabelIpAddressValue": "Adreça IP: {0}",
-    "LabelRunningTimeValue": "Temps en marxa: {0}",
+    "LabelRunningTimeValue": "Temps en funcionament: {0}",
     "Latest": "Darreres",
-    "MessageApplicationUpdated": "El Servidor d'Jellyfin ha estat actualitzat",
-    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "La secció de configuració {0} ha estat actualitzada",
+    "MessageApplicationUpdated": "El Servidor de Jellyfin ha estat actualitzat",
+    "MessageApplicationUpdatedTo": "El Servidor de Jellyfin ha estat actualitzat a {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "La secció {0} de la configuració del servidor ha estat actualitzada",
     "MessageServerConfigurationUpdated": "S'ha actualitzat la configuració del servidor",
     "MixedContent": "Contingut mesclat",
     "Movies": "Pel·lícules",
     "Music": "Música",
     "MusicVideos": "Vídeos musicals",
-    "NameInstallFailed": "{0} installation failed",
+    "NameInstallFailed": "Instalació de {0} fallida",
     "NameSeasonNumber": "Temporada {0}",
-    "NameSeasonUnknown": "Season Unknown",
-    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NameSeasonUnknown": "Temporada Desconeguda",
+    "NewVersionIsAvailable": "Una nova versió del Servidor Jellyfin està disponible per descarregar.",
     "NotificationOptionApplicationUpdateAvailable": "Actualització d'aplicació disponible",
     "NotificationOptionApplicationUpdateInstalled": "Actualització d'aplicació instal·lada",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionPluginError": "Un component ha fallat",
-    "NotificationOptionPluginInstalled": "Complement instal·lat",
-    "NotificationOptionPluginUninstalled": "Complement desinstal·lat",
-    "NotificationOptionPluginUpdateInstalled": "Actualització de complement instal·lada",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlayback": "Reproducció d'audio iniciada",
+    "NotificationOptionAudioPlaybackStopped": "Reproducció d'audio aturada",
+    "NotificationOptionCameraImageUploaded": "Imatge de càmera pujada",
+    "NotificationOptionInstallationFailed": "Instalació fallida",
+    "NotificationOptionNewLibraryContent": "Nou contingut afegit",
+    "NotificationOptionPluginError": "Un connector ha fallat",
+    "NotificationOptionPluginInstalled": "Connector instal·lat",
+    "NotificationOptionPluginUninstalled": "Connector desinstal·lat",
+    "NotificationOptionPluginUpdateInstalled": "Actualització de connector instal·lada",
+    "NotificationOptionServerRestartRequired": "Reinici del servidor requerit",
+    "NotificationOptionTaskFailed": "Tasca programada fallida",
+    "NotificationOptionUserLockedOut": "Usuari tancat",
+    "NotificationOptionVideoPlayback": "Reproducció de video iniciada",
+    "NotificationOptionVideoPlaybackStopped": "Reproducció de video aturada",
     "Photos": "Fotos",
     "Playlists": "Llistes de reproducció",
-    "Plugin": "Plugin",
+    "Plugin": "Connector",
     "PluginInstalledWithName": "{0} ha estat instal·lat",
     "PluginUninstalledWithName": "{0} ha estat desinstal·lat",
     "PluginUpdatedWithName": "{0} ha estat actualitzat",
     "ProviderValue": "Proveïdor: {0}",
     "ScheduledTaskFailedWithName": "{0} ha fallat",
     "ScheduledTaskStartedWithName": "{0} iniciat",
-    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-    "Shows": "Espectacles",
+    "ServerNameNeedsToBeRestarted": "{0} necessita ser reiniciat",
+    "Shows": "Programes",
     "Songs": "Cançons",
     "StartupEmbyServerIsLoading": "El Servidor d'Jellyfin està carregant. Si et plau, prova de nou en breus.",
     "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitleDownloadFailureFromForItem": "Els subtítols no s'han pogut baixar de {0} per {1}",
     "SubtitlesDownloadedForItem": "Subtítols descarregats per a {0}",
-    "Sync": "Sync",
+    "Sync": "Sincronitzar",
     "System": "System",
     "TvShows": "Espectacles de TV",
     "User": "User",
     "UserCreatedWithName": "S'ha creat l'usuari {0}",
     "UserDeletedWithName": "L'usuari {0} ha estat eliminat",
     "UserDownloadingItemWithValues": "{0} està descarregant {1}",
-    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserLockedOutWithName": "L'usuari {0} ha sigut tancat",
     "UserOfflineFromDevice": "{0} s'ha desconnectat de {1}",
     "UserOnlineFromDevice": "{0} està connectat des de {1}",
     "UserPasswordChangedWithName": "La contrasenya ha estat canviada per a l'usuari {0}",
-    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserPolicyUpdatedWithName": "La política d'usuari s'ha actualitzat per {0}",
     "UserStartedPlayingItemWithValues": "{0} ha començat a reproduir {1}",
     "UserStoppedPlayingItemWithValues": "{0} ha parat de reproduir {1}",
-    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueHasBeenAddedToLibrary": "{0} ha sigut afegit a la teva llibreria",
     "ValueSpecialEpisodeName": "Especial - {0}",
     "VersionNumber": "Versió {0}"
 }

Emby.Server.Implementations/Localization/Core/is.json

@@ -7,11 +7,11 @@
     "HeaderRecordingGroups": "Upptökuhópar",
     "HeaderNextUp": "Næst á dagskrá",
     "HeaderLiveTV": "Sjónvarp í beinni útsendingu",
-    "HeaderFavoriteSongs": "Uppáhalds lög",
-    "HeaderFavoriteShows": "Uppáhalds sjónvarpsþættir",
-    "HeaderFavoriteEpisodes": "Uppáhalds þættir",
-    "HeaderFavoriteArtists": "Uppáhalds listamenn",
-    "HeaderFavoriteAlbums": "Uppáhalds plötur",
+    "HeaderFavoriteSongs": "Uppáhalds Lög",
+    "HeaderFavoriteShows": "Uppáhalds Sjónvarpsþættir",
+    "HeaderFavoriteEpisodes": "Uppáhalds Þættir",
+    "HeaderFavoriteArtists": "Uppáhalds Listamenn",
+    "HeaderFavoriteAlbums": "Uppáhalds Plötur",
     "HeaderContinueWatching": "Halda áfram að horfa",
     "HeaderCameraUploads": "Myndavéla upphal",
     "HeaderAlbumArtists": "Höfundur plötu",
@@ -30,5 +30,49 @@
     "Artists": "Listamaður",
     "Application": "Forrit",
     "AppDeviceValues": "Snjallforrit: {0}, Tæki: {1}",
-    "Albums": "Plötur"
+    "Albums": "Plötur",
+    "Plugin": "Viðbót",
+    "Photos": "Myndir",
+    "NotificationOptionVideoPlaybackStopped": "Myndbandafspilun stöðvuð",
+    "NotificationOptionVideoPlayback": "Myndbandafspilun hafin",
+    "NotificationOptionUserLockedOut": "Notandi læstur úti",
+    "NotificationOptionServerRestartRequired": "Endurræsing miðlara nauðsynileg",
+    "NotificationOptionPluginUpdateInstalled": "Viðbótar uppfærsla uppsett",
+    "NotificationOptionPluginUninstalled": "Viðbót fjarlægð",
+    "NotificationOptionPluginInstalled": "Viðbót settur upp",
+    "NotificationOptionPluginError": "Bilun í viðbót",
+    "NotificationOptionInstallationFailed": "Uppsetning tókst ekki",
+    "NotificationOptionCameraImageUploaded": "Myndavélarmynd hlaðið upp",
+    "NotificationOptionAudioPlaybackStopped": "Hljóðafspilun stöðvuð",
+    "NotificationOptionAudioPlayback": "Hljóðafspilun hafin",
+    "NotificationOptionApplicationUpdateInstalled": "Uppfærsla uppsett",
+    "NotificationOptionApplicationUpdateAvailable": "Uppfærsla í boði",
+    "NameSeasonUnknown": "Sería óþekkt",
+    "NameSeasonNumber": "Sería {0}",
+    "MixedContent": "Blandað efni",
+    "MessageServerConfigurationUpdated": "Stillingar  miðlarans hefur verið uppfærð",
+    "MessageApplicationUpdatedTo": "Jellyfin Server hefur verið uppfærður í {0}",
+    "MessageApplicationUpdated": "Jellyfin Server hefur verið uppfærður",
+    "Latest": "Nýjasta",
+    "LabelRunningTimeValue": "Keyrslutími kerfis: {0}",
+    "User": "Notandi",
+    "System": "Kerfi",
+    "NotificationOptionNewLibraryContent": "Nýju efni bætt við",
+    "NewVersionIsAvailable": "Ný útgáfa af Jellyfin Server er fáanleg til niðurhals.",
+    "NameInstallFailed": "{0} uppsetning mistókst",
+    "MusicVideos": "Tónlistarmyndbönd",
+    "Music": "Tónlist",
+    "Movies": "Kvikmyndir",
+    "UserDeletedWithName": "Notanda {0} hefur verið eytt",
+    "UserCreatedWithName": "Notandi {0} hefur verið stofnaður",
+    "TvShows": "Þættir",
+    "Sync": "Samstilla",
+    "Songs": "Lög",
+    "ServerNameNeedsToBeRestarted": "{0} þarf að endurræsa",
+    "ScheduledTaskStartedWithName": "{0} hafin",
+    "ScheduledTaskFailedWithName": "{0} mistókst",
+    "PluginUpdatedWithName": "{0} var uppfært",
+    "PluginUninstalledWithName": "{0} var fjarlægt",
+    "PluginInstalledWithName": "{0} var sett upp",
+    "NotificationOptionTaskFailed": "Tímasett verkefni mistókst"
 }

Emby.Server.Implementations/Localization/Core/ko.json

@@ -5,13 +5,13 @@
     "Artists": "아티스트",
     "AuthenticationSucceededWithUserName": "{0}이 성공적으로 인증됨",
     "Books": "도서",
-    "CameraImageUploadedFrom": "{0}에서 새로운 카메라 이미지가 업로드되었습니다",
+    "CameraImageUploadedFrom": "{0}에서 새로운 카메라 이미지가 업로드됨",
     "Channels": "채널",
     "ChapterNameValue": "챕터 {0}",
     "Collections": "컬렉션",
-    "DeviceOfflineWithName": "{0} 연결 끊김",
-    "DeviceOnlineWithName": "{0} 연결됨",
-    "FailedLoginAttemptWithUserName": "{0} 로그인 실패",
+    "DeviceOfflineWithName": "{0}의 연결 끊김",
+    "DeviceOnlineWithName": "{0}이 연결됨",
+    "FailedLoginAttemptWithUserName": "{0}에서 로그인 실패",
     "Favorites": "즐겨찾기",
     "Folders": "폴더",
     "Genres": "장르",

Emby.Server.Implementations/Localization/Core/nl.json

@@ -5,10 +5,10 @@
     "Artists": "Artiesten",
     "AuthenticationSucceededWithUserName": "{0} is succesvol geverifieerd",
     "Books": "Boeken",
-    "CameraImageUploadedFrom": "Er is een nieuwe foto toegevoegd via {0}",
+    "CameraImageUploadedFrom": "Er is een nieuwe foto toegevoegd van {0}",
     "Channels": "Kanalen",
     "ChapterNameValue": "Hoofdstuk {0}",
-    "Collections": "Collecties",
+    "Collections": "Verzamelingen",
     "DeviceOfflineWithName": "{0} heeft de verbinding verbroken",
     "DeviceOnlineWithName": "{0} is verbonden",
     "FailedLoginAttemptWithUserName": "Mislukte aanmeld poging van {0}",
@@ -58,7 +58,7 @@
     "NotificationOptionPluginUpdateInstalled": "Plug-in-update geïnstalleerd",
     "NotificationOptionServerRestartRequired": "Server herstart nodig",
     "NotificationOptionTaskFailed": "Geplande taak mislukt",
-    "NotificationOptionUserLockedOut": "Gebruikersaccount vergrendeld",
+    "NotificationOptionUserLockedOut": "Gebruiker is vergrendeld",
     "NotificationOptionVideoPlayback": "Video gestart",
     "NotificationOptionVideoPlaybackStopped": "Video gestopt",
     "Photos": "Foto's",

Emby.Server.Implementations/Localization/Core/pt-BR.json

@@ -24,7 +24,7 @@
     "HeaderFavoriteShows": "Séries Favoritas",
     "HeaderFavoriteSongs": "Músicas Favoritas",
     "HeaderLiveTV": "TV ao Vivo",
-    "HeaderNextUp": "Próximos",
+    "HeaderNextUp": "A Seguir",
     "HeaderRecordingGroups": "Grupos de Gravação",
     "HomeVideos": "Vídeos caseiros",
     "Inherit": "Herdar",

Emby.Server.Implementations/Session/SessionManager.cs

@@ -667,12 +667,9 @@ namespace Emby.Server.Implementations.Session
             data.PlayCount++;
             data.LastPlayedDate = DateTime.UtcNow;
 
-            if (item.SupportsPlayedStatus)
+            if (item.SupportsPlayedStatus && !item.SupportsPositionTicksResume)
             {
-                if (!(item is Video))
-                {
-                    data.Played = true;
-                }
+                data.Played = true;
             }
             else
             {
@@ -769,7 +766,6 @@ namespace Emby.Server.Implementations.Session
             {
                 _userDataManager.SaveUserData(user, item, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None);
             }
-
         }
 
         private static bool UpdatePlaybackSettings(User user, PlaybackProgressInfo info, UserItemData data)
@@ -1393,6 +1389,12 @@ namespace Emby.Server.Implementations.Session
                 }
             }
 
+            if (user == null)
+            {
+                AuthenticationFailed?.Invoke(this, new GenericEventArgs<AuthenticationRequest>(request));
+                throw new SecurityException("Invalid user or password entered.");
+            }
+
             if (enforcePassword)
             {
                 user = await _userManager.AuthenticateUser(
@@ -1403,13 +1405,6 @@ namespace Emby.Server.Implementations.Session
                     true).ConfigureAwait(false);
             }
 
-            if (user == null)
-            {
-                AuthenticationFailed?.Invoke(this, new GenericEventArgs<AuthenticationRequest>(request));
-
-                throw new SecurityException("Invalid user or password entered.");
-            }
-
             var token = GetAuthorizationToken(user, request.DeviceId, request.App, request.AppVersion, request.DeviceName);
 
             var session = LogSessionActivity(

Emby.Server.Implementations/Updates/InstallationManager.cs

@@ -141,8 +141,7 @@ namespace Emby.Server.Implementations.Updates
 
             if (guid != Guid.Empty)
             {
-                var strGuid = guid.ToString("N", CultureInfo.InvariantCulture);
-                availablePackages = availablePackages.Where(x => x.guid.Equals(strGuid, StringComparison.OrdinalIgnoreCase));
+                availablePackages = availablePackages.Where(x => Guid.Parse(x.guid) == guid);
             }
 
             return availablePackages;

Emby.XmlTv/.gitattributes

@@ -1,63 +0,0 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
-* text=auto
-
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
-
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain

Emby.XmlTv/.gitignore

@@ -1,212 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-build/
-bld/
-[Bb]in/
-[Oo]bj/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
-#*.pubxml
-
-*.publishproj
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-
-# Windows Azure Build Output
-csx/
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# LightSwitch generated files
-GeneratedArtifacts/
-_Pvt_Extensions/
-ModelManifest.xml

Emby.XmlTv/Emby.XmlTv.Console/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
-    </startup>
-</configuration>

Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-
-using Emby.XmlTv.Entities;
-
-namespace Emby.XmlTv.Console.Classes
-{
-    public static class EntityExtensions
-    {
-        public static string GetHeader(this string text)
-        {
-            var channelHeaderString = " " + text;
-
-            var builder = new StringBuilder();
-            builder.AppendLine("".PadRight(5 + channelHeaderString.Length + 5, Char.Parse("*")));
-            builder.AppendLine("".PadRight(5, Char.Parse("*")) + channelHeaderString + "".PadRight(5, Char.Parse("*")));
-            builder.AppendLine("".PadRight(5 + channelHeaderString.Length + 5, Char.Parse("*")));
-
-            return builder.ToString();
-        }
-
-        public static string GetChannelDetail(this XmlTvChannel channel)
-        {
-            var builder = new StringBuilder();
-            builder.AppendFormat("Id:                {0}\r\n", channel.Id);
-            builder.AppendFormat("Display-Name:      {0}\r\n", channel.DisplayName);
-            builder.AppendFormat("Url:               {0}\r\n", channel.Url);
-            builder.AppendFormat("Icon:              {0}\r\n", channel.Icon != null ? channel.Icon.ToString() : string.Empty);
-            builder.AppendLine("-------------------------------------------------------");
-
-            return builder.ToString();
-        }
-
-        public static string GetProgrammeDetail(this XmlTvProgram programme, XmlTvChannel channel)
-        {
-            var builder = new StringBuilder();
-            builder.AppendFormat("Channel:           {0} - {1}\r\n", channel.Id, channel.DisplayName);
-            builder.AppendFormat("Start Date:        {0:G}\r\n", programme.StartDate);
-            builder.AppendFormat("End Date:          {0:G}\r\n", programme.EndDate);
-            builder.AppendFormat("Name:              {0}\r\n", programme.Title);
-            builder.AppendFormat("Episode Detail:    {0}\r\n", programme.Episode);
-            builder.AppendFormat("Episode Title:     {0}\r\n", programme.Episode.Title);
-            builder.AppendFormat("Description:       {0}\r\n", programme.Description);
-            builder.AppendFormat("Categories:        {0}\r\n", string.Join(", ", programme.Categories));
-            builder.AppendFormat("Countries:         {0}\r\n", string.Join(", ", programme.Countries));
-            builder.AppendFormat("Credits:           {0}\r\n", string.Join(", ", programme.Credits));
-            builder.AppendFormat("Rating:            {0}\r\n", programme.Rating);
-            builder.AppendFormat("Star Rating:       {0}\r\n", programme.StarRating.HasValue ? programme.StarRating.Value.ToString() : string.Empty);
-            builder.AppendFormat("Previously Shown:  {0:G}\r\n", programme.PreviouslyShown);
-            builder.AppendFormat("Copyright Date:    {0:G}\r\n", programme.CopyrightDate);
-            builder.AppendFormat("Is Repeat:         {0}\r\n", programme.IsPreviouslyShown);
-            builder.AppendFormat("Icon:              {0}\r\n", programme.Icon != null ? programme.Icon.ToString() : string.Empty);
-            builder.AppendLine("-------------------------------------------------------");
-            return builder.ToString();
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
-      <Project>{0d023565-5942-4d79-9098-a1b4b6665a40}</Project>
-      <Name>Emby.XmlTv</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-
-</Project>

Emby.XmlTv/Emby.XmlTv.Console/Program.cs

@@ -1,103 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Emby.XmlTv.Classes;
-using Emby.XmlTv.Console.Classes;
-using Emby.XmlTv.Entities;
-
-namespace Emby.XmlTv.Console
-{
-    public class Program
-    {
-        static void Main(string[] args)
-        {
-            var filename = @"C:\Temp\QLD.GoldCoast.xml";
-
-            if (args.Length == 1 && File.Exists(args[0]))
-            {
-                filename = args[0];
-            }
-
-            var timer = Stopwatch.StartNew();
-            System.Console.WriteLine("Running XMLTv Parsing");
-
-            var resultsFile = String.Format("C:\\Temp\\{0}_Results_{1:HHmmss}.txt",
-                Path.GetFileNameWithoutExtension(filename),
-                DateTimeOffset.UtcNow);
-
-            System.Console.Write("Enter the language required: ");
-            var lang = System.Console.ReadLine();
-
-            ReadSourceXmlTvFile(filename, resultsFile, lang).Wait();
-
-            System.Console.WriteLine("Completed in {0:g} - press any key to open the file...", timer.Elapsed);
-            System.Console.ReadKey();
-
-            Process.Start(resultsFile);
-        }
-
-        public static async Task ReadSourceXmlTvFile(string filename, string resultsFile, string lang)
-        {
-            System.Console.WriteLine("Writing to file: {0}", resultsFile);
-
-            using (var resultsFileStream = new StreamWriter(resultsFile) { AutoFlush = true })
-            {
-                var reader = new XmlTvReader(filename, lang);
-                await ReadOutChannels(reader, resultsFileStream);
-
-                resultsFileStream.Close();
-            }
-        }
-
-        public static async Task ReadOutChannels(XmlTvReader reader, StreamWriter resultsFileStream)
-        {
-            var channels = reader.GetChannels().Distinct().ToList();
-
-            resultsFileStream.Write(EntityExtensions.GetHeader("Channels"));
-
-            foreach (var channel in channels)
-            {
-                System.Console.WriteLine("Retrieved Channel: {0} - {1}", channel.Id, channel.DisplayName);
-                resultsFileStream.Write(channel.GetChannelDetail());
-            }
-
-            var totalProgrammeCount = 0;
-
-            resultsFileStream.Write("\r\n");
-            foreach (var channel in channels)
-            {
-                System.Console.WriteLine("Processing Channel: {0}", channel.DisplayName);
-
-                resultsFileStream.Write(EntityExtensions.GetHeader("Programs for " + channel.DisplayName));
-                var channelProgrammeCount = await ReadOutChannelProgrammes(reader, channel, resultsFileStream);
-
-                totalProgrammeCount += channelProgrammeCount;
-                await resultsFileStream.WriteLineAsync(String.Format("Total Programmes for {1}: {0}", channelProgrammeCount, channel.DisplayName));
-            }
-
-            await resultsFileStream.WriteLineAsync(String.Format("Total Programmes: {0}", totalProgrammeCount));
-        }
-
-        private static async Task<int> ReadOutChannelProgrammes(XmlTvReader reader, XmlTvChannel channel, StreamWriter resultsFileStream)
-        {
-            //var startDate = new DateTime(2015, 11, 28);
-            //var endDate = new DateTime(2015, 11, 29);
-            var startDate = DateTimeOffset.MinValue;
-            var endDate = DateTimeOffset.MaxValue;
-
-            var count = 0;
-
-            foreach (var programme in reader.GetProgrammes(channel.Id, startDate, endDate, new CancellationToken()).Distinct())
-            {
-                count++;
-                await resultsFileStream.WriteLineAsync(programme.GetProgrammeDetail(channel));
-            }
-
-            return count;
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Emby.XmlTv.Console")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Emby.XmlTv.Console")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("add1d993-6d74-480a-b1fc-7fd9fd05a769")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C8298223-2468-466C-9B06-FBF61926CECB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Emby.XmlTv.Test</RootNamespace>
-    <AssemblyName>Emby.XmlTv.Test</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <Compile Include="XmlTvReaderDateTimeTests.cs" />
-    <Compile Include="XmlTvReaderLanguageTests.cs" />
-    <Compile Include="XmlTvReaderTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Xml Files\epg.xml" />
-    <Content Include="Xml Files\ES_MultiLanguageData.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Xml Files\honeybee.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Xml Files\MultilanguageData.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Xml Files\UK_Data.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
-      <Project>{0D023565-5942-4D79-9098-A1B4B6665A40}</Project>
-      <Name>Emby.XmlTv</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-</Project>

Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Emby.XmlTv.Test")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Emby.XmlTv.Test")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("c8298223-2468-466c-9b06-fbf61926cecb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs

@@ -1,91 +0,0 @@
-using System;
-using System.IO;
-
-using Emby.XmlTv.Classes;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Emby.XmlTv.Test
-{
-    [TestClass]
-    public class XmlTvReaderDateTimeTests
-    {
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_HandlePartDates()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, "es");
-
-            Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("2016"));
-            Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("201601"));
-            Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("20160101"));
-            Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("2016010112"));
-            Assert.AreEqual(Parse("01 Jan 2016 12:34:00"), reader.ParseDate("201601011234"));
-            Assert.AreEqual(Parse("01 Jan 2016 12:34:56"), reader.ParseDate("20160101123456"));
-        }
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_HandleDateWithOffset()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, "es");
-
-            // parse variations on 1:00AM
-            Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +0000"));
-            Assert.AreEqual(Parse("01 Jan 2016 02:00:00"), reader.ParseDate("20160101120000 +1000"));
-            Assert.AreEqual(Parse("01 Jan 2016 11:00:00"), reader.ParseDate("20160101120000 +0100"));
-            Assert.AreEqual(Parse("01 Jan 2016 11:50:00"), reader.ParseDate("20160101120000 +0010"));
-            Assert.AreEqual(Parse("01 Jan 2016 11:59:00"), reader.ParseDate("20160101120000 +0001"));
-
-            Assert.AreEqual(Parse("01 Jan 2016 22:00:00"), reader.ParseDate("20160101120000 -1000"));
-            Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("20160101120000 -0100"));
-            Assert.AreEqual(Parse("01 Jan 2016 12:10:00"), reader.ParseDate("20160101120000 -0010"));
-            Assert.AreEqual(Parse("01 Jan 2016 12:01:00"), reader.ParseDate("20160101120000 -0001"));
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_HandlePartDatesWithOffset()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, "es");
-
-            Assert.AreEqual(Parse("01 Jan 2016 01:00:00"), reader.ParseDate("2016 -0100"));
-            Assert.AreEqual(Parse("01 Jan 2016 01:00:00"), reader.ParseDate("201601 -0100"));
-            Assert.AreEqual(Parse("01 Jan 2016 01:00:00"), reader.ParseDate("20160101 -0100"));
-            Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("2016010112 -0100"));
-            Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("201601011200 -0100"));
-            Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("20160101120000 -0100"));
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_HandleSpaces()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, "es");
-
-            // parse variations on 1:00AM
-            Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +000"));
-            Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +00"));
-            Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +0"));
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_HandleSpaces2()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, "es");
-
-            // parse variations on 1:00AM
-            Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 0"));
-        }
-
-        private DateTimeOffset Parse(string value)
-        {
-            return new DateTimeOffset(DateTimeOffset.Parse(value).Ticks, TimeSpan.Zero);
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs

@@ -1,181 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-
-using Emby.XmlTv.Classes;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Emby.XmlTv.Test
-{
-    [TestClass]
-    public class XmlTvReaderLanguageTests
-    {
-        /* <title lang="es">Homes Under the Hammer - Spanish</title>
-         * <title lang="es">Homes Under the Hammer - Spanish 2</title>
-         * <title lang="en">Homes Under the Hammer - English</title>
-         * <title lang="en">Homes Under the Hammer - English 2</title>
-         * <title lang="">Homes Under the Hammer - Empty Language</title>
-         * <title lang="">Homes Under the Hammer - Empty Language 2</title>
-         * <title>Homes Under the Hammer - No Language</title>
-         * <title>Homes Under the Hammer - No Language 2</title>
-         */
-
-        /* Expected Behaviour:
-         *  - Language = Null   Homes Under the Hammer - No Language
-         *  - Language = ""     Homes Under the Hammer - No Language
-         *  - Language = es     Homes Under the Hammer - Spanish
-         *  - Language = en     Homes Under the Hammer - English
-         */
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_Return_The_First_Matching_Language_ES()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, "es");
-            var channel = reader.GetChannels().FirstOrDefault();
-            Assert.IsNotNull(channel);
-
-            var startDate = new DateTime(2015, 11, 26);
-            var cancellationToken = new CancellationToken();
-            var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault();
-
-            Assert.IsNotNull(programme);
-            Assert.AreEqual("Homes Under the Hammer - Spanish", programme.Title);
-            Assert.AreEqual(1, programme.Categories.Count);
-            Assert.AreEqual("Property - Spanish", programme.Categories[0]);
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_Return_The_First_Matching_Language_EN()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, "en");
-
-            var channel = reader.GetChannels().FirstOrDefault();
-            Assert.IsNotNull(channel);
-
-            var startDate = new DateTime(2015, 11, 26);
-            var cancellationToken = new CancellationToken();
-            var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault();
-
-            Assert.IsNotNull(programme);
-            Assert.AreEqual("Homes Under the Hammer - English", programme.Title);
-            Assert.AreEqual(1, programme.Categories.Count);
-            Assert.AreEqual("Property - English", programme.Categories[0]);
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_Return_The_First_Matching_With_No_Language()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, null);
-
-            var channel = reader.GetChannels().FirstOrDefault();
-            Assert.IsNotNull(channel);
-
-            var startDate = new DateTime(2015, 11, 26);
-            var cancellationToken = new CancellationToken();
-            var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault();
-
-            Assert.IsNotNull(programme);
-            Assert.AreEqual("Homes Under the Hammer - No Language", programme.Title);
-            Assert.AreEqual(1, programme.Categories.Count);
-            Assert.AreEqual("Property - No Language", programme.Categories[0]);
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_Return_The_First_Matching_With_Empty_Language()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, String.Empty);
-
-            var channel = reader.GetChannels().FirstOrDefault();
-            Assert.IsNotNull(channel);
-
-            var startDate = new DateTime(2015, 11, 26);
-            var cancellationToken = new CancellationToken();
-            var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault();
-
-            Assert.IsNotNull(programme);
-            Assert.AreEqual("Homes Under the Hammer - Empty Language", programme.Title);
-            Assert.AreEqual(1, programme.Categories.Count);
-            Assert.AreEqual("Property - Empty Language", programme.Categories[0]);
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_Return_The_First_When_NoMatchFound()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, "es"); // There are no titles or categories for spanish
-
-            var channel = reader.GetChannels().FirstOrDefault();
-            Assert.IsNotNull(channel);
-
-            var startDate = new DateTime(2015, 11, 26);
-            var cancellationToken = new CancellationToken();
-            var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).Skip(1).FirstOrDefault();
-
-            Assert.IsNotNull(programme);
-            Assert.AreEqual("Homes Under the Hammer - English", programme.Title);
-
-            // Should return all categories
-            Assert.AreEqual(2, programme.Categories.Count);
-            Assert.IsTrue(programme.Categories.Contains("Property - English"));
-            Assert.IsTrue(programme.Categories.Contains("Property - Empty Language"));
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_Return_The_First_When_NoLanguage()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile, null);
-
-            var channel = reader.GetChannels().FirstOrDefault();
-            Assert.IsNotNull(channel);
-
-            var startDate = new DateTime(2015, 11, 26);
-            var cancellationToken = new CancellationToken();
-            var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).Skip(1).FirstOrDefault();
-
-            Assert.IsNotNull(programme);
-            Assert.AreEqual("Homes Under the Hammer - English", programme.Title); // Should return the first in the list
-
-            // Should return all categories
-            Assert.AreEqual(2, programme.Categories.Count);
-            Assert.IsTrue(programme.Categories.Contains("Property - English"));
-            Assert.IsTrue(programme.Categories.Contains("Property - Empty Language"));
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\MultilanguageData.xml")]
-        public void Should_Return_All_Languages()
-        {
-            var testFile = Path.GetFullPath(@"MultilanguageData.xml");
-            var reader = new XmlTvReader(testFile);
-            var cancellationToken = new CancellationToken();
-
-            var results = reader.GetLanguages(cancellationToken);
-            Assert.IsNotNull(results);
-
-            foreach (var result in results)
-            {
-                Console.WriteLine("{0} - {1}", result.Name, result.Relevance);
-            }
-
-            Assert.AreEqual(2, results.Count);
-            Assert.AreEqual("en", results[0].Name);
-            Assert.AreEqual(11, results[0].Relevance);
-            Assert.AreEqual("es", results[1].Name);
-            Assert.AreEqual(3, results[1].Relevance);
-        }
-
-    }
-}

Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs

@@ -1,219 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-
-using Emby.XmlTv.Classes;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Emby.XmlTv.Test
-{
-    [TestClass]
-    public class XmlTvReaderTests
-    {
-        [TestMethod]
-        [DeploymentItem("Xml Files\\UK_Data.xml")]
-        public void UK_DataTest_ChannelsTest()
-        {
-            var testFile = Path.GetFullPath(@"UK_Data.xml");
-            var reader = new XmlTvReader(testFile);
-
-            var channels = reader.GetChannels().ToList();
-            Assert.AreEqual(5, channels.Count);
-
-            // Check each channel
-            var channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2667");
-            Assert.IsNotNull(channel);
-            Assert.AreEqual("BBC1 HD", channel.DisplayName);
-            Assert.AreEqual("7.1", channel.Number);
-            Assert.IsNotNull(channel.Icon);
-            Assert.AreEqual("Logo_UK_RT_2667", channel.Icon.Source);
-            Assert.AreEqual(100, channel.Icon.Width);
-            Assert.AreEqual(200, channel.Icon.Height);
-
-            channel = channels.SingleOrDefault(c => c.Id == "UK_RT_105");
-            Assert.IsNotNull(channel);
-            Assert.AreEqual("BBC2", channel.DisplayName);
-            Assert.IsNotNull(channel.Icon);
-            Assert.AreEqual("Logo_UK_RT_105", channel.Icon.Source);
-            Assert.IsFalse(channel.Icon.Width.HasValue);
-            Assert.IsFalse(channel.Icon.Height.HasValue);
-
-            channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2118");
-            Assert.IsNotNull(channel);
-            Assert.AreEqual("ITV1 HD", channel.DisplayName);
-            Assert.IsNotNull(channel.Icon);
-            Assert.AreEqual("Logo_UK_RT_2118", channel.Icon.Source);
-            Assert.AreEqual(100, channel.Icon.Width);
-            Assert.IsFalse(channel.Icon.Height.HasValue);
-
-            channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2056");
-            Assert.IsNotNull(channel);
-            Assert.AreEqual("Channel 4 HD", channel.DisplayName);
-            Assert.IsNotNull(channel.Icon);
-            Assert.AreEqual("Logo_UK_RT_2056", channel.Icon.Source);
-            Assert.IsFalse(channel.Icon.Width.HasValue);
-            Assert.AreEqual(200, channel.Icon.Height);
-
-            channel = channels.SingleOrDefault(c => c.Id == "UK_RT_134");
-            Assert.IsNotNull(channel);
-            Assert.AreEqual("Channel 5", channel.DisplayName);
-            Assert.IsNull(channel.Icon);
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\UK_Data.xml")]
-        public void UK_DataTest_GeneralTest()
-        {
-            var testFile = Path.GetFullPath(@"UK_Data.xml");
-            var reader = new XmlTvReader(testFile, null);
-
-            var channels = reader.GetChannels().ToList();
-            Assert.AreEqual(5, channels.Count);
-
-            // Pick a channel to check the data for
-            var channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2056");
-            Assert.IsNotNull(channel);
-
-            var startDate = new DateTime(2015, 11, 26);
-            var cancellationToken = new CancellationToken();
-            var programmes = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).ToList();
-
-            Assert.AreEqual(27, programmes.Count);
-            var programme = programmes.SingleOrDefault(p => p.Title == "The Secret Life of");
-
-            Assert.IsNotNull(programme);
-            Assert.AreEqual(new DateTime(2015, 11, 26, 20, 0, 0), programme.StartDate);
-            Assert.AreEqual(new DateTime(2015, 11, 26, 21, 0, 0), programme.EndDate);
-            Assert.AreEqual("Cameras follow the youngsters' development after two weeks apart and time has made the heart grow fonder for Alfie and Emily, who are clearly happy to be back together. And although Alfie struggled to empathise with the rest of his peers before, a painting competition proves to be a turning point for him. George takes the children's rejection of his family recipe to heart, but goes on to triumph elsewhere, and romance is in the air when newcomer Sienna captures Arthur's heart.", programme.Description);
-            Assert.AreEqual("Documentary", programme.Categories.Single());
-            Assert.IsNotNull(programme.Episode);
-            Assert.AreEqual("The Secret Life of 5 Year Olds", programme.Episode.Title);
-            Assert.AreEqual(1, programme.Episode.Series);
-            Assert.IsNull(programme.Episode.SeriesCount);
-            Assert.AreEqual(4, programme.Episode.Episode);
-            Assert.AreEqual(6, programme.Episode.EpisodeCount);
-            Assert.IsNotNull(programme.Premiere);
-            //Assert.AreEqual("First showing on national terrestrial TV", programme.Premiere.Details);
-            Assert.IsTrue(programme.IsNew);
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\UK_Data.xml")]
-        public void UK_DataTest_MultipleTitles_SameLanguage_Should_ReturnFirstValue()
-        {
-            var testFile = Path.GetFullPath(@"UK_Data.xml");
-            var reader = new XmlTvReader(testFile, null);
-
-            /*
-                <title lang="en">Homes Under the Hammer - Title 1</title>
-                <title lang="en">Homes Under the Hammer - Title 2</title>
-                <title lang="en">Homes Under the Hammer - Title 3</title>
-            */
-
-            var startDate = new DateTime(2015, 11, 26);
-            var cancellationToken = new CancellationToken();
-            var programmes = reader.GetProgrammes("UK_RT_2667", startDate, startDate.AddDays(1), cancellationToken).ToList();
-            var programme = programmes.SingleOrDefault(p => p.Title == "Homes Under the Hammer - Title 1");
-
-            Assert.IsNotNull(programme);
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\UK_Data.xml")]
-        public void UK_DataTest_MultipleTitles_NoLanguage_Should_ReturnFirstValue()
-        {
-            var testFile = Path.GetFullPath(@"UK_Data.xml");
-            var reader = new XmlTvReader(testFile, null);
-
-            /*
-                <title>Oxford Street Revealed - Title 1</title>
-                <title>Oxford Street Revealed - Title 2</title>
-                <title>Oxford Street Revealed - Title 3</title>
-            */
-
-            var startDate = new DateTime(2015, 11, 26);
-            var cancellationToken = new CancellationToken();
-            var programmes = reader.GetProgrammes("UK_RT_2667", startDate, startDate.AddDays(1), cancellationToken).ToList();
-            var programme = programmes.SingleOrDefault(p => p.Title == "Oxford Street Revealed - Title 1");
-
-            Assert.IsNotNull(programme);
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\ES_MultiLanguageData.xml")]
-        public void ES_MultiLanguageDataTest()
-        {
-            var testFile = Path.GetFullPath(@"ES_MultiLanguageData.xml");
-            var reader = new XmlTvReader(testFile, "es"); // Specify the spanish language explicitly
-
-            var channels = reader.GetChannels().ToList();
-            Assert.AreEqual(141, channels.Count);
-
-            // Pick a channel to check the data for
-            var channel = channels.SingleOrDefault(c => c.Id == "Canal + HD" && c.DisplayName == "Canal + HD");
-            Assert.IsNotNull(channel);
-
-            var startDate = new DateTime(2016, 02, 18);
-            var cancellationToken = new CancellationToken();
-            var programmes = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).ToList();
-
-            Assert.AreEqual(22, programmes.Count);
-            var programme = programmes.SingleOrDefault(p => p.Title == "This is Comedy. Judd Apatow & Co.");
-
-            /*
-            <programme start="20160218055100 +0100" stop="20160218065400 +0100" channel="Canal + HD">
-                <title lang="es">This is Comedy. Judd Apatow &amp; Co.</title>
-                <title lang="en">This is Comedy</title>
-                <desc lang="es">El resurgir creativo de la comedia estadounidense en los últimos 15 años ha tenido un nombre indiscutible, Judd Apatow, y unos colaboradores indispensables, sus amigos (actores, cómicos, escritores) Jonah Hill, Steve Carrell, Paul Rudd, Seth Rogen, Lena Dunham... A través de extractos de sus filmes y de entrevistas a algunos los miembros de su 'banda' (Adam Sandler, Lena Dunham o Jason Segel), este documental muestra la carrera de un productor y director excepcional que ha sido capaz de llevar la risa a su máxima expresión</desc>
-                <credits>
-                  <director>Jacky Goldberg</director>
-                </credits>
-                <date>2014</date>
-                <category lang="es">Documentales</category>
-                <category lang="es">Sociedad</category>
-                <icon src="http://www.plus.es/recorte/n/caratula4/F3027798" />
-                <country>Francia</country>
-                <rating system="MPAA">
-                  <value>TV-G</value>
-                </rating>
-                <star-rating>
-                  <value>3/5</value>
-                </star-rating>
-            </programme>
-            */
-
-            Assert.IsNotNull(programme);
-            Assert.AreEqual(new DateTime(2016, 02, 18, 4, 51, 0), programme.StartDate);
-            Assert.AreEqual(new DateTime(2016, 02, 18, 5, 54, 0), programme.EndDate);
-            Assert.AreEqual("El resurgir creativo de la comedia estadounidense en los últimos 15 años ha tenido un nombre indiscutible, Judd Apatow, y unos colaboradores indispensables, sus amigos (actores, cómicos, escritores) Jonah Hill, Steve Carrell, Paul Rudd, Seth Rogen, Lena Dunham... A través de extractos de sus filmes y de entrevistas a algunos los miembros de su 'banda' (Adam Sandler, Lena Dunham o Jason Segel), este documental muestra la carrera de un productor y director excepcional que ha sido capaz de llevar la risa a su máxima expresión", programme.Description);
-            Assert.AreEqual(2, programme.Categories.Count);
-            Assert.AreEqual("Documentales", programme.Categories[0]);
-            Assert.AreEqual("Sociedad", programme.Categories[1]);
-            Assert.IsNotNull(programme.Episode);
-            Assert.IsNull(programme.Episode.Episode);
-            Assert.IsNull(programme.Episode.EpisodeCount);
-            Assert.IsNull(programme.Episode.Part);
-            Assert.IsNull(programme.Episode.PartCount);
-            Assert.IsNull(programme.Episode.Series);
-            Assert.IsNull(programme.Episode.SeriesCount);
-            Assert.IsNull(programme.Episode.Title);
-        }
-
-        [TestMethod]
-        [DeploymentItem("Xml Files\\honeybee.xml")]
-        public void HoneybeeTest()
-        {
-            var testFile = Path.GetFullPath(@"honeybee.xml");
-            var reader = new XmlTvReader(testFile, null);
-
-            var channels = reader.GetChannels().ToList();
-            Assert.AreEqual(16, channels.Count);
-
-            var programs = reader.GetProgrammes("2013.honeybee.it", DateTime.UtcNow.AddYears(-1),
-                DateTime.UtcNow.AddYears(1), CancellationToken.None).ToList();
-            Assert.AreEqual(297, programs.Count);
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv.sln

@@ -1,44 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.XmlTv.Console", "Emby.XmlTv.Console\Emby.XmlTv.Console.csproj", "{ADD1D993-6D74-480A-B1FC-7FD9FD05A769}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.XmlTv", "Emby.XmlTv\Emby.XmlTv.csproj", "{0D023565-5942-4D79-9098-A1B4B6665A40}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{BB0FD191-A9D0-4CC9-A79E-ECBCF1275268}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{E9F625D5-979E-48E8-9987-F4BCADD79A41}"
-	ProjectSection(SolutionItems) = preProject
-		Nuget\Emby.XmlTv.nuspec = Nuget\Emby.XmlTv.nuspec
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D023565-5942-4D79-9098-A1B4B6665A40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D023565-5942-4D79-9098-A1B4B6665A40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D023565-5942-4D79-9098-A1B4B6665A40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D023565-5942-4D79-9098-A1B4B6665A40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C8298223-2468-466C-9B06-FBF61926CECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8298223-2468-466C-9B06-FBF61926CECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8298223-2468-466C-9B06-FBF61926CECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C8298223-2468-466C-9B06-FBF61926CECB}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs

@@ -1,1107 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Xml;
-using Emby.XmlTv.Entities;
-
-namespace Emby.XmlTv.Classes
-{
-    // Reads an XmlTv file
-    public class XmlTvReader
-    {
-        private readonly string _fileName;
-        private readonly string _language;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XmlTvReader" /> class.
-        /// </summary>
-        /// <param name="fileName">Name of the file.</param>
-        /// <param name="language">The specific language to return.</param>
-        public XmlTvReader(string fileName, string language = null)
-        {
-            _fileName = fileName;
-
-            // Normalize null/string.empty
-            if (string.IsNullOrWhiteSpace(language))
-            {
-                language = null;
-            }
-            _language = language;
-        }
-
-        private static XmlReader CreateXmlTextReader(string path)
-        {
-            var settings = new XmlReaderSettings();
-
-            // https://msdn.microsoft.com/en-us/library/system.xml.xmlreadersettings.xmlresolver(v=vs.110).aspx
-            // Looks like we don't need this anyway?
-            // Starting with the .NET Framework 4.5.2, this setting has a default value of null.
-            //settings.XmlResolver = null;
-
-            settings.DtdProcessing = DtdProcessing.Ignore;
-
-            settings.CheckCharacters = false;
-            settings.IgnoreProcessingInstructions = true;
-            settings.IgnoreComments = true;
-            //settings.ValidationType = ValidationType.None;
-
-            return XmlReader.Create(path, settings);
-        }
-
-        /// <summary>
-        /// Gets the list of channels present in the XML
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<XmlTvChannel> GetChannels()
-        {
-            var list = new List<XmlTvChannel>();
-
-            using (var reader = CreateXmlTextReader(_fileName))
-            {
-                if (reader.ReadToDescendant("tv"))
-                {
-                    if (reader.ReadToDescendant("channel"))
-                    {
-                        do
-                        {
-                            var channel = GetChannel(reader);
-                            if (channel != null)
-                            {
-                                list.Add(channel);
-                            }
-                        }
-                        while (reader.ReadToFollowing("channel"));
-                    }
-                }
-            }
-
-            return list;
-        }
-
-        private XmlTvChannel GetChannel(XmlReader reader)
-        {
-            var id = reader.GetAttribute("id");
-
-            if (string.IsNullOrEmpty(id))
-            {
-                // LogError("No id found for channel row");
-                // Log.Error("  channel#{0} doesnt contain an id", iChannel);
-                return null;
-            }
-
-            var result = new XmlTvChannel() { Id = id };
-
-            using (var xmlChannel = reader.ReadSubtree())
-            {
-                xmlChannel.MoveToContent();
-                xmlChannel.Read();
-
-                // Read out the data for each node and process individually
-                while (!xmlChannel.EOF && xmlChannel.ReadState == ReadState.Interactive)
-                {
-                    if (xmlChannel.NodeType == XmlNodeType.Element)
-                    {
-                        switch (xmlChannel.Name)
-                        {
-                            case "display-name":
-                                ProcessNode(xmlChannel, s => result.DisplayName = s, _language, s => SetChannelNumber(result, s));
-                                break;
-                            case "url":
-                                result.Url = xmlChannel.ReadElementContentAsString();
-                                break;
-                            case "icon":
-                                result.Icon = ProcessIconNode(xmlChannel);
-                                xmlChannel.Skip();
-                                break;
-                            default:
-                                xmlChannel.Skip(); // unknown, skip entire node
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        xmlChannel.Read();
-                    }
-                }
-            }
-
-            if (string.IsNullOrEmpty(result.DisplayName))
-            {
-                // LogError("No display-name found for channel {0}", id);
-                return null;
-            }
-
-            return result;
-        }
-
-        private void SetChannelNumber(XmlTvChannel channel, string value)
-        {
-            value = value.Replace("-", ".");
-            if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var number))
-            {
-                channel.Number = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the programmes for a specified channel
-        /// </summary>
-        /// <param name="channelId">The channel id.</param>
-        /// <param name="startDateUtc">The UTC start date.</param>
-        /// <param name="endDateUtc">The UTC end date.</param>
-        /// <param name="cancellationToken">A cancellation token.</param>
-        /// <returns></returns>
-        public IEnumerable<XmlTvProgram> GetProgrammes(
-                    string channelId,
-                    DateTimeOffset startDateUtc,
-                    DateTimeOffset endDateUtc,
-                    CancellationToken cancellationToken)
-        {
-            var list = new List<XmlTvProgram>();
-
-            using (var reader = CreateXmlTextReader(_fileName))
-            {
-                if (reader.ReadToDescendant("tv"))
-                {
-                    if (reader.ReadToDescendant("programme"))
-                    {
-                        do
-                        {
-                            if (cancellationToken.IsCancellationRequested)
-                            {
-                                continue; // Break out
-                            }
-
-                            var programme = GetProgramme(reader, channelId, startDateUtc, endDateUtc);
-                            if (programme != null)
-                            {
-                                list.Add(programme);
-                            }
-                        }
-                        while (reader.ReadToFollowing("programme"));
-                    }
-                }
-            }
-
-            return list;
-        }
-
-        public XmlTvProgram GetProgramme(XmlReader reader, string channelId, DateTimeOffset startDateUtc, DateTimeOffset endDateUtc)
-        {
-            var result = new XmlTvProgram();
-
-            PopulateHeader(reader, result);
-
-            using (var xmlProg = reader.ReadSubtree())
-            {
-                // First up, validate that this is the correct channel, and programme is within the time we are expecting
-                if (!string.Equals(result.ChannelId, channelId, StringComparison.OrdinalIgnoreCase))
-                {
-                    return null;
-                }
-
-                if (result.EndDate < startDateUtc || result.StartDate >= endDateUtc)
-                {
-                    return null;
-                }
-
-                xmlProg.MoveToContent();
-                xmlProg.Read();
-
-                // Loop through each element
-                while (!xmlProg.EOF && xmlProg.ReadState == ReadState.Interactive)
-                {
-                    if (xmlProg.NodeType == XmlNodeType.Element)
-                    {
-                        switch (xmlProg.Name)
-                        {
-                            case "title":
-                                ProcessTitleNode(xmlProg, result);
-                                break;
-                            case "category":
-                                ProcessCategory(xmlProg, result);
-                                break;
-                            case "country":
-                                ProcessCountry(xmlProg, result);
-                                break;
-                            case "desc":
-                                ProcessDescription(xmlProg, result);
-                                break;
-                            case "sub-title":
-                                ProcessSubTitle(xmlProg, result);
-                                break;
-                            case "new":
-                                ProcessNew(xmlProg, result);
-                                break;
-                            case "previously-shown":
-                                ProcessPreviouslyShown(xmlProg, result);
-                                break;
-                            case "quality":
-                                ProcessQuality(xmlProg, result);
-                                break;
-                            case "episode-num":
-                                ProcessEpisodeNum(xmlProg, result);
-                                break;
-                            case "date": // Copyright date
-                                ProcessCopyrightDate(xmlProg, result);
-                                break;
-                            case "star-rating": // Community Rating
-                                ProcessStarRating(xmlProg, result);
-                                break;
-                            case "rating": // Certification Rating
-                                ProcessRating(xmlProg, result);
-                                break;
-                            case "credits":
-                                if (xmlProg.IsEmptyElement)
-                                {
-                                    xmlProg.Skip();
-                                }
-                                else
-                                {
-                                    using (var subtree = xmlProg.ReadSubtree())
-                                    {
-                                        ProcessCredits(subtree, result);
-                                    }
-                                }
-                                break;
-                            case "icon":
-                                result.Icon = ProcessIconNode(xmlProg);
-                                xmlProg.Skip();
-                                break;
-                            case "premiere":
-                                result.Premiere = new XmlTvPremiere();
-                                // This was causing data after the premiere node to not be read. Reactivate this and debug if the premiere details are ever needed.
-                                //ProcessPremiereNode(xmlProg, result);
-                                xmlProg.Skip();
-                                break;
-                            default:
-                                // unknown, skip entire node
-                                xmlProg.Skip();
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        xmlProg.Read();
-                    }
-                }
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Gets the list of supported languages in the XML
-        /// </summary>
-        /// <returns></returns>
-        public List<XmlTvLanguage> GetLanguages(CancellationToken cancellationToken)
-        {
-            var results = new Dictionary<string, int>();
-
-            //Loop through and parse out all elements and then lang= attributes
-            //logger.LogInformation("Loading file {0}", _fileName);
-            using (var reader = CreateXmlTextReader(_fileName))
-            {
-                while (reader.Read())
-                {
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        continue; // Break out
-                    }
-
-                    if (reader.NodeType == XmlNodeType.Element)
-                    {
-                        var language = reader.GetAttribute("lang");
-                        if (!string.IsNullOrEmpty(language))
-                        {
-                            if (!results.ContainsKey(language))
-                            {
-                                results[language] = 0;
-                            }
-                            results[language]++;
-                        }
-                    }
-                }
-            }
-
-            return
-                results.Keys.Select(k => new XmlTvLanguage() { Name = k, Relevance = results[k] })
-                    .OrderByDescending(l => l.Relevance)
-                    .ToList();
-        }
-
-        private void ProcessCopyrightDate(XmlReader xmlProg, XmlTvProgram result)
-        {
-            var startValue = xmlProg.ReadElementContentAsString();
-            if (string.IsNullOrEmpty(startValue))
-            {
-                // Log.Error("  programme#{0} doesnt contain a start date", iChannel);
-                result.CopyrightDate = null;
-            }
-            else
-            {
-                var copyrightDate = ParseDate(startValue);
-                if (copyrightDate != null)
-                {
-                    result.CopyrightDate = copyrightDate;
-                }
-            }
-        }
-
-        public void ProcessCredits(XmlReader creditsXml, XmlTvProgram result)
-        {
-            creditsXml.MoveToContent();
-            creditsXml.Read();
-
-            // Loop through each element
-            while (!creditsXml.EOF && creditsXml.ReadState == ReadState.Interactive)
-            {
-                if (creditsXml.NodeType == XmlNodeType.Element)
-                {
-                    XmlTvCredit credit = null;
-                    switch (creditsXml.Name)
-                    {
-                        case "director":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Director };
-                            break;
-                        case "actor":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Actor };
-                            break;
-                        case "writer":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Writer };
-                            break;
-                        case "adapter":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Adapter };
-                            break;
-                        case "producer":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Producer };
-                            break;
-                        case "composer":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Composer };
-                            break;
-                        case "editor":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Editor };
-                            break;
-                        case "presenter":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Presenter };
-                            break;
-                        case "commentator":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Commentator };
-                            break;
-                        case "guest":
-                            credit = new XmlTvCredit() { Type = XmlTvCreditType.Guest };
-                            break;
-                    }
-
-                    if (credit != null)
-                    {
-                        credit.Name = creditsXml.ReadElementContentAsString();
-                        result.Credits.Add(credit);
-                    }
-                    else
-                    {
-                        creditsXml.Skip();
-                    }
-                }
-                else
-                    creditsXml.Read();
-            }
-        }
-
-        public void ProcessStarRating(XmlReader reader, XmlTvProgram result)
-        {
-            /*
-             <star-rating>
-              <value>3/3</value>
-            </star-rating>
-            */
-
-            reader.ReadToDescendant("value");
-            if (reader.Name == "value")
-            {
-                var textValue = reader.ReadElementContentAsString();
-                if (textValue.Contains("/"))
-                {
-                    var components = textValue.Split('/');
-                    if (float.TryParse(components[0], out var value))
-                    {
-                        result.StarRating = value;
-                    }
-                }
-            }
-            else
-            {
-                reader.Skip();
-            }
-        }
-
-        public void ProcessRating(XmlReader reader, XmlTvProgram result)
-        {
-            /*
-            <rating system="MPAA">
-                <value>TV-G</value>
-            </rating>
-            */
-
-            var system = reader.GetAttribute("system");
-
-            reader.ReadToDescendant("value");
-            if (reader.Name == "value")
-            {
-                result.Rating = new XmlTvRating()
-                {
-                    System = system,
-                    Value = reader.ReadElementContentAsString()
-                };
-            }
-            else
-            {
-                reader.Skip();
-            }
-        }
-
-        public void ProcessEpisodeNum(XmlReader reader, XmlTvProgram result)
-        {
-            /*
-            <episode-num system="dd_progid">EP00003026.0666</episode-num>
-            <episode-num system="onscreen">2706</episode-num>
-            <episode-num system="xmltv_ns">.26/0.</episode-num>
-            */
-
-            var episodeSystem = reader.GetAttribute("system");
-            switch (episodeSystem)
-            {
-                case "dd_progid":
-                    ParseEpisodeDataForProgramId(reader, result);
-                    break;
-                case "icetv":
-                    result.ProviderIds["icetv"] = reader.ReadElementContentAsString();
-                    break;
-                case "xmltv_ns":
-                    ParseEpisodeDataForXmlTvNs(reader, result);
-                    break;
-                case "onscreen":
-                    ParseEpisodeDataForOnScreen(reader, result);
-                    break;
-                case "thetvdb.com":
-                    ParseTvdbSystem(reader, result);
-                    break;
-                case "imdb.com":
-                    ParseImdbSystem(reader, result);
-                    break;
-                case "themoviedb.org":
-                    ParseMovieDbSystem(reader, result);
-                    break;
-                case "SxxExx":
-                    ParseSxxExxSystem(reader, result);
-                    break;
-                default: // Handles empty string and nulls
-                    reader.Skip();
-                    break;
-            }
-        }
-
-        public void ParseSxxExxSystem(XmlReader reader, XmlTvProgram result)
-        {
-            // <episode-num system="SxxExx">S012E32</episode-num>
-
-            var value = reader.ReadElementContentAsString();
-            var res = Regex.Match(value, "s([0-9]+)e([0-9]+)", RegexOptions.IgnoreCase);
-
-            if (res.Success)
-            {
-                int parsedInt;
-
-                if (int.TryParse(res.Groups[1].Value, out parsedInt))
-                {
-                    result.Episode.Series = parsedInt;
-                }
-
-                if (int.TryParse(res.Groups[2].Value, out parsedInt))
-                {
-                    result.Episode.Episode = parsedInt;
-                }   
-            }
-        }
-
-        public void ParseMovieDbSystem(XmlReader reader, XmlTvProgram result)
-        {
-            // <episode-num system="thetvdb.com">series/248841</episode-num>
-            // <episode-num system="thetvdb.com">episode/4749206</episode-num>
-
-            var value = reader.ReadElementContentAsString();
-            var parts = value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
-
-            if (string.Equals(parts[0], "series", StringComparison.OrdinalIgnoreCase))
-            {
-                result.SeriesProviderIds["tmdb"] = parts[1];
-            }
-
-            else if (parts.Length == 1 || string.Equals(parts[0], "episode", StringComparison.OrdinalIgnoreCase))
-            {
-                result.ProviderIds["tmdb"] = parts.Last();
-            }
-        }
-
-        public void ParseImdbSystem(XmlReader reader, XmlTvProgram result)
-        {
-            // <episode-num system="imdb.com">series/tt1837576</episode-num>
-            // <episode-num system="imdb.com">episode/tt3288596</episode-num>
-
-            var value = reader.ReadElementContentAsString();
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                return;
-            }
-            var parts = value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
-
-            if (parts.Length != 2)
-            {
-                return;
-            }
-
-            if (string.Equals(parts[0], "series", StringComparison.OrdinalIgnoreCase))
-            {
-                result.SeriesProviderIds["imdb"] = parts[1];
-            }
-
-            else if (string.Equals(parts[0], "episode", StringComparison.OrdinalIgnoreCase))
-            {
-                result.ProviderIds["imdb"] = parts[1];
-            }
-        }
-
-        public void ParseTvdbSystem(XmlReader reader, XmlTvProgram result)
-        {
-            // <episode-num system="thetvdb.com">series/248841</episode-num>
-            // <episode-num system="thetvdb.com">episode/4749206</episode-num>
-
-            var value = reader.ReadElementContentAsString();
-            var parts = value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
-
-            if (parts.Length != 2)
-            {
-                return;
-            }
-
-            if (string.Equals(parts[0], "series", StringComparison.OrdinalIgnoreCase))
-            {
-                result.SeriesProviderIds["tvdb"] = parts[1];
-            }
-
-            else if (string.Equals(parts[0], "episode", StringComparison.OrdinalIgnoreCase))
-            {
-                result.ProviderIds["tvdb"] = parts[1];
-            }
-        }
-
-        public void ParseEpisodeDataForOnScreen(XmlReader reader, XmlTvProgram result)
-        {
-            //// example: 'Episode #FFEE'
-            //serEpNum = ConvertHTMLToAnsi(nodeEpisodeNum);
-            //int num1 = serEpNum.IndexOf("#", 0);
-            //if (num1 < 0) num1 = 0;
-            //episodeNum = CorrectEpisodeNum(serEpNum.Substring(num1, serEpNum.Length - num1), 0);
-
-            var value = reader.ReadElementContentAsString();
-            // value = HttpUtility.HtmlDecode(value);
-            value = value.Replace(" ", "");
-
-            var hashIndex = value.IndexOf("#", StringComparison.Ordinal);
-            if (hashIndex > -1)
-            {
-                // Take everything from the hash to the end.
-                //TODO: This could be textual - how do we populate an Int32
-                // result.EpisodeNumber
-            }
-        }
-
-        public void ParseEpisodeDataForProgramId(XmlReader reader, XmlTvProgram result)
-        {
-            var value = reader.ReadElementContentAsString();
-            if (!string.IsNullOrWhiteSpace(value))
-            {
-                result.ProgramId = value;
-            }
-        }
-
-        public void ParseEpisodeDataForXmlTvNs(XmlReader reader, XmlTvProgram result)
-        {
-            var value = reader.ReadElementContentAsString();
-
-            value = value.Replace(" ", "");
-
-            // Episode details
-            var components = value.Split(new[] { "." }, StringSplitOptions.None);
-
-            int parsedInt;
-
-            if (!string.IsNullOrEmpty(components[0]))
-            {
-                // Handle either "5/12" or "5"
-                var seriesComponents = components[0].Split(new[] { "/" }, StringSplitOptions.None);
-
-                // handle the zero basing!
-                if (int.TryParse(seriesComponents[0], out parsedInt))
-                {
-                    result.Episode.Series = parsedInt + 1;
-                    if (seriesComponents.Length == 2)
-                    {
-                        if (int.TryParse(seriesComponents[1], out parsedInt))
-                        {
-                            result.Episode.SeriesCount = parsedInt;
-                        }
-                    }
-                }
-            }
-
-            if (components.Length >= 2)
-            {
-                if (!string.IsNullOrEmpty(components[1]))
-                {
-                    // Handle either "5/12" or "5"
-                    var episodeComponents = components[1].Split(new[] { "/" }, StringSplitOptions.None);
-
-                    // handle the zero basing!
-                    if (int.TryParse(episodeComponents[0], out parsedInt))
-                    {
-                        result.Episode.Episode = parsedInt + 1;
-                        if (episodeComponents.Count() == 2)
-                        {
-                            if (int.TryParse(episodeComponents[1], out parsedInt))
-                            {
-                                result.Episode.EpisodeCount = parsedInt;
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (components.Length >= 3)
-            {
-                if (!string.IsNullOrEmpty(components[2]))
-                {
-                    // Handle either "5/12" or "5"
-                    var partComponents = components[2].Split(new[] { "/" }, StringSplitOptions.None);
-
-                    // handle the zero basing!
-                    if (int.TryParse(partComponents[0], out parsedInt))
-                    {
-                        result.Episode.Part = parsedInt + 1;
-                        if (partComponents.Count() == 2)
-                        {
-                            if (int.TryParse(partComponents[1], out parsedInt))
-                            {
-                                result.Episode.PartCount = parsedInt;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public void ProcessQuality(XmlReader reader, XmlTvProgram result)
-        {
-            result.Quality = reader.ReadElementContentAsString();
-        }
-
-        public void ProcessPreviouslyShown(XmlReader reader, XmlTvProgram result)
-        {
-            // <previously-shown start="20070708000000" />
-            var value = reader.GetAttribute("start");
-            if (!string.IsNullOrEmpty(value))
-            {
-                // TODO: this may not be correct = validate it
-                result.PreviouslyShown = ParseDate(value);
-                if (result.PreviouslyShown != result.StartDate)
-                {
-                    result.IsPreviouslyShown = true;
-                }
-            }
-            else
-            {
-                result.IsPreviouslyShown = true;
-            }
-
-            reader.Skip(); // Move on
-        }
-
-        public void ProcessNew(XmlReader reader, XmlTvProgram result)
-        {
-            result.IsNew = true;
-            reader.Skip(); // Move on
-        }
-
-        public void ProcessCategory(XmlReader reader, XmlTvProgram result)
-        {
-            /*
-            <category lang="en">News</category>
-            */
-
-            result.Categories = result.Categories ?? new List<string>();
-            ProcessMultipleNodes(reader, s => result.Categories.Add(s), _language);
-
-            //result.Categories.Add(reader.ReadElementContentAsString());
-        }
-        public void ProcessCountry(XmlReader reader, XmlTvProgram result)
-        {
-            /*
-            <country>Canadá</country>
-            <country>EE.UU</country>
-            */
-
-            result.Countries = result.Countries ?? new List<string>();
-            ProcessNode(reader, s => result.Countries.Add(s), _language);
-        }
-
-        public void ProcessSubTitle(XmlReader reader, XmlTvProgram result)
-        {
-            /*
-            <sub-title lang="en">Gino&apos;s Italian Escape - Islands in the Sun: Southern Sardinia Celebrate the Sea</sub-title>
-            <sub-title lang="en">8782</sub-title>
-            */
-            ProcessNode(reader, s => result.Episode.Title = s, _language);
-        }
-
-        public void ProcessDescription(XmlReader reader, XmlTvProgram result)
-        {
-            ProcessNode(reader, s => result.Description = s, _language);
-        }
-
-        public void ProcessTitleNode(XmlReader reader, XmlTvProgram result)
-        {
-            // <title lang="en">Gino&apos;s Italian Escape</title>
-            ProcessNode(reader, s => result.Title = s, _language);
-        }
-
-        public void ProcessPremiereNode(XmlReader reader, XmlTvProgram result)
-        {
-            // <title lang="en">Gino&apos;s Italian Escape</title>
-            ProcessNode(reader,
-                s =>
-                {
-                    if (result.Premiere == null)
-                    {
-                        result.Premiere = new XmlTvPremiere() { Details = s };
-                    }
-                    else
-                    {
-                        result.Premiere.Details = s;
-                    }
-                }, _language);
-        }
-
-        public XmlTvIcon ProcessIconNode(XmlReader reader)
-        {
-            var result = new XmlTvIcon();
-            var isPopulated = false;
-
-            var source = reader.GetAttribute("src");
-            if (!string.IsNullOrEmpty(source))
-            {
-                result.Source = source;
-                isPopulated = true;
-            }
-
-            var widthString = reader.GetAttribute("width");
-            var width = 0;
-            if (!string.IsNullOrEmpty(widthString) && int.TryParse(widthString, out width))
-            {
-                result.Width = width;
-                isPopulated = true;
-            }
-
-            var heightString = reader.GetAttribute("height");
-            var height = 0;
-            if (!string.IsNullOrEmpty(heightString) && int.TryParse(heightString, out height))
-            {
-                result.Height = height;
-                isPopulated = true;
-            }
-
-            return isPopulated ? result : null;
-        }
-
-
-        //public void ProcessNodeWithLanguage(XmlReader reader, Action<string> setter)
-        //{
-        //    var currentElementName = reader.Name;
-        //    var result = string.Empty;
-        //    var resultCandidate = reader.ReadElementContentAsString();
-        //    var exactMatchFound = false;
-
-        //    while (reader.Name == currentElementName)
-        //    {
-        //        var language = reader.GetAttribute("lang");
-        //        resultCandidate = reader.ReadElementContentAsString();
-
-        //        if (language == _language && !exactMatchFound)
-        //        {
-        //            result = resultCandidate;
-        //        }
-
-        //        reader.Skip();
-        //    }
-
-        //    result = String.IsNullOrEmpty(result) ? resultCandidate : result;
-        //    setter(result);
-        //}
-
-        public void ProcessNode(XmlReader reader, Action<string> setter, string languageRequired = null, Action<string> allOccurrencesSetter = null)
-        {
-            /* <title lang="es">Homes Under the Hammer - Spanish</title>
-             * <title lang="es">Homes Under the Hammer - Spanish 2</title>
-             * <title lang="en">Homes Under the Hammer - English</title>
-             * <title lang="en">Homes Under the Hammer - English 2</title>
-             * <title lang="">Homes Under the Hammer - Empty Language</title>
-             * <title lang="">Homes Under the Hammer - Empty Language 2</title>
-             * <title>Homes Under the Hammer - No Language</title>
-             * <title>Homes Under the Hammer - No Language 2</title>
-             */
-
-            /* Expected Behaviour:
-             *  - Language = Null   Homes Under the Hammer - No Language
-             *  - Language = ""     Homes Under the Hammer - No Language
-             *  - Language = es     Homes Under the Hammer - Spanish
-             *  - Language = en     Homes Under the Hammer - English
-             */
-
-            var results = new List<Tuple<string, string>>();
-
-            // We will always use the first value - so that if there are no matches we can return something
-            var currentElementName = reader.Name;
-
-            var lang = reader.HasAttributes ? reader.GetAttribute("lang") : null;
-            var currentValue = reader.ReadElementContentAsString();
-            results.Add(new Tuple<string, string>(currentValue, lang));
-
-            if (allOccurrencesSetter != null)
-            {
-                allOccurrencesSetter(currentValue);
-            }
-
-            while (!reader.EOF && reader.ReadState == ReadState.Interactive)
-            {
-                if (reader.NodeType == XmlNodeType.Element)
-                {
-                    if (reader.Name == currentElementName)
-                    {
-                        lang = reader.HasAttributes ? reader.GetAttribute("lang") : null;
-                        currentValue = reader.ReadElementContentAsString();
-
-                        if (allOccurrencesSetter != null)
-                        {
-                            allOccurrencesSetter(currentValue);
-                        }
-
-                        results.Add(new Tuple<string, string>(currentValue, lang));
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-                else
-                {
-                    reader.Read();
-                }
-            }
-
-            if (languageRequired != null)
-            {
-                foreach (var result in results)
-                {
-                    if (string.Equals(languageRequired, result.Item2, StringComparison.OrdinalIgnoreCase))
-                    {
-                        setter(result.Item1);
-                        return;
-                    }
-                }
-            }
-
-            foreach (var result in results)
-            {
-                if (string.IsNullOrWhiteSpace(result.Item2))
-                {
-                    setter(result.Item1);
-                    return;
-                }
-            }
-
-            foreach (var result in results)
-            {
-                setter(result.Item1);
-                return;
-            }
-        }
-
-        public void ProcessMultipleNodes(XmlReader reader, Action<string> setter, string languageRequired = null)
-        {
-            /* <category lang="en">Property - English</category>
-             * <category lang="en">Property - English 2</category>
-             * <category lang="es">Property - Spanish</category>
-             * <category lang="es">Property - Spanish 2</category>
-             * <category lang="">Property - Empty Language</category>
-             * <category lang="">Property - Empty Language 2</category>
-             * <category>Property - No Language</category>
-             * <category>Property - No Language 2</category>
-             */
-
-            /* Expected Behaviour:
-             *  - Language = Null   Property - No Language / Property - No Language 2
-             *  - Language = ""     Property - Empty Language / Property - Empty Language 2
-             *  - Language = es     Property - Spanish / Property - Spanish 2
-             *  - Language = en     Property - English / Property - English 2
-             */
-
-            var currentElementName = reader.Name;
-            var values = new[] { new { Language = reader.GetAttribute("lang"), Value = reader.ReadElementContentAsString() } }.ToList();
-
-            while (reader.Read())
-            {
-                if (reader.NodeType == XmlNodeType.Element && reader.Name != currentElementName)
-                {
-                    break;
-                }
-
-                if (reader.NodeType == XmlNodeType.Element && reader.Name == currentElementName)
-                {
-                    values.Add(new { Language = reader.GetAttribute("lang"), Value = reader.ReadElementContentAsString() });
-                }
-            }
-
-            if (values.Count(v => v.Language == languageRequired) > 0)
-            {
-                values.RemoveAll(v => v.Language != languageRequired);
-            }
-
-            // ENumerate and return all the matches
-            foreach (var result in values)
-            {
-                setter(result.Value);
-            }
-        }
-
-        public void ProcessMultipleNodesWithLanguage(XmlReader reader, Action<string> setter)
-        {
-            var currentElementName = reader.Name;
-            while (reader.Name == currentElementName)
-            {
-                var language = reader.GetAttribute("lang");
-                if (string.IsNullOrEmpty(_language) || string.IsNullOrEmpty(language) || language == _language)
-                {
-                    setter(reader.ReadElementContentAsString());
-                }
-                reader.Skip();
-            }
-        }
-
-        private void PopulateHeader(XmlReader reader, XmlTvProgram result)
-        {
-            result.ChannelId = reader.GetAttribute("channel");
-
-            var startValue = reader.GetAttribute("start");
-            if (string.IsNullOrEmpty(startValue))
-            {
-                // Log.Error("  programme#{0} doesnt contain a start date", iChannel);
-                result.StartDate = DateTimeOffset.MinValue;
-            }
-            else
-            {
-                result.StartDate = ParseDate(startValue).GetValueOrDefault();
-            }
-
-
-            var endValue = reader.GetAttribute("stop");
-            if (string.IsNullOrEmpty(endValue))
-            {
-                // Log.Error("  programme#{0} doesnt contain an end date", iChannel);
-                result.EndDate = DateTimeOffset.MinValue;
-            }
-            else
-            {
-                result.EndDate = ParseDate(endValue).GetValueOrDefault();
-            }
-        }
-
-        public const string _regDateWithOffset = @"^(?<dateDigits>[0-9]{4,14})(\s(?<dateOffset>[+-]*[0-9]{1,4}))?$";
-
-        public DateTimeOffset? ParseDate(string dateValue)
-        {
-            /*
-            All dates and times in this DTD follow the same format, loosely based
-            on ISO 8601.  They can be 'YYYYMMDDhhmmss' or some initial
-            substring, for example if you only know the year and month you can
-            have 'YYYYMM'.  You can also append a timezone to the end; if no
-            explicit timezone is given, UTC is assumed.  Examples:
-            '200007281733 BST', '200209', '19880523083000 +0300'.  (BST == +0100.)
-            */
-
-            if (string.IsNullOrEmpty(dateValue))
-            {
-                return null;
-            }
-
-            var completeDate = "20000101000000";
-            var dateComponent = string.Empty;
-            var dateOffset = "+00:00";
-            var match = Regex.Match(dateValue, _regDateWithOffset);
-            if (match.Success)
-            {
-                dateComponent = match.Groups["dateDigits"].Value;
-                if (!string.IsNullOrEmpty(match.Groups["dateOffset"].Value))
-                {
-                    dateOffset = match.Groups["dateOffset"].Value; // Add in the colon to ease parsing later
-                    if (dateOffset.Length == 5)
-                    {
-                        dateOffset = dateOffset.Insert(3, ":"); // Add in the colon to ease parsing later
-                    }
-                    else
-                    {
-                        dateOffset = "+00:00";
-                    }
-                }
-            }
-
-            // Pad out the date component part to 14 characaters so 2016061509 becomes 20160615090000
-            if (dateComponent.Length < 14)
-            {
-                dateComponent = dateComponent + completeDate.Substring(dateComponent.Length, completeDate.Length - dateComponent.Length);
-            }
-
-            var standardDate = string.Format("{0} {1}", dateComponent, dateOffset);
-            if (DateTimeOffset.TryParseExact(standardDate, "yyyyMMddHHmmss zzz", CultureInfo.CurrentCulture, DateTimeStyles.None, out DateTimeOffset parsedDateTime))
-            {
-                return parsedDateTime.ToUniversalTime();
-            }
-
-            // Logger.LogWarning("Unable to parse the date {0} from standardised form {1}", dateValue, standardDate);
-
-            return null;
-        }
-
-        public string StandardiseDate(string value)
-        {
-            var completeDate = "20000101000000";
-            var dateComponent = string.Empty;
-            var dateOffset = "+0000";
-
-            var match = Regex.Match(value, _regDateWithOffset);
-            if (match.Success)
-            {
-                dateComponent = match.Groups["dateDigits"].Value;
-                dateOffset = match.Groups["dateOffset"].Value;
-            }
-
-            // Pad out the date component part to 14 characaters so 2016061509 becomes 20160615090000
-            if (dateComponent.Length < 14)
-            {
-                dateComponent = dateComponent + completeDate.Substring(dateComponent.Length, completeDate.Length - dateComponent.Length);
-            }
-
-            return string.Format("{0} {1}", dateComponent, dateOffset);
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\SharedVersion.cs" />
-  </ItemGroup>
-
-</Project>

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Text;
-
-namespace Emby.XmlTv.Entities
-{
-    public class XmlTvChannel : IEquatable<XmlTvChannel>
-    {
-        public string Id { get; set; }
-        public string DisplayName { get; set; }
-        public string Number { get; set; }
-        public string Url { get; set; }
-        public XmlTvIcon Icon { get; set; }
-
-        public bool Equals(XmlTvChannel other)
-        {
-            // If both are null, or both are same instance, return true.
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-
-            // If the other is null then return false
-            if (other == null)
-            {
-                return false;
-            }
-
-            // Return true if the fields match:
-            return Id == other.Id;
-        }
-
-        public override int GetHashCode()
-        {
-            return (Id.GetHashCode() * 17);
-        }
-
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
-            builder.AppendFormat("{0} - {1} ", Id, DisplayName);
-
-            if (!string.IsNullOrEmpty(Url))
-            {
-                builder.AppendFormat(" ({0})", Url);
-            }
-
-            return builder.ToString();
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs

@@ -1,13 +0,0 @@
-namespace Emby.XmlTv.Entities
-{
-    public class XmlTvCredit
-    {
-        public XmlTvCreditType Type { get; set; }
-        public string Name { get; set; }
-
-        public override string ToString()
-        {
-            return string.Format("{0} - ({1})", Name, Type);
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs

@@ -1,17 +0,0 @@
-namespace Emby.XmlTv.Entities
-{
-    public enum XmlTvCreditType
-    {
-        NotSpecified = 0,
-        Director,
-        Actor,
-        Writer,
-        Adapter,
-        Producer,
-        Composer,
-        Editor,
-        Presenter,
-        Commentator,
-        Guest
-    }
-}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs

@@ -1,52 +0,0 @@
-using System.Text;
-
-namespace Emby.XmlTv.Entities
-{
-    public class XmlTvEpisode
-    {
-        public int? Series { get; set; }
-        public int? SeriesCount { get; set; }
-        public int? Episode { get; set; }
-        public int? EpisodeCount { get; set; }
-        public string Title { get; set; }
-        public int? Part { get; set; }
-        public int? PartCount { get; set; }
-
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
-            if (Series.HasValue || SeriesCount.HasValue)
-            {
-                builder.AppendFormat("Series {0}", Series.HasValue ? Series.Value.ToString() : "?");
-                if (SeriesCount.HasValue)
-                {
-                    builder.AppendFormat(" of {0}", SeriesCount);
-                }
-            }
-
-            if (Episode.HasValue || EpisodeCount.HasValue)
-            {
-                builder.Append(builder.Length > 0 ? ", " : string.Empty);
-                builder.AppendFormat("Episode {0}", Episode.HasValue ? Episode.Value.ToString() : "?");
-                if (EpisodeCount.HasValue)
-                {
-                    builder.AppendFormat(" of {0}", EpisodeCount);
-                }
-            }
-
-            if (Part.HasValue || PartCount.HasValue)
-            {
-                builder.Append(builder.Length > 0 ? ", " : string.Empty);
-                builder.AppendFormat("Part {0}", Part.HasValue ? Part.Value.ToString() : "?");
-                if (PartCount.HasValue)
-                {
-                    builder.AppendFormat(" of {0}", PartCount);
-                }
-            }
-
-            return builder.ToString();
-        }
-    }
-
-
-}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs

@@ -1,27 +0,0 @@
-using System.Text;
-
-namespace Emby.XmlTv.Entities
-{
-    public class XmlTvIcon
-    {
-        public string Source { get; set; }
-        public int? Width { get; set; }
-        public int? Height { get; set; }
-
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
-            builder.AppendFormat("Source: {0}", Source);
-            if (Width.HasValue)
-            {
-                builder.AppendFormat(", Width: {0}", Width);
-            }
-            if (Height.HasValue)
-            {
-                builder.AppendFormat(", Height: {0}", Height);
-            }
-
-            return builder.ToString();
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs

@@ -1,15 +0,0 @@
-namespace Emby.XmlTv.Entities
-{
-    public class XmlTvLanguage
-    {
-        /// <summary>
-        /// The name.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// The relevance (number of occurances) of the language, can be used to order (desc)
-        /// </summary>
-        public int Relevance { get; set; }
-    }
-}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs

@@ -1,13 +0,0 @@
-namespace Emby.XmlTv.Entities
-{
-    public class XmlTvPremiere
-    {
-        /*
-        <premiere lang="en">
-          First showing on national terrestrial TV
-        </premiere>
-        */
-
-        public string Details { get; set; }
-    }
-}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs

@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Emby.XmlTv.Entities
-{
-    public class XmlTvProgram : IEquatable<XmlTvProgram>
-    {
-        public string ChannelId { get; set; }
-
-        public DateTimeOffset StartDate { get; set; }
-
-        public DateTimeOffset EndDate { get; set; }
-
-        public string Title { get; set; }
-
-        public string Description { get; set; }
-        public string ProgramId { get; set; }
-        public string Quality { get; set; }
-
-        public List<string> Categories { get; set; }
-
-        public List<string> Countries { get; set; }
-
-        public DateTimeOffset? PreviouslyShown { get; set; }
-
-        public bool IsPreviouslyShown { get; set; }
-        public bool IsNew { get; set; }
-
-        public DateTimeOffset? CopyrightDate { get; set; }
-
-        public XmlTvEpisode Episode { get; set; }
-
-        public List<XmlTvCredit> Credits { get; set; }
-
-        public XmlTvRating Rating { get; set; }
-
-        public float? StarRating { get; set; }
-
-        public XmlTvIcon Icon { get; set; }
-
-        public XmlTvPremiere Premiere { get; set; }
-
-        public Dictionary<string, string> ProviderIds { get; set; }
-        public Dictionary<string, string> SeriesProviderIds { get; set; }
-
-        public XmlTvProgram()
-        {
-            Credits = new List<XmlTvCredit>();
-            Categories = new List<string>();
-            Countries = new List<string>();
-            Episode = new XmlTvEpisode();
-
-            ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            SeriesProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        }
-
-        public bool Equals(XmlTvProgram other)
-        {
-            // If both are null, or both are same instance, return true.
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-
-            // If the other is null then return false
-            if (other == null)
-            {
-                return false;
-            }
-
-            // Return true if the fields match:
-            return ChannelId == other.ChannelId &&
-                StartDate == other.StartDate &&
-                EndDate == other.EndDate;
-        }
-
-        public override int GetHashCode()
-        {
-            return (ChannelId.GetHashCode() * 17) + (StartDate.GetHashCode() * 17) + (EndDate.GetHashCode() * 17);
-        }
-
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
-            builder.AppendFormat("ChannelId: \t\t{0}\r\n", ChannelId);
-            builder.AppendFormat("Title: \t\t{0}\r\n", Title);
-            builder.AppendFormat("StartDate: \t\t{0}\r\n", StartDate);
-            builder.AppendFormat("EndDate: \t\t{0}\r\n", EndDate);
-            return builder.ToString();
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs

@@ -1,40 +0,0 @@
-using System.Text;
-
-namespace Emby.XmlTv.Entities
-{
-    /// <summary>
-    /// Describes the rating (certification) applied to a program
-    /// </summary>
-    /// <remarks>Example XML:
-    /// </remarks>
-    public class XmlTvRating
-    {
-        /// <summary>
-        /// The literal name of the rating system
-        /// </summary>
-        /// <example>MPAA</example>
-        public string System { get; set; }
-
-        /// <summary>
-        /// Describes the rating using the system specificed
-        /// </summary>
-        /// <example>TV-14</example>
-        public string Value { get; set; }
-
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
-            if (!string.IsNullOrEmpty(Value))
-            {
-                builder.Append(Value);
-            }
-
-            if (!string.IsNullOrEmpty(System))
-            {
-                builder.AppendFormat(" ({0})", System);
-            }
-
-            return builder.ToString();
-        }
-    }
-}

Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs

@@ -1,21 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("XmlTv")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Jellyfin Project")]
-[assembly: AssemblyProduct("Jellyfin Server")]
-[assembly: AssemblyCopyright("Copyright ©  2019 Jellyfin Contributors. Code released under the GNU General Public License")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]

Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd

@@ -1,575 +0,0 @@
-<!-- DTD for TV listings
-
-This is a DTD to represent a TV listing.  It doesn't explicitly group
-programmes by day or by channel, instead broadcast time and channel
-are attributes of the 'programme' element.  Optionally, data about the
-TV channels used can be stored in 'channel' elements.
-
-Data about a TV programme are stored in the subelements of element
-'programme', but metadata such as when it will be broadcast are stored
-as attributes.
-
-Many of the details have a 'lang' attribute so that you can
-store them in multiple languages or have mixed languages in a single
-listing.  This 'lang' should be the two-letter code such as 'en' or
-'fr_FR'.  Or you can just leave it out and let your reader take a
-guess.
-
-Unless otherwise specified, an element containing CDATA must have some
-text if it is written.
-
-An example XML file for this DTD might look like this:
-
-<tv generator-info-name="my listings generator">
-  <channel id="3sat.de">
-    <display-name lang="de">3SAT</display-name>
-  </channel>
-  <channel id="das-erste.de">
-    <display-name lang="de">ARD</display-name>
-    <display-name lang="de">Das Erste</display-name>
-  </channel>
-
-  <programme start="200006031633" channel="3sat.de">
-    <title lang="de">blah</title>
-    <title lang="en">blah</title>
-    <desc lang="de">
-       Blah Blah Blah.
-    </desc>
-    <credits>
-      <director>blah</director>
-      <actor>a</actor>
-      <actor>b</actor>
-    </credits>
-    <date>19901011</date>
-    <country>ES</country>
-    <episode-num system="xmltv_ns">2 . 9 . 0/1</episode-num>
-    <video>
-      <aspect>16:9</aspect>
-    </video>
-    <rating system="MPAA">
-      <value>PG</value>
-      <icon src="pg_symbol.png" />
-    </rating>
-    <star-rating>
-      <value>3/3</value>
-    </star-rating>
-  </programme>
-  <programme> ... </programme>
-  ...
-</tv>
-
-This describes two channels and then a programme broadcast on one of
-the channels, then some more programmes.  Almost everything in the DTD
-is optional, so you can write files which are much simpler than this
-example.
-
-All dates and times in this DTD follow the same format, loosely based
-on ISO 8601.  They can be 'YYYYMMDDhhmmss' or some initial
-substring, for example if you only know the year and month you can
-have 'YYYYMM'.  You can also append a timezone to the end; if no
-explicit timezone is given, UTC is assumed.  Examples:
-'200007281733 BST', '200209', '19880523083000 +0300'.  (BST == +0100.)
-
-Unless specified otherwise, textual element content may not contain
-newlines - this is to make it easy to convert into line-oriented
-formats, and to avoid the question of what exactly a newline would
-mean in the middle of someone's name or whatever.  Leading and
-trailing whitespace in element content is not significant.
-
-At present versions of this DTD correspond to releases of the 'xmltv'
-package, which is a set of programs to generate and manipulate files
-conforming to this DTD.  Written by Ed Avis (ed@membled.com) and
-Gottfried Szing, thanks to others for suggestions.
-
-$Id: xmltv.dtd,v 1.47 2014/05/02 07:27:51 bilbo_uk Exp $
-
--->
-
-<!-- The root element, tv.
-
-Date should be the date when the listings were originally produced in
-whatever format; if you're converting data from another source, then
-use the date given by that source.  The date when the conversion
-itself was done is not important.
-
-To indicate the source of the listings, there are three attributes you
-can define:
-
-'source-info-url' is a URL describing the data source in
-some human-readable form.  So if you are getting your listings from
-SAT.1, you might set this to the URL of a page explaining how to
-subscribe to their feed.  If you are getting them from a website, the
-URL might be the index of the site or at least of the TV listings
-section.
-
-'source-info-name' is the link text for that URL; it should
-generally be the human-readable name of your listings supplier.
-Sometimes the link text might be printed without the link itself, in
-hardcopy listings for example.
-
-'source-data-url' is where the actual data is grabbed from.  This
-should link directly to the machine-readable data files if possible,
-but it's not rigorously defined what 'actual data' means.  If you are
-parsing the data from human-readable pages, then it's more appropriate
-to link to them with the source-info stuff and omit this attribute.
-
-To publicize your wonderful program which generated this file, you can
-use 'generator-info-name' (preferably in the form 'progname/version')
-and 'generator-info-url' (a link to more info about the program).
--->
-<!ELEMENT tv (channel*, programme*)>
-<!ATTLIST tv date   CDATA #IMPLIED
-             source-info-url     CDATA #IMPLIED
-             source-info-name    CDATA #IMPLIED
-             source-data-url     CDATA #IMPLIED
-             generator-info-name CDATA #IMPLIED
-             generator-info-url  CDATA #IMPLIED >
-
-<!-- channel - details of a channel
-
-Each 'programme' element (see below) should have an attribute
-'channel' giving the channel on which it is broadcast.  If you want to
-provide more detail about channels, you can give some 'channel'
-elements before listing the programmes.  The 'id' attribute of the
-channel should match what is given in the 'channel' attribute of the
-programme.
-
-Typically, all the channels used in a particular TV listing will be
-included and then the programmes using those channels.  But it's
-entirely optional to include channel details - you can just leave out
-channel elements or provide only some of them.  It is also okay to
-give just channels and no programmes, if you just want to describe
-what TV channels are available in a certain area.
-
-Each channel has one id attribute, which must be unique and should
-preferably be in the form suggested by RFC2838 (the 'broadcast'
-element of the grammar in that RFC, in other words, a DNS-like name
-but without any URI scheme).  Then one or more display names which are
-shown to the user.  You might want a different display name for
-different languages, but also you can have more than one name for the
-same language.  Names listed earlier are considered 'more canonical'.
-
-Since the display name is just there as a way for humans to refer to
-the channel, it's acceptable to just put the channel number if it's
-fairly universal among viewers of the channel.  But remember that this
-isn't an official statement of what channel number has been
-allocated, and the same number might be used for a different channel
-somewhere else.
-
-The ordering of channel elements makes no difference to the meaning of
-the file, since they are looked up by id and not by their position.
-However it makes things like diffing easier if you write the channel
-elements sorted by ASCII order of their ids.
--->
-<!ELEMENT channel (display-name+, icon*, url*) >
-<!ATTLIST channel id CDATA #REQUIRED >
-
-<!-- A user-friendly name for the channel - maybe even a channel
-number.  List the most canonical / common ones first and the most
-obscure names last.  The lang attribute follows RFC 1766.
--->
-<!ELEMENT display-name (#PCDATA)>
-<!ATTLIST display-name lang CDATA #IMPLIED>
-
-<!-- A URL where you can find out more about the element that contains
-it (programme or channel).  This might be the official site, or a fan
-page, whatever you like really.
-
-If multiple url elements are given, the most authoritative or official
-(which might conflict...) sites should be listed first.
--->
-<!ELEMENT url (#PCDATA)>
-
-<!-- programme - details of a single programme transmission
-
-A show will be exactly the same whether it is broadcast at 18:00 or
-19:00, and on whichever channel.  Technical details like broadcast
-time don't affect the content of the programme itself, so they are
-included as attributes of this element.  Start time and channel are
-the two that you must include.
-
-Sometimes VCR programming systems like PDC or VPS have their own
-notion of 'start time' which is different from the actual start time,
-so there are attributes for that.  In practice, stop time will usually
-be the start time of the next programme, but if you can get it more
-accurate, good for you.  Similarly, you can specify a code for
-Gemstar's Showview or VideoPlus programming systems.
-
-TV listings sometimes have the problem of listing two or more
-programmes in the same timeslot, such as 'News; Weather'.  We call
-this a 'clump' of programmes, and the 'clumpidx' attribute
-differentiates between two programmes sharing the same timeslot and
-channel.  In this case News would have clumpidx="0/2" and Weather
-would have clumpidx="1/2".  If you don't have this problem, be
-thankful!
-
-It's intended that start time and stop time, when both are present,
-make a half-closed interval: a programme is considered to be
-broadcasting _at_ its start time but to stop just before its stop
-time.  In this way a programme from 11:00 to 12:00 does not overlap
-with another programme from 12:00 to 13:00, not even for a moment.
-Nor is there any gap between the two.
-
-To do: Some means of indicating breaks between programmes on the same
-channel.  The 'channel' attribute references the 'id' of a channel
-element, but the DTD doesn't give a way to specify this constraint.
-Perhaps there is some better XML syntax we could use for that.
--->
-<!ELEMENT programme (title+, sub-title*, desc*, credits?, date?,
-                     category*, keyword*, language?, orig-language?,
-                     length?, icon*, url*, country*, episode-num*,
-                     video?, audio?, previously-shown?, premiere?,
-                     last-chance?, new?, subtitles*, rating*,
-                     star-rating*, review* )>
-<!ATTLIST programme start     CDATA #REQUIRED
-                    stop      CDATA #IMPLIED
-                    pdc-start CDATA #IMPLIED
-                    vps-start CDATA #IMPLIED
-                    showview  CDATA #IMPLIED
-                    videoplus CDATA #IMPLIED
-                    channel   CDATA #REQUIRED
-                    clumpidx  CDATA "0/1" >
-
-<!-- Programme title, eg 'The Simpsons'. -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title lang CDATA #IMPLIED>
-
-<!-- Sub-title or episode title, eg 'Datalore'.   Should probably be
-called 'secondary title' to avoid confusion with captioning!
--->
-<!ELEMENT sub-title (#PCDATA)>
-<!ATTLIST sub-title lang CDATA #IMPLIED>
-
-<!-- Description of the programme or episode.
-
-Unlike other elements, long bits of whitespace here are treated as
-equivalent to a single space and newlines are permitted, so you can
-break lines and write a pretty-looking paragraph if you wish.
--->
-<!ELEMENT desc (#PCDATA)>
-<!ATTLIST desc lang CDATA #IMPLIED>
-
-<!-- Credits for the programme.
-
-People are listed in decreasing order of importance; so for example
-the starring actors appear first followed by the smaller parts.  As
-with other parts of this file format, not mentioning a particular
-actor (for example) does not imply that he _didn't_ star in the film -
-so normally you'd list only the few most important people.
-
-Adapter can be either somebody who adapted a work for television, or
-somebody who did the translation from another language.  Maybe these
-should be separate, but if so how would 'translator' fit in with the
-'language' element?
--->
-<!ELEMENT credits (director*, actor*, writer*, adapter*, producer*,
-                   composer*, editor*, presenter*, commentator*, 
-                   guest* )>
-<!ELEMENT director    (#PCDATA)>
-<!ELEMENT actor       (#PCDATA)>
-<!ATTLIST actor role  CDATA #IMPLIED>
-<!ELEMENT writer      (#PCDATA)>
-<!ELEMENT adapter     (#PCDATA)>
-<!ELEMENT producer    (#PCDATA)>
-<!ELEMENT composer    (#PCDATA)>
-<!ELEMENT editor      (#PCDATA)>
-<!ELEMENT presenter   (#PCDATA)>
-<!ELEMENT commentator (#PCDATA)>
-<!ELEMENT guest       (#PCDATA)>
-
-
-<!-- The date the programme or film was finished.  This will probably
-be the same as the copyright date.
--->
-<!ELEMENT date (#PCDATA)>
-
-<!-- Type of programme, eg 'soap', 'comedy' or whatever the
-equivalents are in your language.  There's no predefined set of
-categories and it's okay for a programme to belong to several.
--->
-<!ELEMENT category (#PCDATA)>
-<!ATTLIST category lang CDATA #IMPLIED>
-
-<!-- Keywords for the programme, eg 'prison-drama', 'based-on-novel', 
-'super-hero'.  There's no predefined set of keywords and it's likely 
-for a programme to have several.  It is recommended that keywords
-containing multiple words are hyphenated.
--->
-<!ELEMENT keyword (#PCDATA)>
-<!ATTLIST keyword lang CDATA #IMPLIED>
-
-<!-- The language the programme will be broadcast in.  This does not
-include the language of any subtitles, but it is affected by dubbing
-into a different language.  For example, if a French film is dubbed
-into English, language=en and orig-language=fr.
-
-There are two ways to specify the language.  You can use the
-two-letter codes such as en or fr, or you can give a name such as
-'English' or 'Deutsch'.  In the latter case you might want to use the
-'lang' attribute, for example
-
-<language lang="fr">Allemand</language>
--->
-<!ELEMENT language (#PCDATA)>
-<!ATTLIST language lang CDATA #IMPLIED>
-
-<!-- The original language, before dubbing.  The same remarks as for
-'language' apply.
--->
-<!ELEMENT orig-language (#PCDATA)>
-<!ATTLIST orig-language lang CDATA #IMPLIED>
-
-<!-- The true length of the programme, not counting advertisements or
-trailers.  But this does take account of any bits which were cut out
-of the broadcast version - eg if a two hour film is cut to 110 minutes
-and then padded with 20 minutes of advertising, length will be 110
-minutes even though end time minus start time is 130 minutes.
--->
-<!ELEMENT length (#PCDATA)>
-<!ATTLIST length units (seconds | minutes | hours) #REQUIRED>
-
-<!-- An icon associated with the element that contains it.
-src: uri of image
-width, height: (optional) dimensions of image
-
-These dimensions are pixel dimensions for the time being, eventually
-this will change to be more like HTML's 'img'.
--->
-<!ELEMENT icon EMPTY>
-<!ATTLIST icon src         CDATA #REQUIRED
-               width       CDATA #IMPLIED
-               height      CDATA #IMPLIED>
-
-<!-- The value of the element that contains it.  This is for elements
-that can have both a textual 'value' and an icon.  At present there is
-no 'lang' attribute here because things like 'PG' are not translatable
-(although a document explaining what 'PG' actually means would be).
-It happens that 'value' is used only for this sort of thing.
--->
-<!ELEMENT value (#PCDATA)>
-
-<!-- A country where the programme was made or one of the countries in
-a joint production.  You can give the name of a country, in which case
-you might want to specify the language in which this name is written,
-or you can give a two-letter uppercase country code, in which case the
-lang attribute should not be given.  For example,
-
-<country lang="en">Italy</country>
-<country>GB</country>
--->
-<!ELEMENT country (#PCDATA)>
-<!ATTLIST country lang CDATA #IMPLIED>
-
-<!-- Episode number
-
-Not the title of the episode, its number or ID.  There are several
-ways of numbering episodes, so the 'system' attribute lets you specify
-which you mean.
-
-There are two predefined numbering systems, 'xmltv_ns' and
-'onscreen'.
-
-xmltv_ns: This is intended to be a general way to number episodes and
-parts of multi-part episodes.  It is three numbers separated by dots,
-the first is the series or season, the second the episode number
-within that series, and the third the part number, if the programme is
-part of a two-parter.  All these numbers are indexed from zero, and
-they can be given in the form 'X/Y' to show series X out of Y series
-made, or episode X out of Y episodes in this series, or part X of a
-Y-part episode.  If any of these aren't known they can be omitted.
-You can put spaces whereever you like to make things easier to read.
-
-(NB 'part number' is not used when a whole programme is split in two
-for purely scheduling reasons; it's intended for cases where there
-really is a 'Part One' and 'Part Two'.  The format doesn't currently
-have a way to represent a whole programme that happens to be split
-across two or more timeslots.)
-
-Some examples will make things clearer.  The first episode of the
-second series is '1.0.0/1' .  If it were a two-part episode, then the
-first half would be '1.0.0/2' and the second half '1.0.1/2'.  If you
-know that an episode is from the first season, but you don't know
-which episode it is or whether it is part of a multiparter, you could
-give the episode-num as '0..'.  Here the second and third numbers have
-been omitted.  If you know that this is the first part of a three-part
-episode, which is the last episode of the first series of thirteen,
-its number would be '0 . 12/13 . 0/3'.  The series number is just '0'
-because you don't know how many series there are in total - perhaps
-the show is still being made!
-
-The other predefined system, onscreen, is to simply copy what the
-programme makers write in the credits - 'Episode #FFEE' would
-translate to '#FFEE'.
-
-You are encouraged to use one of these two if possible; if xmltv_ns is
-not general enough for your needs, let me know.  But if you want, you
-can use your own system and give the 'system' attribute as a URL
-describing the system you use.
-
-Systems proposed in 2013 to refer to common metadatabases in a
-common way:
-'themoviedb.org' with the content 'movie/1234' to refer to a movie,
-'thetvdb.com' with the content 'series/123456' to refer to a series,
-'thetvdb.com' with the content 'episode/123456' to refer to one episode
-of a series and 'imdb.com' with the content 'title/tt123455' to refer to
-a movie, series or episode.
-
--->
-<!ELEMENT episode-num (#PCDATA)>
-<!ATTLIST episode-num system CDATA "onscreen">
-
-<!-- Video details: the subelements describe the picture quality as
-follows:
-
-present: whether this programme has a picture (no, in the
-case of radio stations broadcast on TV or 'Blue'), legal values are
-'yes' or 'no'.  Obviously if the value is 'no', the other elements are
-meaningless.
-
-colour: 'yes' for colour, 'no' for black-and-white.
-
-aspect: The horizontal:vertical aspect ratio, eg '4:3' or '16:9'.
-
-quality: information on the quality, eg 'HDTV', '800x600'.
-
--->
-<!ELEMENT video (present?, colour?, aspect?, quality?)>
-<!ELEMENT present (#PCDATA)>
-<!ELEMENT colour (#PCDATA)>
-<!ELEMENT aspect (#PCDATA)>
-<!ELEMENT quality (#PCDATA)>
-
-<!-- Audio details, similar to video details above.
-
-present: whether this programme has any sound at all, 'yes' or 'no'.
-
-stereo: Description of the stereo-ness of the sound.  Legal values
-are currently 'mono','stereo','dolby','dolby digital','bilingual' 
-and 'surround'. 'bilingual' in this case refers to a single audio 
-stream where the left and right channels contain monophonic audio
-in different languages.  Other values may be added later.
-
--->
-<!ELEMENT audio (present?, stereo?)>
-<!ELEMENT stereo (#PCDATA)>
-
-<!-- When and where the programme was last shown, if known.  Normally
-in TV listings 'repeat' means 'previously shown on this channel', but
-if you don't know what channel the old screening was on (but do know
-that it happened) then you can omit the 'channel' attribute.
-Similarly you can omit the 'start' attribute if you don't know when
-the previous transmission was (though you can of course give just the
-year, etc.).
-
-The absence of this element does not say for certain that the
-programme is brand new and has never been screened anywhere before.
--->
-<!ELEMENT previously-shown EMPTY>
-<!ATTLIST previously-shown start   CDATA #IMPLIED
-                           channel CDATA #IMPLIED >
-
-<!-- 'Premiere'.  Different channels have different meanings for this
-word - sometimes it means a film has never before been seen on TV in
-that country, but other channels use it to mean 'the first showing of
-this film on our channel in the current run'.  It might have been
-shown before, but now they have paid for another set of showings,
-which makes the first in that set count as a premiere!
-
-So this element doesn't have a clear meaning, just use it to represent
-where 'premiere' would appear in a printed TV listing.  You can use
-the content of the element to explain exactly what is meant, for
-example:
-
-<premiere lang="en">
-  First showing on national terrestrial TV
-</premiere>
-
-The textual content is a 'paragraph' as for <desc>.  If you don't want
-to give an explanation, just write empty content:
-
-<premiere />
--->
-<!ELEMENT premiere (#PCDATA)>
-<!ATTLIST premiere lang CDATA #IMPLIED>
-
-<!-- Last-chance.  In a way this is the opposite of premiere.  Some
-channels buy the rights to show a movie a certain number of times, and
-the first may be flagged 'premiere', the last as 'last showing'.
-
-For symmetry with premiere, you may use the element content to give a
-'paragraph' describing exactly what is meant - it's unlikely to be the
-last showing ever!  Otherwise, explicitly put empty content:
-
-<last-chance />
--->
-<!ELEMENT last-chance (#PCDATA)>
-<!ATTLIST last-chance lang CDATA #IMPLIED>
-
-<!-- New.  This is the first screened programme from a new show that
-has never been shown on television before - if not worldwide then at
-least never before in this country.  After the first episode or
-programme has been shown, subsequent ones are no longer 'new'.
-Similarly the second series of an established programme is not 'new'.
-
-Note that this does not mean 'new season' or 'new episode' of an
-existing show.  You can express part of that using the episode-num
-stuff.
--->
-<!ELEMENT new EMPTY>
-
-<!-- Subtitles.  These can be either 'teletext' (sent digitally, and
-displayed at the viewer's request), 'onscreen' (superimposed on the
-picture and impossible to get rid of), or 'deaf-signed' (in-vision 
-signing for users of sign language). You can have multiple subtitle
-streams to handle different languages.  Language for subtitles is
-specified in the same way as for programmes.
--->
-<!ELEMENT subtitles (language?)>
-<!ATTLIST subtitles type (teletext | onscreen | deaf-signed) #IMPLIED>
-
-<!-- Rating.  Various bodies decide on classifications for films -
-usually a minimum age you must be to see it.  In principle the same
-could be done for ordinary TV programmes.  Because there are many
-systems for doing this, you can also specify the rating system used
-(which in practice is the same as the body which made the rating).
--->
-<!ELEMENT rating (value, icon*)>
-<!ATTLIST rating system CDATA #IMPLIED>
-
-<!-- 'Star rating' - many listings guides award a programme a score as
-a quick guide to how good it is.  The value of this element should be
-'N / M', for example one star out of a possible five stars would be
-'1 / 5'.  Zero stars is also a possible score (and not the same as
-'unrated').  You should try to map whatever wacky system your listings
-source uses to a number of stars: so for example if they have thumbs
-up, thumbs sideways and thumbs down, you could map that to two, one or
-zero stars out of two.  If a programme is marked as recommended in a
-listings guide you could map this to '1 / 1'. Because there could be many 
-ways to provide star-ratings or recommendations for a programme, you can 
-specify multiple star-ratings. You can specify the star-rating system 
-used, or the provider of the recommendation, with the system attribute. 
-Whitespace between the numbers and slash is ignored.
--->
-
-<!ELEMENT star-rating (value, icon*)>
-<!ATTLIST star-rating system CDATA #IMPLIED>
-
-<!-- Review.  Listings guides may provide reviews of programmes in
-addition to, or in place of, standard programme descriptions. They are 
-usually written by in-house reviewers, but reviews can also be made 
-available by third-party organisations/individuals. The value of this 
-element must be either the text of the review, or a URL that links to it.
-Optional attributes giving the review source and the individual reviewer 
-can also be specified.
--->
-<!ELEMENT review (#PCDATA)>
-<!ATTLIST review type     (text | url) #REQUIRED
-                 source   CDATA        #IMPLIED
-                 reviewer CDATA        #IMPLIED
-                 lang     CDATA        #IMPLIED>
-
-<!-- (Why are things like 'stereo', which must be one of a small
-number of values, stored as the contents of elements rather than as
-attributes?  Because they are data rather than metadata.  Attributes
-are used for things like the language or encoding of element contents,
-or for programme transmission details.) -->

Emby.XmlTv/License.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Alex Stevens
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

Emby.XmlTv/Nuget/Emby.XmlTv.nuspec

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>Emby.XmlTv</id>
-        <version>1.0.19</version>
-        <title>Emby.XmlTv</title>
-        <authors>Emby Team</authors>
-        <owners>ebr,Luke,scottisafool</owners>
-        <projectUrl>https://github.com/MediaBrowser/Emby.XmlTv</projectUrl>
-        <iconUrl>http://www.mb3admin.com/images/mb3icons1-1.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>An XmlTv parsing library.</description>
-        <copyright>Copyright © Emby 2013</copyright>
-        <dependencies>
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="dlls\Emby.XmlTv.dll" target="lib\portable-net45+netstandard2.0+win8\Emby.XmlTv.dll" />
-    </files>
-</package>

Emby.XmlTv/README.md

@@ -1 +0,0 @@
-# Emby.XmlTv

Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,4 +23,16 @@
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
   </ItemGroup>
 
+  <!-- Code analysers-->
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7" PrivateAssets="All" />
+    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
 </Project>

Jellyfin.Drawing.Skia/PercentPlayedDrawer.cs

@@ -4,10 +4,19 @@ using SkiaSharp;
 
 namespace Jellyfin.Drawing.Skia
 {
+    /// <summary>
+    /// Static helper class used to draw percentage-played indicators on images.
+    /// </summary>
     public static class PercentPlayedDrawer
     {
         private const int IndicatorHeight = 8;
 
+        /// <summary>
+        /// Draw a percentage played indicator on a canvas.
+        /// </summary>
+        /// <param name="canvas">The canvas to draw the indicator on.</param>
+        /// <param name="imageSize">The size of the image being drawn on.</param>
+        /// <param name="percent">The percentage played to display with the indicator.</param>
         public static void Process(SKCanvas canvas, ImageDimensions imageSize, double percent)
         {
             using (var paint = new SKPaint())

Jellyfin.Drawing.Skia/PlayedIndicatorDrawer.cs

@@ -3,10 +3,21 @@ using SkiaSharp;
 
 namespace Jellyfin.Drawing.Skia
 {
+    /// <summary>
+    /// Static helper class for drawing 'played' indicators.
+    /// </summary>
     public static class PlayedIndicatorDrawer
     {
         private const int OffsetFromTopRightCorner = 38;
 
+        /// <summary>
+        /// Draw a 'played' indicator in the top right corner of a canvas.
+        /// </summary>
+        /// <param name="canvas">The canvas to draw the indicator on.</param>
+        /// <param name="imageSize">
+        /// The dimensions of the image to draw the indicator on. The width is used to determine the x-position of the
+        /// indicator.
+        /// </param>
         public static void DrawPlayedIndicator(SKCanvas canvas, ImageDimensions imageSize)
         {
             var x = imageSize.Width - OffsetFromTopRightCorner;
@@ -26,10 +37,10 @@ namespace Jellyfin.Drawing.Skia
                 paint.TextSize = 30;
                 paint.IsAntialias = true;
 
+                // or:
+                // var emojiChar = 0x1F680;
                 var text = "✔️";
                 var emojiChar = StringUtilities.GetUnicodeCharacterCode(text, SKTextEncoding.Utf32);
-                // or:
-                //var emojiChar = 0x1F680;
 
                 // ask the font manager for a font with that character
                 var fontManager = SKFontManager.Default;

Jellyfin.Drawing.Skia/SkiaCodecException.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using SkiaSharp;
 
@@ -8,16 +9,10 @@ namespace Jellyfin.Drawing.Skia
     /// </summary>
     public class SkiaCodecException : SkiaException
     {
-        /// <summary>
-        /// Returns the non-successfull codec result returned by Skia.
-        /// </summary>
-        /// <value>The non-successfull codec result returned by Skia.</value>
-        public SKCodecResult CodecResult { get; }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="SkiaCodecException" /> class.
         /// </summary>
-        /// <param name="result">The non-successfull codec result returned by Skia.</param>
+        /// <param name="result">The non-successful codec result returned by Skia.</param>
         public SkiaCodecException(SKCodecResult result) : base()
         {
             CodecResult = result;
@@ -27,7 +22,7 @@ namespace Jellyfin.Drawing.Skia
         /// Initializes a new instance of the <see cref="SkiaCodecException" /> class
         /// with a specified error message.
         /// </summary>
-        /// <param name="result">The non-successfull codec result returned by Skia.</param>
+        /// <param name="result">The non-successful codec result returned by Skia.</param>
         /// <param name="message">The message that describes the error.</param>
         public SkiaCodecException(SKCodecResult result, string message)
             : base(message)
@@ -35,6 +30,11 @@ namespace Jellyfin.Drawing.Skia
             CodecResult = result;
         }
 
+        /// <summary>
+        /// Gets the non-successful codec result returned by Skia.
+        /// </summary>
+        public SKCodecResult CodecResult { get; }
+
         /// <inheritdoc />
         public override string ToString()
             => string.Format(

Jellyfin.Drawing.Skia/SkiaEncoder.cs

@@ -13,6 +13,9 @@ using static Jellyfin.Drawing.Skia.SkiaHelper;
 
 namespace Jellyfin.Drawing.Skia
 {
+    /// <summary>
+    /// Image encoder that uses <see cref="SkiaSharp"/> to manipulate images.
+    /// </summary>
     public class SkiaEncoder : IImageEncoder
     {
         private readonly ILogger _logger;
@@ -22,6 +25,12 @@ namespace Jellyfin.Drawing.Skia
         private static readonly HashSet<string> _transparentImageTypes
             = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".png", ".gif", ".webp" };
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SkiaEncoder"/> class.
+        /// </summary>
+        /// <param name="logger">The application logger.</param>
+        /// <param name="appPaths">The application paths.</param>
+        /// <param name="localizationManager">The application localization manager.</param>
         public SkiaEncoder(
             ILogger<SkiaEncoder> logger,
             IApplicationPaths appPaths,
@@ -32,12 +41,16 @@ namespace Jellyfin.Drawing.Skia
             _localizationManager = localizationManager;
         }
 
+        /// <inheritdoc/>
         public string Name => "Skia";
 
+        /// <inheritdoc/>
         public bool SupportsImageCollageCreation => true;
 
+        /// <inheritdoc/>
         public bool SupportsImageEncoding => true;
 
+        /// <inheritdoc/>
         public IReadOnlyCollection<string> SupportedInputFormats =>
             new HashSet<string>(StringComparer.OrdinalIgnoreCase)
             {
@@ -65,11 +78,12 @@ namespace Jellyfin.Drawing.Skia
                 "arw"
             };
 
+        /// <inheritdoc/>
         public IReadOnlyCollection<ImageFormat> SupportedOutputFormats
             => new HashSet<ImageFormat>() { ImageFormat.Webp, ImageFormat.Jpg, ImageFormat.Png };
 
         /// <summary>
-        /// Test to determine if the native lib is available
+        /// Test to determine if the native lib is available.
         /// </summary>
         public static void TestSkia()
         {
@@ -80,6 +94,11 @@ namespace Jellyfin.Drawing.Skia
         private static bool IsTransparent(SKColor color)
             => (color.Red == 255 && color.Green == 255 && color.Blue == 255) || color.Alpha == 0;
 
+        /// <summary>
+        /// Convert a <see cref="ImageFormat"/> to a <see cref="SKEncodedImageFormat"/>.
+        /// </summary>
+        /// <param name="selectedFormat">The format to convert.</param>
+        /// <returns>The converted format.</returns>
         public static SKEncodedImageFormat GetImageFormat(ImageFormat selectedFormat)
         {
             switch (selectedFormat)
@@ -186,6 +205,9 @@ namespace Jellyfin.Drawing.Skia
         }
 
         /// <inheritdoc />
+        /// <exception cref="ArgumentNullException">The path is null.</exception>
+        /// <exception cref="FileNotFoundException">The path is not valid.</exception>
+        /// <exception cref="SkiaCodecException">The file at the specified path could not be used to generate a codec.</exception>
         public ImageDimensions GetImageSize(string path)
         {
             if (path == null)
@@ -269,6 +291,14 @@ namespace Jellyfin.Drawing.Skia
             }
         }
 
+        /// <summary>
+        /// Decode an image.
+        /// </summary>
+        /// <param name="path">The filepath of the image to decode.</param>
+        /// <param name="forceCleanBitmap">Whether to force clean the bitmap.</param>
+        /// <param name="orientation">The orientation of the image.</param>
+        /// <param name="origin">The detected origin of the image.</param>
+        /// <returns>The resulting bitmap of the image.</returns>
         internal SKBitmap Decode(string path, bool forceCleanBitmap, ImageOrientation? orientation, out SKEncodedOrigin origin)
         {
             if (!File.Exists(path))
@@ -358,16 +388,6 @@ namespace Jellyfin.Drawing.Skia
 
         private SKBitmap OrientImage(SKBitmap bitmap, SKEncodedOrigin origin)
         {
-            //var transformations = {
-            //    2: { rotate: 0, flip: true},
-            //    3: { rotate: 180, flip: false},
-            //    4: { rotate: 180, flip: true},
-            //    5: { rotate: 90, flip: true},
-            //    6: { rotate: 90, flip: false},
-            //    7: { rotate: 270, flip: true},
-            //    8: { rotate: 270, flip: false},
-            //}
-
             switch (origin)
             {
                 case SKEncodedOrigin.TopRight:
@@ -497,6 +517,7 @@ namespace Jellyfin.Drawing.Skia
             }
         }
 
+        /// <inheritdoc/>
         public string EncodeImage(string inputPath, DateTime dateModified, string outputPath, bool autoOrient, ImageOrientation? orientation, int quality, ImageProcessingOptions options, ImageFormat selectedOutputFormat)
         {
             if (string.IsNullOrWhiteSpace(inputPath))
@@ -520,7 +541,7 @@ namespace Jellyfin.Drawing.Skia
             {
                 if (bitmap == null)
                 {
-                    throw new ArgumentOutOfRangeException(string.Format("Skia unable to read image {0}", inputPath));
+                    throw new ArgumentOutOfRangeException($"Skia unable to read image {inputPath}");
                 }
 
                 var originalImageSize = new ImageDimensions(bitmap.Width, bitmap.Height);
@@ -556,7 +577,7 @@ namespace Jellyfin.Drawing.Skia
                     }
 
                     // create bitmap to use for canvas drawing used to draw into bitmap
-                    using (var saveBitmap = new SKBitmap(width, height))//, bitmap.ColorType, bitmap.AlphaType))
+                    using (var saveBitmap = new SKBitmap(width, height)) // , bitmap.ColorType, bitmap.AlphaType))
                     using (var canvas = new SKCanvas(saveBitmap))
                     {
                         // set background color if present
@@ -609,9 +630,11 @@ namespace Jellyfin.Drawing.Skia
                     }
                 }
             }
+
             return outputPath;
         }
 
+        /// <inheritdoc/>
         public void CreateImageCollage(ImageCollageOptions options)
         {
             double ratio = (double)options.Width / options.Height;

Jellyfin.Drawing.Skia/SkiaException.cs

@@ -7,17 +7,30 @@ namespace Jellyfin.Drawing.Skia
     /// </summary>
     public class SkiaException : Exception
     {
-        /// <inheritdoc />
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SkiaException"/> class.
+        /// </summary>
         public SkiaException() : base()
         {
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SkiaException"/> class with a specified error message.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
         public SkiaException(string message) : base(message)
         {
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SkiaException"/> class with a specified error message and a
+        /// reference to the inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        /// <param name="innerException">
+        /// The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if
+        /// no inner exception is specified.
+        /// </param>
         public SkiaException(string message, Exception innerException)
             : base(message, innerException)
         {

Jellyfin.Drawing.Skia/StripCollageBuilder.cs

@@ -5,15 +5,27 @@ using SkiaSharp;
 
 namespace Jellyfin.Drawing.Skia
 {
+    /// <summary>
+    /// Used to build collages of multiple images arranged in vertical strips.
+    /// </summary>
     public class StripCollageBuilder
     {
         private readonly SkiaEncoder _skiaEncoder;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StripCollageBuilder"/> class.
+        /// </summary>
+        /// <param name="skiaEncoder">The encoder to use for building collages.</param>
         public StripCollageBuilder(SkiaEncoder skiaEncoder)
         {
             _skiaEncoder = skiaEncoder;
         }
 
+        /// <summary>
+        /// Check which format an image has been encoded with using its filename extension.
+        /// </summary>
+        /// <param name="outputPath">The path to the image to get the format for.</param>
+        /// <returns>The image format.</returns>
         public static SKEncodedImageFormat GetEncodedFormat(string outputPath)
         {
             if (outputPath == null)
@@ -48,6 +60,13 @@ namespace Jellyfin.Drawing.Skia
             return SKEncodedImageFormat.Png;
         }
 
+        /// <summary>
+        /// Create a square collage.
+        /// </summary>
+        /// <param name="paths">The paths of the images to use in the collage.</param>
+        /// <param name="outputPath">The path at which to place the resulting collage image.</param>
+        /// <param name="width">The desired width of the collage.</param>
+        /// <param name="height">The desired height of the collage.</param>
         public void BuildSquareCollage(string[] paths, string outputPath, int width, int height)
         {
             using (var bitmap = BuildSquareCollageBitmap(paths, width, height))
@@ -58,6 +77,13 @@ namespace Jellyfin.Drawing.Skia
             }
         }
 
+        /// <summary>
+        /// Create a thumb collage.
+        /// </summary>
+        /// <param name="paths">The paths of the images to use in the collage.</param>
+        /// <param name="outputPath">The path at which to place the resulting image.</param>
+        /// <param name="width">The desired width of the collage.</param>
+        /// <param name="height">The desired height of the collage.</param>
         public void BuildThumbCollage(string[] paths, string outputPath, int width, int height)
         {
             using (var bitmap = BuildThumbCollageBitmap(paths, width, height))
@@ -98,6 +124,7 @@ namespace Jellyfin.Drawing.Skia
                         using (var resizeBitmap = new SKBitmap(iWidth, iHeight, currentBitmap.ColorType, currentBitmap.AlphaType))
                         {
                             currentBitmap.ScalePixels(resizeBitmap, SKFilterQuality.High);
+
                             // crop image
                             int ix = (int)Math.Abs((iWidth - iSlice) / 2);
                             using (var image = SKImage.FromBitmap(resizeBitmap))

Jellyfin.Drawing.Skia/UnplayedCountIndicator.cs

@@ -4,10 +4,25 @@ using SkiaSharp;
 
 namespace Jellyfin.Drawing.Skia
 {
+    /// <summary>
+    /// Static helper class for drawing unplayed count indicators.
+    /// </summary>
     public static class UnplayedCountIndicator
     {
+        /// <summary>
+        /// The x-offset used when drawing an unplayed count indicator.
+        /// </summary>
         private const int OffsetFromTopRightCorner = 38;
 
+        /// <summary>
+        /// Draw an unplayed count indicator in the top right corner of a canvas.
+        /// </summary>
+        /// <param name="canvas">The canvas to draw the indicator on.</param>
+        /// <param name="imageSize">
+        /// The dimensions of the image to draw the indicator on. The width is used to determine the x-position of the
+        /// indicator.
+        /// </param>
+        /// <param name="count">The number to draw in the indicator.</param>
         public static void DrawUnplayedCountIndicator(SKCanvas canvas, ImageDimensions imageSize, int count)
         {
             var x = imageSize.Width - OffsetFromTopRightCorner;
@@ -19,6 +34,7 @@ namespace Jellyfin.Drawing.Skia
                 paint.Style = SKPaintStyle.Fill;
                 canvas.DrawCircle((float)x, OffsetFromTopRightCorner, 20, paint);
             }
+
             using (var paint = new SKPaint())
             {
                 paint.Color = new SKColor(255, 255, 255, 255);
@@ -33,6 +49,7 @@ namespace Jellyfin.Drawing.Skia
                 {
                     x -= 7;
                 }
+
                 if (text.Length == 2)
                 {
                     x -= 13;

Jellyfin.Server/Program.cs

@@ -7,6 +7,7 @@ using System.Net;
 using System.Net.Security;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -145,6 +146,10 @@ namespace Jellyfin.Server
 
             ApplicationHost.LogEnvironmentInfo(_logger, appPaths);
 
+            // Make sure we have all the code pages we can get
+            // Ref: https://docs.microsoft.com/en-us/dotnet/api/system.text.codepagesencodingprovider.instance?view=netcore-3.0#remarks
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
             // Increase the max http request limit
             // The default connection limit is 10 for ASP.NET hosted applications and 2 for all others.
             ServicePointManager.DefaultConnectionLimit = Math.Max(96, ServicePointManager.DefaultConnectionLimit);
@@ -456,9 +461,9 @@ namespace Jellyfin.Server
 
             return new ConfigurationBuilder()
                 .SetBasePath(appPaths.ConfigurationDirectoryPath)
+                .AddInMemoryCollection(ConfigurationOptions.Configuration)
                 .AddJsonFile("logging.json", false, true)
                 .AddEnvironmentVariables("JELLYFIN_")
-                .AddInMemoryCollection(ConfigurationOptions.Configuration)
                 .Build();
         }
 

MediaBrowser.Api/PackageService.cs

@@ -136,10 +136,11 @@ namespace MediaBrowser.Api
         /// <returns>System.Object.</returns>
         public object Get(GetPackage request)
         {
-            var packages = _installationManager.GetAvailablePackages().Result;
-
-            var result = packages.FirstOrDefault(p => string.Equals(p.guid, request.AssemblyGuid ?? "none", StringComparison.OrdinalIgnoreCase))
-                         ?? packages.FirstOrDefault(p => p.name.Equals(request.Name, StringComparison.OrdinalIgnoreCase));
+            var packages = _installationManager.GetAvailablePackages().GetAwaiter().GetResult();
+            var result = _installationManager.FilterPackages(
+                packages,
+                request.Name,
+                string.IsNullOrEmpty(request.AssemblyGuid) ? default : Guid.Parse(request.AssemblyGuid)).FirstOrDefault();
 
             return ToOptimizedResult(result);
         }
@@ -184,7 +185,7 @@ namespace MediaBrowser.Api
             var package = _installationManager.GetCompatibleVersions(
                     packages,
                     request.Name,
-                    new Guid(request.AssemblyGuid),
+                    string.IsNullOrEmpty(request.AssemblyGuid) ? Guid.Empty : Guid.Parse(request.AssemblyGuid),
                     string.IsNullOrEmpty(request.Version) ? null : Version.Parse(request.Version),
                     request.UpdateClass).FirstOrDefault();
 

MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -63,8 +63,6 @@ namespace MediaBrowser.Api.Playback
 
         protected IDeviceManager DeviceManager { get; private set; }
 
-        protected ISubtitleEncoder SubtitleEncoder { get; private set; }
-
         protected IMediaSourceManager MediaSourceManager { get; private set; }
 
         protected IJsonSerializer JsonSerializer { get; private set; }
@@ -92,11 +90,11 @@ namespace MediaBrowser.Api.Playback
             IMediaEncoder mediaEncoder,
             IFileSystem fileSystem,
             IDlnaManager dlnaManager,
-            ISubtitleEncoder subtitleEncoder,
             IDeviceManager deviceManager,
             IMediaSourceManager mediaSourceManager,
             IJsonSerializer jsonSerializer,
-            IAuthorizationContext authorizationContext)
+            IAuthorizationContext authorizationContext,
+            EncodingHelper encodingHelper)
             : base(logger, serverConfigurationManager, httpResultFactory)
         {
             UserManager = userManager;
@@ -105,13 +103,12 @@ namespace MediaBrowser.Api.Playback
             MediaEncoder = mediaEncoder;
             FileSystem = fileSystem;
             DlnaManager = dlnaManager;
-            SubtitleEncoder = subtitleEncoder;
             DeviceManager = deviceManager;
             MediaSourceManager = mediaSourceManager;
             JsonSerializer = jsonSerializer;
             AuthorizationContext = authorizationContext;
 
-            EncodingHelper = new EncodingHelper(MediaEncoder, FileSystem, SubtitleEncoder);
+            EncodingHelper = encodingHelper;
         }
 
         /// <summary>
@@ -148,8 +145,6 @@ namespace MediaBrowser.Api.Playback
             return Path.Combine(folder, filename + ext);
         }
 
-        protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
-
         protected virtual string GetDefaultEncoderPreset()
         {
             return "superfast";
@@ -764,13 +759,13 @@ namespace MediaBrowser.Api.Playback
 
                 if (mediaSource == null)
                 {
-                    var mediaSources = (await MediaSourceManager.GetPlayackMediaSources(LibraryManager.GetItemById(request.Id), null, false, false, cancellationToken).ConfigureAwait(false)).ToList();
+                    var mediaSources = await MediaSourceManager.GetPlayackMediaSources(LibraryManager.GetItemById(request.Id), null, false, false, cancellationToken).ConfigureAwait(false);
 
                     mediaSource = string.IsNullOrEmpty(request.MediaSourceId)
                        ? mediaSources[0]
                        : mediaSources.Find(i => string.Equals(i.Id, request.MediaSourceId));
 
-                    if (mediaSource == null && request.MediaSourceId.Equals(request.Id))
+                    if (mediaSource == null && Guid.Parse(request.MediaSourceId) == request.Id)
                     {
                         mediaSource = mediaSources[0];
                     }

MediaBrowser.Api/Playback/Hls/BaseHlsService.cs

@@ -34,26 +34,26 @@ namespace MediaBrowser.Api.Playback.Hls
             IMediaEncoder mediaEncoder,
             IFileSystem fileSystem,
             IDlnaManager dlnaManager,
-            ISubtitleEncoder subtitleEncoder,
             IDeviceManager deviceManager,
             IMediaSourceManager mediaSourceManager,
             IJsonSerializer jsonSerializer,
-            IAuthorizationContext authorizationContext)
-                : base(
-                    logger,
-                    serverConfigurationManager,
-                    httpResultFactory,
-                    userManager,
-                    libraryManager,
-                    isoManager,
-                    mediaEncoder,
-                    fileSystem,
-                    dlnaManager,
-                    subtitleEncoder,
-                    deviceManager,
-                    mediaSourceManager,
-                    jsonSerializer,
-                    authorizationContext)
+            IAuthorizationContext authorizationContext,
+            EncodingHelper encodingHelper)
+            : base(
+                logger,
+                serverConfigurationManager,
+                httpResultFactory,
+                userManager,
+                libraryManager,
+                isoManager,
+                mediaEncoder,
+                fileSystem,
+                dlnaManager,
+                deviceManager,
+                mediaSourceManager,
+                jsonSerializer,
+                authorizationContext,
+                encodingHelper)
         {
         }
 

MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs

@@ -104,12 +104,12 @@ namespace MediaBrowser.Api.Playback.Hls
             IMediaEncoder mediaEncoder,
             IFileSystem fileSystem,
             IDlnaManager dlnaManager,
-            ISubtitleEncoder subtitleEncoder,
             IDeviceManager deviceManager,
             IMediaSourceManager mediaSourceManager,
             IJsonSerializer jsonSerializer,
             IAuthorizationContext authorizationContext,
-            INetworkManager networkManager)
+            INetworkManager networkManager,
+            EncodingHelper encodingHelper)
             : base(
                 logger,
                 serverConfigurationManager,
@@ -120,11 +120,11 @@ namespace MediaBrowser.Api.Playback.Hls
                 mediaEncoder,
                 fileSystem,
                 dlnaManager,
-                subtitleEncoder,
                 deviceManager,
                 mediaSourceManager,
                 jsonSerializer,
-                authorizationContext)
+                authorizationContext,
+                encodingHelper)
         {
             NetworkManager = networkManager;
         }
@@ -949,7 +949,17 @@ namespace MediaBrowser.Api.Playback.Hls
 
                 var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
 
-                args += " " + EncodingHelper.GetVideoQualityParam(state, codec, encodingOptions, GetDefaultEncoderPreset()) + keyFrameArg;
+                args += " " + EncodingHelper.GetVideoQualityParam(state, codec, encodingOptions, GetDefaultEncoderPreset());
+
+                // Unable to force key frames to h264_qsv transcode
+                if (string.Equals(codec, "h264_qsv", StringComparison.OrdinalIgnoreCase))
+                {
+                    Logger.LogInformation("Bug Workaround: Disabling force_key_frames for h264_qsv"); 
+                } 
+                else
+                {
+                    args += " " + keyFrameArg;
+                } 
 
                 //args += " -mixed-refs 0 -refs 3 -x264opts b_pyramid=0:weightb=0:weightp=0";
 

MediaBrowser.Api/Playback/Hls/VideoHlsService.cs

@@ -27,6 +27,39 @@ namespace MediaBrowser.Api.Playback.Hls
     [Authenticated]
     public class VideoHlsService : BaseHlsService
     {
+        public VideoHlsService(
+            ILogger<VideoHlsService> logger,
+            IServerConfigurationManager serverConfigurationManager,
+            IHttpResultFactory httpResultFactory,
+            IUserManager userManager,
+            ILibraryManager libraryManager,
+            IIsoManager isoManager,
+            IMediaEncoder mediaEncoder,
+            IFileSystem fileSystem,
+            IDlnaManager dlnaManager,
+            IDeviceManager deviceManager,
+            IMediaSourceManager mediaSourceManager,
+            IJsonSerializer jsonSerializer,
+            IAuthorizationContext authorizationContext,
+            EncodingHelper encodingHelper)
+            : base(
+                logger,
+                serverConfigurationManager,
+                httpResultFactory,
+                userManager,
+                libraryManager,
+                isoManager,
+                mediaEncoder,
+                fileSystem,
+                dlnaManager,
+                deviceManager,
+                mediaSourceManager,
+                jsonSerializer,
+                authorizationContext,
+                encodingHelper)
+        {
+        }
+
         public Task<object> Get(GetLiveHlsStream request)
         {
             return ProcessRequestAsync(request, true);
@@ -136,38 +169,5 @@ namespace MediaBrowser.Api.Playback.Hls
 
             return args;
         }
-
-        public VideoHlsService(
-            ILogger<VideoHlsService> logger,
-            IServerConfigurationManager serverConfigurationManager,
-            IHttpResultFactory httpResultFactory,
-            IUserManager userManager,
-            ILibraryManager libraryManager,
-            IIsoManager isoManager,
-            IMediaEncoder mediaEncoder,
-            IFileSystem fileSystem,
-            IDlnaManager dlnaManager,
-            ISubtitleEncoder subtitleEncoder,
-            IDeviceManager deviceManager,
-            IMediaSourceManager mediaSourceManager,
-            IJsonSerializer jsonSerializer,
-            IAuthorizationContext authorizationContext)
-                : base(
-                    logger,
-                    serverConfigurationManager,
-                    httpResultFactory,
-                    userManager,
-                    libraryManager,
-                    isoManager,
-                    mediaEncoder,
-                    fileSystem,
-                    dlnaManager,
-                    subtitleEncoder,
-                    deviceManager,
-                    mediaSourceManager,
-                    jsonSerializer,
-                    authorizationContext)
-        {
-        }
     }
 }

MediaBrowser.Api/Playback/Progressive/AudioService.cs

@@ -43,11 +43,11 @@ namespace MediaBrowser.Api.Playback.Progressive
             IMediaEncoder mediaEncoder,
             IFileSystem fileSystem,
             IDlnaManager dlnaManager,
-            ISubtitleEncoder subtitleEncoder,
             IDeviceManager deviceManager,
             IMediaSourceManager mediaSourceManager,
             IJsonSerializer jsonSerializer,
-            IAuthorizationContext authorizationContext)
+            IAuthorizationContext authorizationContext,
+            EncodingHelper encodingHelper)
             : base(
                 logger,
                 serverConfigurationManager,
@@ -59,11 +59,11 @@ namespace MediaBrowser.Api.Playback.Progressive
                 mediaEncoder,
                 fileSystem,
                 dlnaManager,
-                subtitleEncoder,
                 deviceManager,
                 mediaSourceManager,
                 jsonSerializer,
-                authorizationContext)
+                authorizationContext,
+                encodingHelper)
         {
         }
 

MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs

@@ -38,11 +38,11 @@ namespace MediaBrowser.Api.Playback.Progressive
             IMediaEncoder mediaEncoder,
             IFileSystem fileSystem,
             IDlnaManager dlnaManager,
-            ISubtitleEncoder subtitleEncoder,
             IDeviceManager deviceManager,
             IMediaSourceManager mediaSourceManager,
             IJsonSerializer jsonSerializer,
-            IAuthorizationContext authorizationContext)
+            IAuthorizationContext authorizationContext,
+            EncodingHelper encodingHelper)
             : base(
                 logger,
                 serverConfigurationManager,
@@ -53,11 +53,11 @@ namespace MediaBrowser.Api.Playback.Progressive
                 mediaEncoder,
                 fileSystem,
                 dlnaManager,
-                subtitleEncoder,
                 deviceManager,
                 mediaSourceManager,
                 jsonSerializer,
-                authorizationContext)
+                authorizationContext,
+                encodingHelper)
         {
             HttpClient = httpClient;
         }

MediaBrowser.Api/Playback/Progressive/VideoService.cs

@@ -80,11 +80,11 @@ namespace MediaBrowser.Api.Playback.Progressive
             IMediaEncoder mediaEncoder,
             IFileSystem fileSystem,
             IDlnaManager dlnaManager,
-            ISubtitleEncoder subtitleEncoder,
             IDeviceManager deviceManager,
             IMediaSourceManager mediaSourceManager,
             IJsonSerializer jsonSerializer,
-            IAuthorizationContext authorizationContext)
+            IAuthorizationContext authorizationContext,
+            EncodingHelper encodingHelper)
             : base(
                 logger,
                 serverConfigurationManager,
@@ -96,11 +96,11 @@ namespace MediaBrowser.Api.Playback.Progressive
                 mediaEncoder,
                 fileSystem,
                 dlnaManager,
-                subtitleEncoder,
                 deviceManager,
                 mediaSourceManager,
                 jsonSerializer,
-                authorizationContext)
+                authorizationContext,
+                encodingHelper)
         {
         }
 

MediaBrowser.Api/Playback/UniversalAudioService.cs

@@ -9,7 +9,6 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
@@ -75,6 +74,9 @@ namespace MediaBrowser.Api.Playback
     [Authenticated]
     public class UniversalAudioService : BaseApiService
     {
+        private readonly ILoggerFactory _loggerFactory;
+        private readonly EncodingHelper _encodingHelper;
+
         public UniversalAudioService(
             ILogger<UniversalAudioService> logger,
             IServerConfigurationManager serverConfigurationManager,
@@ -87,11 +89,11 @@ namespace MediaBrowser.Api.Playback
             IFileSystem fileSystem,
             IDlnaManager dlnaManager,
             IDeviceManager deviceManager,
-            ISubtitleEncoder subtitleEncoder,
             IMediaSourceManager mediaSourceManager,
             IJsonSerializer jsonSerializer,
             IAuthorizationContext authorizationContext,
-            INetworkManager networkManager)
+            INetworkManager networkManager,
+            EncodingHelper encodingHelper)
             : base(logger, serverConfigurationManager, httpResultFactory)
         {
             HttpClient = httpClient;
@@ -102,11 +104,11 @@ namespace MediaBrowser.Api.Playback
             FileSystem = fileSystem;
             DlnaManager = dlnaManager;
             DeviceManager = deviceManager;
-            SubtitleEncoder = subtitleEncoder;
             MediaSourceManager = mediaSourceManager;
             JsonSerializer = jsonSerializer;
             AuthorizationContext = authorizationContext;
             NetworkManager = networkManager;
+            _encodingHelper = encodingHelper;
         }
 
         protected IHttpClient HttpClient { get; private set; }
@@ -117,7 +119,6 @@ namespace MediaBrowser.Api.Playback
         protected IFileSystem FileSystem { get; private set; }
         protected IDlnaManager DlnaManager { get; private set; }
         protected IDeviceManager DeviceManager { get; private set; }
-        protected ISubtitleEncoder SubtitleEncoder { get; private set; }
         protected IMediaSourceManager MediaSourceManager { get; private set; }
         protected IJsonSerializer JsonSerializer { get; private set; }
         protected IAuthorizationContext AuthorizationContext { get; private set; }
@@ -287,12 +288,12 @@ namespace MediaBrowser.Api.Playback
                     MediaEncoder,
                     FileSystem,
                     DlnaManager,
-                    SubtitleEncoder,
                     DeviceManager,
                     MediaSourceManager,
                     JsonSerializer,
                     AuthorizationContext,
-                    NetworkManager)
+                    NetworkManager,
+                    _encodingHelper)
                 {
                     Request = Request
                 };
@@ -337,11 +338,11 @@ namespace MediaBrowser.Api.Playback
                     MediaEncoder,
                     FileSystem,
                     DlnaManager,
-                    SubtitleEncoder,
                     DeviceManager,
                     MediaSourceManager,
                     JsonSerializer,
-                    AuthorizationContext)
+                    AuthorizationContext,
+                    _encodingHelper)
                 {
                     Request = Request
                 };

MediaBrowser.Api/UserLibrary/ItemsService.cs

@@ -119,6 +119,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var result = new QueryResult<BaseItemDto>
             {
+                StartIndex = request.StartIndex.GetValueOrDefault(),
                 TotalRecordCount = itemsResult.TotalRecordCount,
                 Items = returnItems
             };
@@ -169,6 +170,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             return new QueryResult<BaseItemDto>
             {
+                StartIndex = request.StartIndex.GetValueOrDefault(),
                 TotalRecordCount = result.TotalRecordCount,
                 Items = dtoList
             };
@@ -229,7 +231,8 @@ namespace MediaBrowser.Api.UserLibrary
                 return new QueryResult<BaseItem>
                 {
                     Items = Array.Empty<BaseItem>(),
-                    TotalRecordCount = 0
+                    TotalRecordCount = 0,
+                    StartIndex = 0
                 };
             }
 
@@ -242,7 +245,8 @@ namespace MediaBrowser.Api.UserLibrary
             return new QueryResult<BaseItem>
             {
                 Items = itemsArray,
-                TotalRecordCount = itemsArray.Length
+                TotalRecordCount = itemsArray.Length,
+                StartIndex = 0
             };
         }
 

MediaBrowser.Controller/Drawing/IImageEncoder.cs

@@ -11,6 +11,7 @@ namespace MediaBrowser.Controller.Drawing
         /// </summary>
         /// <value>The supported input formats.</value>
         IReadOnlyCollection<string> SupportedInputFormats { get; }
+
         /// <summary>
         /// Gets the supported output formats.
         /// </summary>
@@ -18,9 +19,9 @@ namespace MediaBrowser.Controller.Drawing
         IReadOnlyCollection<ImageFormat> SupportedOutputFormats { get; }
 
         /// <summary>
-        /// Gets the name.
+        /// Gets the display name for the encoder.
         /// </summary>
-        /// <value>The name.</value>
+        /// <value>The display name.</value>
         string Name { get; }
 
         /// <summary>
@@ -35,17 +36,22 @@ namespace MediaBrowser.Controller.Drawing
         /// <value><c>true</c> if [supports image encoding]; otherwise, <c>false</c>.</value>
         bool SupportsImageEncoding { get; }
 
+        /// <summary>
+        /// Get the dimensions of an image from the filesystem.
+        /// </summary>
+        /// <param name="path">The filepath of the image.</param>
+        /// <returns>The image dimensions.</returns>
         ImageDimensions GetImageSize(string path);
 
         /// <summary>
-        /// Encodes the image.
+        /// Encode an image.
         /// </summary>
         string EncodeImage(string inputPath, DateTime dateModified, string outputPath, bool autoOrient, ImageOrientation? orientation, int quality, ImageProcessingOptions options, ImageFormat outputFormat);
 
         /// <summary>
-        /// Creates the image collage.
+        /// Create an image collage.
         /// </summary>
-        /// <param name="options">The options.</param>
+        /// <param name="options">The options to use when creating the collage.</param>
         void CreateImageCollage(ImageCollageOptions options);
     }
 }

MediaBrowser.Controller/Entities/Video.cs

@@ -137,7 +137,7 @@ namespace MediaBrowser.Controller.Entities
         /// <value>The video3 D format.</value>
         public Video3DFormat? Video3DFormat { get; set; }
 
-        public string[] GetPlayableStreamFileNames(IMediaEncoder mediaEncoder)
+        public string[] GetPlayableStreamFileNames()
         {
             var videoType = VideoType;
 
@@ -153,7 +153,8 @@ namespace MediaBrowser.Controller.Entities
             {
                 return Array.Empty<string>();
             }
-            return mediaEncoder.GetPlayableStreamFileNames(Path, videoType);
+
+            throw new NotImplementedException();
         }
 
         /// <summary>

MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs

@@ -0,0 +1,36 @@
+using Microsoft.Extensions.Configuration;
+
+namespace MediaBrowser.Controller.Extensions
+{
+    /// <summary>
+    /// Configuration extensions for <c>MediaBrowser.Controller</c>.
+    /// </summary>
+    public static class ConfigurationExtensions
+    {
+        /// <summary>
+        /// The key for the FFmpeg probe size option.
+        /// </summary>
+        public const string FfmpegProbeSizeKey = "FFmpeg:probesize";
+
+        /// <summary>
+        /// The key for the FFmpeg analyse duration option.
+        /// </summary>
+        public const string FfmpegAnalyzeDurationKey = "FFmpeg:analyzeduration";
+
+        /// <summary>
+        /// Retrieves the FFmpeg probe size from the <see cref="IConfiguration" />.
+        /// </summary>
+        /// <param name="configuration">This configuration.</param>
+        /// <returns>The FFmpeg probe size option.</returns>
+        public static string GetFFmpegProbeSize(this IConfiguration configuration)
+            => configuration[FfmpegProbeSizeKey];
+
+        /// <summary>
+        /// Retrieves the FFmpeg analyse duration from the <see cref="IConfiguration" />.
+        /// </summary>
+        /// <param name="configuration">This configuration.</param>
+        /// <returns>The FFmpeg analyse duration option.</returns>
+        public static string GetFFmpegAnalyzeDuration(this IConfiguration configuration)
+            => configuration[FfmpegAnalyzeDurationKey];
+    }
+}

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -7,6 +7,10 @@
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -6,12 +6,14 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
+using Microsoft.Extensions.Configuration;
 
 namespace MediaBrowser.Controller.MediaEncoding
 {
@@ -22,6 +24,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IFileSystem _fileSystem;
         private readonly ISubtitleEncoder _subtitleEncoder;
+        private readonly IConfiguration _configuration;
 
         private static readonly string[] _videoProfiles = new[]
         {
@@ -34,11 +37,16 @@ namespace MediaBrowser.Controller.MediaEncoding
             "ConstrainedHigh"
         };
 
-        public EncodingHelper(IMediaEncoder mediaEncoder, IFileSystem fileSystem, ISubtitleEncoder subtitleEncoder)
+        public EncodingHelper(
+            IMediaEncoder mediaEncoder,
+            IFileSystem fileSystem,
+            ISubtitleEncoder subtitleEncoder,
+            IConfiguration configuration)
         {
             _mediaEncoder = mediaEncoder;
             _fileSystem = fileSystem;
             _subtitleEncoder = subtitleEncoder;
+            _configuration = configuration;
         }
 
         public string GetH264Encoder(EncodingJobInfo state, EncodingOptions encodingOptions)
@@ -172,7 +180,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             return string.Empty;
         }
 
-        public string GetInputFormat(string container)
+        public static string GetInputFormat(string container)
         {
             if (string.IsNullOrEmpty(container))
             {
@@ -467,6 +475,27 @@ namespace MediaBrowser.Controller.MediaEncoding
                     .Append(' ');
             }
 
+            if (state.IsVideoRequest 
+                && string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
+            {
+                var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, encodingOptions);
+                var outputVideoCodec = GetVideoEncoder(state, encodingOptions);
+
+                if (encodingOptions.EnableHardwareEncoding && outputVideoCodec.Contains("qsv", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (!string.IsNullOrEmpty(videoDecoder) && videoDecoder.Contains("qsv", StringComparison.OrdinalIgnoreCase))
+                    {
+                        arg.Append("-hwaccel qsv ");
+                    } 
+                    else 
+                    {
+                        arg.Append("-init_hw_device qsv=hw -filter_hw_device hw ");
+                    }	
+                }
+
+                arg.Append(videoDecoder + " ");
+            }
+
             arg.Append("-i ")
                 .Append(GetInputPathArgument(state));
 
@@ -641,7 +670,11 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (!string.IsNullOrEmpty(state.SubtitleStream.Language))
                 {
-                    var charenc = _subtitleEncoder.GetSubtitleFileCharacterSet(subtitlePath, state.SubtitleStream.Language, state.MediaSource.Protocol, CancellationToken.None).Result;
+                    var charenc = _subtitleEncoder.GetSubtitleFileCharacterSet(
+                        subtitlePath,
+                        state.SubtitleStream.Language,
+                        state.MediaSource.Protocol,
+                        CancellationToken.None).GetAwaiter().GetResult();
 
                     if (!string.IsNullOrEmpty(charenc))
                     {
@@ -1562,6 +1595,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             var videoSizeParam = string.Empty;
 
+            // Setup subtitle scaling
             if (state.VideoStream != null && state.VideoStream.Width.HasValue && state.VideoStream.Height.HasValue)
             {
                 videoSizeParam = string.Format(
@@ -1570,7 +1604,11 @@ namespace MediaBrowser.Controller.MediaEncoding
                     state.VideoStream.Width.Value,
                     state.VideoStream.Height.Value);
 
-                videoSizeParam += ":force_original_aspect_ratio=decrease";
+                //For QSV, feed it into hardware encoder now
+                if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase))
+                {
+                    videoSizeParam += ",hwupload=extra_hw_frames=64";
+                }
             }
 
             var mapPrefix = state.SubtitleStream.IsExternal ?
@@ -1581,9 +1619,31 @@ namespace MediaBrowser.Controller.MediaEncoding
                 ? 0
                 : state.SubtitleStream.Index;
 
+            var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, options);
+
+            // Setup default filtergraph utilizing FFMpeg overlay() and FFMpeg scale() (see the return of this function for index reference)
+            var retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}][sub]overlay{3}\"";
+
+            if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase)) 
+            {
+                /*
+                    QSV in FFMpeg can now setup hardware overlay for transcodes.
+                    For software decoding and hardware encoding option, frames must be hwuploaded into hardware
+                    with fixed frame size. 
+                */
+                if (!string.IsNullOrEmpty(videoDecoder) && videoDecoder.Contains("qsv", StringComparison.OrdinalIgnoreCase))
+                {
+                    retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}][sub]overlay_qsv=x=(W-w)/2:y=(H-h)/2{3}\"";
+                } 
+                else 
+                {
+                    retStr = " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}]hwupload=extra_hw_frames=64[v];[v][sub]overlay_qsv=x=(W-w)/2:y=(H-h)/2{3}\"";
+                }
+            } 
+
             return string.Format(
                 CultureInfo.InvariantCulture,
-                " -filter_complex \"[{0}:{1}]{4}[sub];[0:{2}][sub]overlay{3}\"",
+                retStr,
                 mapPrefix,
                 subtitleStreamIndex,
                 state.VideoStream.Index,
@@ -1647,31 +1707,34 @@ namespace MediaBrowser.Controller.MediaEncoding
                 requestedMaxWidth,
                 requestedMaxHeight);
 
-            if (string.Equals(videoEncoder, "h264_vaapi", StringComparison.OrdinalIgnoreCase)
+            if ((string.Equals(videoEncoder, "h264_vaapi", StringComparison.OrdinalIgnoreCase) || string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase))
                 && width.HasValue
                 && height.HasValue)
             {
-                // Work around vaapi's reduced scaling features
-                var scaler = "scale_vaapi";
-
                 // Given the input dimensions (inputWidth, inputHeight), determine the output dimensions
                 // (outputWidth, outputHeight). The user may request precise output dimensions or maximum
                 // output dimensions. Output dimensions are guaranteed to be even.
                 var outputWidth = width.Value;
                 var outputHeight = height.Value;
+                var vaapi_or_qsv = string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) ? "qsv" : "vaapi";
 
                 if (!videoWidth.HasValue
                     || outputWidth != videoWidth.Value
                     || !videoHeight.HasValue
                     || outputHeight != videoHeight.Value)
                 {
+                    // Force nv12 pixel format to enable 10-bit to 8-bit colour conversion.
                     filters.Add(
                         string.Format(
                             CultureInfo.InvariantCulture,
-                            "{0}=w={1}:h={2}",
-                            scaler,
+                            "scale_{0}=w={1}:h={2}:format=nv12",
+                            vaapi_or_qsv,
                             outputWidth,
                             outputHeight));
+                } 
+                else 
+                {
+                    filters.Add(string.Format(CultureInfo.InvariantCulture, "scale_{0}=format=nv12", vaapi_or_qsv));
                 }
             }
             else if ((videoDecoder ?? string.Empty).IndexOf("_cuvid", StringComparison.OrdinalIgnoreCase) != -1
@@ -1897,7 +1960,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 // If transcoding from 10 bit, transform colour spaces too
                 if (!string.IsNullOrEmpty(videoStream.PixelFormat)
                     && videoStream.PixelFormat.IndexOf("p10", StringComparison.OrdinalIgnoreCase) != -1
-                    && string.Equals(outputVideoCodec,"libx264", StringComparison.OrdinalIgnoreCase))
+                    && string.Equals(outputVideoCodec, "libx264", StringComparison.OrdinalIgnoreCase))
                 {
                     filters.Add("format=p010le");
                     filters.Add("format=nv12");
@@ -1914,10 +1977,26 @@ namespace MediaBrowser.Controller.MediaEncoding
                 filters.Add("hwupload");
             }
 
-            if (state.DeInterlace("h264", true)
-                && string.Equals(outputVideoCodec, "h264_vaapi", StringComparison.OrdinalIgnoreCase))
+            var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, options);
+
+            // If we are software decoding, and hardware encoding	  
+            if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase) 
+                && (string.IsNullOrEmpty(videoDecoder) || !videoDecoder.Contains("qsv", StringComparison.OrdinalIgnoreCase)))
             {
-                filters.Add(string.Format(CultureInfo.InvariantCulture, "deinterlace_vaapi"));
+                filters.Add("format=nv12|qsv");
+                filters.Add("hwupload=extra_hw_frames=64");
+            }
+
+            if (state.DeInterlace("h264", true))
+            {
+                if (string.Equals(outputVideoCodec, "h264_vaapi", StringComparison.OrdinalIgnoreCase))
+                {
+                    filters.Add(string.Format(CultureInfo.InvariantCulture, "deinterlace_vaapi"));
+                }
+                else if (string.Equals(outputVideoCodec, "h264_qsv", StringComparison.OrdinalIgnoreCase))
+                {
+                    filters.Add(string.Format(CultureInfo.InvariantCulture, "deinterlace_qsv"));
+                }
             }
 
             if ((state.DeInterlace("h264", true) || state.DeInterlace("h265", true) || state.DeInterlace("hevc", true))
@@ -1940,13 +2019,13 @@ namespace MediaBrowser.Controller.MediaEncoding
             var inputHeight = videoStream?.Height;
             var threeDFormat = state.MediaSource.Video3DFormat;
 
-            var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, options);
-
             filters.AddRange(GetScalingFilters(inputWidth, inputHeight, threeDFormat, videoDecoder, outputVideoCodec, request.Width, request.Height, request.MaxWidth, request.MaxHeight));
 
             var output = string.Empty;
 
-            if (state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode)
+            if (state.SubtitleStream != null
+                && state.SubtitleStream.IsTextSubtitleStream
+                && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode)
             {
                 var subParam = GetTextSubtitleParam(state);
 
@@ -2035,11 +2114,11 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
         }
 
-        public static string GetProbeSizeArgument(int numInputFiles)
-            => numInputFiles > 1 ? "-probesize 1G" : "";
+        public string GetProbeSizeArgument(int numInputFiles)
+            => numInputFiles > 1 ? "-probesize " + _configuration.GetFFmpegProbeSize() : string.Empty;
 
-        public static string GetAnalyzeDurationArgument(int numInputFiles)
-            => numInputFiles > 1 ? "-analyzeduration 200M" : "";
+        public string GetAnalyzeDurationArgument(int numInputFiles)
+            => numInputFiles > 1 ? "-analyzeduration " + _configuration.GetFFmpegAnalyzeDuration() : string.Empty;
 
         public string GetInputModifier(EncodingJobInfo state, EncodingOptions encodingOptions)
         {
@@ -2134,6 +2213,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
 
             var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, encodingOptions);
+
             if (!string.IsNullOrEmpty(videoDecoder))
             {
                 inputModifier += " " + videoDecoder;

MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs

@@ -15,6 +15,9 @@ namespace MediaBrowser.Controller.MediaEncoding
     /// </summary>
     public interface IMediaEncoder : ITranscoderSupport
     {
+        /// <summary>
+        /// The location of the discovered FFmpeg tool.
+        /// </summary>
         FFmpegLocation EncoderLocation { get; }
 
         /// <summary>
@@ -97,7 +100,6 @@ namespace MediaBrowser.Controller.MediaEncoding
         void UpdateEncoderPath(string path, string pathType);
         bool SupportsEncoder(string encoder);
 
-        string[] GetPlayableStreamFileNames(string path, VideoType videoType);
         IEnumerable<string> GetPrimaryPlaylistVobFiles(string path, IIsoMount isoMount, uint? titleNumber);
     }
 }

MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.MediaEncoding.Probing;
 using MediaBrowser.Model.Configuration;
@@ -19,9 +19,9 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
@@ -31,55 +31,60 @@ namespace MediaBrowser.MediaEncoding.Encoder
     public class MediaEncoder : IMediaEncoder, IDisposable
     {
         /// <summary>
-        /// Gets the encoder path.
+        /// The default image extraction timeout in milliseconds.
         /// </summary>
-        /// <value>The encoder path.</value>
-        public string EncoderPath => FFmpegPath;
-
-        /// <summary>
-        /// The location of the discovered FFmpeg tool.
-        /// </summary>
-        public FFmpegLocation EncoderLocation { get; private set; }
+        internal const int DefaultImageExtractionTimeout = 5000;
 
         private readonly ILogger _logger;
-        private readonly IJsonSerializer _jsonSerializer;
-        private string FFmpegPath;
-        private string FFprobePath;
-        protected readonly IServerConfigurationManager ConfigurationManager;
-        protected readonly IFileSystem FileSystem;
-        protected readonly Func<ISubtitleEncoder> SubtitleEncoder;
-        protected readonly Func<IMediaSourceManager> MediaSourceManager;
+        private readonly IServerConfigurationManager _configurationManager;
+        private readonly IFileSystem _fileSystem;
         private readonly IProcessFactory _processFactory;
-        private readonly int DefaultImageExtractionTimeoutMs;
-        private readonly string StartupOptionFFmpegPath;
+        private readonly ILocalizationManager _localization;
+        private readonly Func<ISubtitleEncoder> _subtitleEncoder;
+        private readonly IConfiguration _configuration;
+        private readonly string _startupOptionFFmpegPath;
 
         private readonly SemaphoreSlim _thumbnailResourcePool = new SemaphoreSlim(2, 2);
+
+        private readonly object _runningProcessesLock = new object();
         private readonly List<ProcessWrapper> _runningProcesses = new List<ProcessWrapper>();
-        private readonly ILocalizationManager _localization;
+
+        private EncodingHelper _encodingHelper;
+
+        private string _ffmpegPath;
+        private string _ffprobePath;
 
         public MediaEncoder(
-            ILoggerFactory loggerFactory,
-            IJsonSerializer jsonSerializer,
-            string startupOptionsFFmpegPath,
+            ILogger<MediaEncoder> logger,
             IServerConfigurationManager configurationManager,
             IFileSystem fileSystem,
-            Func<ISubtitleEncoder> subtitleEncoder,
-            Func<IMediaSourceManager> mediaSourceManager,
             IProcessFactory processFactory,
-            int defaultImageExtractionTimeoutMs,
-            ILocalizationManager localization)
-        {
-            _logger = loggerFactory.CreateLogger(nameof(MediaEncoder));
-            _jsonSerializer = jsonSerializer;
-            StartupOptionFFmpegPath = startupOptionsFFmpegPath;
-            ConfigurationManager = configurationManager;
-            FileSystem = fileSystem;
-            SubtitleEncoder = subtitleEncoder;
+            ILocalizationManager localization,
+            Func<ISubtitleEncoder> subtitleEncoder,
+            IConfiguration configuration,
+            string startupOptionsFFmpegPath)
+        {
+            _logger = logger;
+            _configurationManager = configurationManager;
+            _fileSystem = fileSystem;
             _processFactory = processFactory;
-            DefaultImageExtractionTimeoutMs = defaultImageExtractionTimeoutMs;
             _localization = localization;
+            _startupOptionFFmpegPath = startupOptionsFFmpegPath;
+            _subtitleEncoder = subtitleEncoder;
+            _configuration = configuration;
         }
 
+        private EncodingHelper EncodingHelper
+            => LazyInitializer.EnsureInitialized(
+                ref _encodingHelper,
+                () => new EncodingHelper(this, _fileSystem, _subtitleEncoder(), _configuration));
+
+        /// <inheritdoc />
+        public string EncoderPath => _ffmpegPath;
+
+        /// <inheritdoc />
+        public FFmpegLocation EncoderLocation { get; private set; }
+
         /// <summary>
         /// Run at startup or if the user removes a Custom path from transcode page.
         /// Sets global variables FFmpegPath.
@@ -88,39 +93,39 @@ namespace MediaBrowser.MediaEncoding.Encoder
         public void SetFFmpegPath()
         {
             // 1) Custom path stored in config/encoding xml file under tag <EncoderAppPath> takes precedence
-            if (!ValidatePath(ConfigurationManager.GetConfiguration<EncodingOptions>("encoding").EncoderAppPath, FFmpegLocation.Custom))
+            if (!ValidatePath(_configurationManager.GetConfiguration<EncodingOptions>("encoding").EncoderAppPath, FFmpegLocation.Custom))
             {
                 // 2) Check if the --ffmpeg CLI switch has been given
-                if (!ValidatePath(StartupOptionFFmpegPath, FFmpegLocation.SetByArgument))
+                if (!ValidatePath(_startupOptionFFmpegPath, FFmpegLocation.SetByArgument))
                 {
                     // 3) Search system $PATH environment variable for valid FFmpeg
                     if (!ValidatePath(ExistsOnSystemPath("ffmpeg"), FFmpegLocation.System))
                     {
                         EncoderLocation = FFmpegLocation.NotFound;
-                        FFmpegPath = null;
+                        _ffmpegPath = null;
                     }
                 }
             }
 
             // Write the FFmpeg path to the config/encoding.xml file as <EncoderAppPathDisplay> so it appears in UI
-            var config = ConfigurationManager.GetConfiguration<EncodingOptions>("encoding");
-            config.EncoderAppPathDisplay = FFmpegPath ?? string.Empty;
-            ConfigurationManager.SaveConfiguration("encoding", config);
+            var config = _configurationManager.GetConfiguration<EncodingOptions>("encoding");
+            config.EncoderAppPathDisplay = _ffmpegPath ?? string.Empty;
+            _configurationManager.SaveConfiguration("encoding", config);
 
             // Only if mpeg path is set, try and set path to probe
-            if (FFmpegPath != null)
+            if (_ffmpegPath != null)
             {
                 // Determine a probe path from the mpeg path
-                FFprobePath = Regex.Replace(FFmpegPath, @"[^\/\\]+?(\.[^\/\\\n.]+)?$", @"ffprobe$1");
+                _ffprobePath = Regex.Replace(_ffmpegPath, @"[^\/\\]+?(\.[^\/\\\n.]+)?$", @"ffprobe$1");
 
                 // Interrogate to understand what coders are supported
-                var validator = new EncoderValidator(_logger, FFmpegPath);
+                var validator = new EncoderValidator(_logger, _ffmpegPath);
 
                 SetAvailableDecoders(validator.GetDecoders());
                 SetAvailableEncoders(validator.GetEncoders());
             }
 
-            _logger.LogInformation("FFmpeg: {0}: {1}", EncoderLocation, FFmpegPath ?? string.Empty);
+            _logger.LogInformation("FFmpeg: {0}: {1}", EncoderLocation, _ffmpegPath ?? string.Empty);
         }
 
         /// <summary>
@@ -160,9 +165,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             // Write the new ffmpeg path to the xml as <EncoderAppPath>
             // This ensures its not lost on next startup
-            var config = ConfigurationManager.GetConfiguration<EncodingOptions>("encoding");
+            var config = _configurationManager.GetConfiguration<EncodingOptions>("encoding");
             config.EncoderAppPath = newPath;
-            ConfigurationManager.SaveConfiguration("encoding", config);
+            _configurationManager.SaveConfiguration("encoding", config);
 
             // Trigger SetFFmpegPath so we validate the new path and setup probe path
             SetFFmpegPath();
@@ -193,7 +198,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                     // ToDo - Enable the ffmpeg validator.  At the moment any version can be used.
                     rc = true;
 
-                    FFmpegPath = path;
+                    _ffmpegPath = path;
                     EncoderLocation = location;
                 }
                 else
@@ -209,7 +214,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             try
             {
-                var files = FileSystem.GetFilePaths(path);
+                var files = _fileSystem.GetFilePaths(path);
 
                 var excludeExtensions = new[] { ".c" };
 
@@ -304,7 +309,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             var extractChapters = request.MediaType == DlnaProfileType.Video && request.ExtractChapters;
 
-            var inputFiles = MediaEncoderHelpers.GetInputArgument(FileSystem, request.MediaSource.Path, request.MountedIso, request.PlayableStreamFileNames);
+            var inputFiles = MediaEncoderHelpers.GetInputArgument(_fileSystem, request.MediaSource.Path, request.MountedIso, request.PlayableStreamFileNames);
 
             var probeSize = EncodingHelper.GetProbeSizeArgument(inputFiles.Length);
             string analyzeDuration;
@@ -365,7 +370,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 // Must consume both or ffmpeg may hang due to deadlocks. See comments below.
                 RedirectStandardOutput = true,
 
-                FileName = FFprobePath,
+                FileName = _ffprobePath,
                 Arguments = args,
 
 
@@ -383,7 +388,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 _logger.LogDebug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
             }
 
-            using (var processWrapper = new ProcessWrapper(process, this, _logger))
+            using (var processWrapper = new ProcessWrapper(process, this))
             {
                 _logger.LogDebug("Starting ffprobe with args {Args}", args);
                 StartProcess(processWrapper);
@@ -391,7 +396,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 InternalMediaInfoResult result;
                 try
                 {
-                    result = await _jsonSerializer.DeserializeFromStreamAsync<InternalMediaInfoResult>(
+                    result = await JsonSerializer.DeserializeAsync<InternalMediaInfoResult>(
                                         process.StandardOutput.BaseStream).ConfigureAwait(false);
                 }
                 catch
@@ -423,7 +428,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                     }
                 }
 
-                return new ProbeResultNormalizer(_logger, FileSystem, _localization).GetMediaInfo(result, videoType, isAudio, primaryPath, protocol);
+                return new ProbeResultNormalizer(_logger, _fileSystem, _localization).GetMediaInfo(result, videoType, isAudio, primaryPath, protocol);
             }
         }
 
@@ -486,7 +491,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 throw new ArgumentNullException(nameof(inputPath));
             }
 
-            var tempExtractPath = Path.Combine(ConfigurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid() + ".jpg");
+            var tempExtractPath = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid() + ".jpg");
             Directory.CreateDirectory(Path.GetDirectoryName(tempExtractPath));
 
             // apply some filters to thumbnail extracted below (below) crop any black lines that we made and get the correct ar then scale to width 600.
@@ -545,7 +550,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 args = string.Format("-ss {0} ", GetTimeParameter(offset.Value)) + args;
             }
 
-            var encodinghelper = new EncodingHelper(this, FileSystem, SubtitleEncoder());
             if (videoStream != null)
             {
                 /* fix
@@ -559,7 +563,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             if (!string.IsNullOrWhiteSpace(container))
             {
-                var inputFormat = encodinghelper.GetInputFormat(container);
+                var inputFormat = EncodingHelper.GetInputFormat(container);
                 if (!string.IsNullOrWhiteSpace(inputFormat))
                 {
                     args = "-f " + inputFormat + " " + args;
@@ -570,7 +574,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             {
                 CreateNoWindow = true,
                 UseShellExecute = false,
-                FileName = FFmpegPath,
+                FileName = _ffmpegPath,
                 Arguments = args,
                 IsHidden = true,
                 ErrorDialog = false,
@@ -579,7 +583,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             _logger.LogDebug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
 
-            using (var processWrapper = new ProcessWrapper(process, this, _logger))
+            using (var processWrapper = new ProcessWrapper(process, this))
             {
                 bool ranToCompletion;
 
@@ -588,10 +592,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 {
                     StartProcess(processWrapper);
 
-                    var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs;
+                    var timeoutMs = _configurationManager.Configuration.ImageExtractionTimeoutMs;
                     if (timeoutMs <= 0)
                     {
-                        timeoutMs = DefaultImageExtractionTimeoutMs;
+                        timeoutMs = DefaultImageExtractionTimeout;
                     }
 
                     ranToCompletion = await process.WaitForExitAsync(timeoutMs).ConfigureAwait(false);
@@ -607,7 +611,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
 
                 var exitCode = ranToCompletion ? processWrapper.ExitCode ?? 0 : -1;
-                var file = FileSystem.GetFileInfo(tempExtractPath);
+                var file = _fileSystem.GetFileInfo(tempExtractPath);
 
                 if (exitCode == -1 || !file.Exists || file.Length == 0)
                 {
@@ -675,7 +679,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 args = analyzeDurationArgument + " " + args;
             }
 
-            var encodinghelper = new EncodingHelper(this, FileSystem, SubtitleEncoder());
             if (videoStream != null)
             {
                 /* fix
@@ -689,7 +692,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             if (!string.IsNullOrWhiteSpace(container))
             {
-                var inputFormat = encodinghelper.GetInputFormat(container);
+                var inputFormat = EncodingHelper.GetInputFormat(container);
                 if (!string.IsNullOrWhiteSpace(inputFormat))
                 {
                     args = "-f " + inputFormat + " " + args;
@@ -700,7 +703,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             {
                 CreateNoWindow = true,
                 UseShellExecute = false,
-                FileName = FFmpegPath,
+                FileName = _ffmpegPath,
                 Arguments = args,
                 IsHidden = true,
                 ErrorDialog = false,
@@ -713,7 +716,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             bool ranToCompletion = false;
 
-            using (var processWrapper = new ProcessWrapper(process, this, _logger))
+            using (var processWrapper = new ProcessWrapper(process, this))
             {
                 try
                 {
@@ -736,10 +739,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                         cancellationToken.ThrowIfCancellationRequested();
 
-                        var jpegCount = FileSystem.GetFilePaths(targetDirectory)
+                        var jpegCount = _fileSystem.GetFilePaths(targetDirectory)
                             .Count(i => string.Equals(Path.GetExtension(i), ".jpg", StringComparison.OrdinalIgnoreCase));
 
-                        isResponsive = (jpegCount > lastCount);
+                        isResponsive = jpegCount > lastCount;
                         lastCount = jpegCount;
                     }
 
@@ -770,7 +773,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             process.Process.Start();
 
-            lock (_runningProcesses)
+            lock (_runningProcessesLock)
             {
                 _runningProcesses.Add(process);
             }
@@ -804,7 +807,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         private void StopProcesses()
         {
             List<ProcessWrapper> proceses;
-            lock (_runningProcesses)
+            lock (_runningProcessesLock)
             {
                 proceses = _runningProcesses.ToList();
                 _runningProcesses.Clear();
@@ -827,12 +830,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
             return path.Replace('\\', '/').Replace(":", "\\:").Replace("'", "'\\\\\\''");
         }
 
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
+        /// <inheritdoc />
         public void Dispose()
         {
             Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         /// <summary>
@@ -852,11 +854,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             throw new NotImplementedException();
         }
 
-        public string[] GetPlayableStreamFileNames(string path, VideoType videoType)
-        {
-            throw new NotImplementedException();
-        }
-
         public IEnumerable<string> GetPrimaryPlaylistVobFiles(string path, IIsoMount isoMount, uint? titleNumber)
         {
             throw new NotImplementedException();
@@ -870,21 +867,24 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private class ProcessWrapper : IDisposable
         {
-            public readonly IProcess Process;
-            public bool HasExited;
-            public int? ExitCode;
             private readonly MediaEncoder _mediaEncoder;
-            private readonly ILogger _logger;
 
-            public ProcessWrapper(IProcess process, MediaEncoder mediaEncoder, ILogger logger)
+            private bool _disposed = false;
+
+            public ProcessWrapper(IProcess process, MediaEncoder mediaEncoder)
             {
                 Process = process;
                 _mediaEncoder = mediaEncoder;
-                _logger = logger;
-                Process.Exited += Process_Exited;
+                Process.Exited += OnProcessExited;
             }
 
-            void Process_Exited(object sender, EventArgs e)
+            public IProcess Process { get; }
+
+            public bool HasExited { get; private set; }
+
+            public int? ExitCode { get; private set; }
+
+            void OnProcessExited(object sender, EventArgs e)
             {
                 var process = (IProcess)sender;
 
@@ -903,7 +903,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             private void DisposeProcess(IProcess process)
             {
-                lock (_mediaEncoder._runningProcesses)
+                lock (_mediaEncoder._runningProcessesLock)
                 {
                     _mediaEncoder._runningProcesses.Remove(this);
                 }
@@ -917,23 +917,18 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
             }
 
-            private bool _disposed;
-            private readonly object _syncLock = new object();
             public void Dispose()
             {
-                lock (_syncLock)
+                if (!_disposed)
                 {
-                    if (!_disposed)
+                    if (Process != null)
                     {
-                        if (Process != null)
-                        {
-                            Process.Exited -= Process_Exited;
-                            DisposeProcess(Process);
-                        }
+                        Process.Exited -= OnProcessExited;
+                        DisposeProcess(Process);
                     }
-
-                    _disposed = true;
                 }
+
+                _disposed = true;
             }
         }
     }

MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs

@@ -5,7 +5,7 @@ using MediaBrowser.Model.MediaInfo;
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
     /// <summary>
-    /// Interface ISubtitleWriter
+    /// Interface ISubtitleWriter.
     /// </summary>
     public interface ISubtitleWriter
     {

MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs

@@ -1,27 +1,39 @@
 using System.IO;
-using System.Text;
+using System.Text.Json;
 using System.Threading;
 using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
+    /// <summary>
+    /// JSON subtitle writer.
+    /// </summary>
     public class JsonWriter : ISubtitleWriter
     {
-        private readonly IJsonSerializer _json;
-
-        public JsonWriter(IJsonSerializer json)
-        {
-            _json = json;
-        }
-
+        /// <inheritdoc />
         public void Write(SubtitleTrackInfo info, Stream stream, CancellationToken cancellationToken)
         {
-            using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+            using (var writer = new Utf8JsonWriter(stream))
             {
-                var json = _json.SerializeToString(info);
+                var trackevents = info.TrackEvents;
+                writer.WriteStartArray("TrackEvents");
+
+                for (int i = 0; i < trackevents.Count; i++)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    var current = trackevents[i];
+                    writer.WriteStartObject();
+
+                    writer.WriteString("Id", current.Id);
+                    writer.WriteString("Text", current.Text);
+                    writer.WriteNumber("StartPositionTicks", current.StartPositionTicks);
+                    writer.WriteNumber("EndPositionTicks", current.EndPositionTicks);
+
+                    writer.WriteEndObject();
+                }
 
-                writer.Write(json);
+                writer.WriteEndObject();
             }
         }
     }

MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs

@@ -14,14 +14,19 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
             {
-                var index = 1;
+                var trackEvents = info.TrackEvents;
 
-                foreach (var trackEvent in info.TrackEvents)
+                for (int i = 0; i < trackEvents.Count; i++)
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    writer.WriteLine(index.ToString(CultureInfo.InvariantCulture));
-                    writer.WriteLine(@"{0:hh\:mm\:ss\,fff} --> {1:hh\:mm\:ss\,fff}", TimeSpan.FromTicks(trackEvent.StartPositionTicks), TimeSpan.FromTicks(trackEvent.EndPositionTicks));
+                    var trackEvent = trackEvents[i];
+
+                    writer.WriteLine((i + 1).ToString(CultureInfo.InvariantCulture));
+                    writer.WriteLine(
+                        @"{0:hh\:mm\:ss\,fff} --> {1:hh\:mm\:ss\,fff}",
+                        TimeSpan.FromTicks(trackEvent.StartPositionTicks),
+                        TimeSpan.FromTicks(trackEvent.EndPositionTicks));
 
                     var text = trackEvent.Text;
 
@@ -29,9 +34,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     text = Regex.Replace(text, @"\\n", " ", RegexOptions.IgnoreCase);
 
                     writer.WriteLine(text);
-                    writer.WriteLine(string.Empty);
-
-                    index++;
+                    writer.WriteLine();
                 }
             }
         }

MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs

@@ -17,7 +17,6 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
 using UtfUnknown;
 
@@ -30,28 +29,25 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         private readonly IApplicationPaths _appPaths;
         private readonly IFileSystem _fileSystem;
         private readonly IMediaEncoder _mediaEncoder;
-        private readonly IJsonSerializer _json;
         private readonly IHttpClient _httpClient;
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly IProcessFactory _processFactory;
 
         public SubtitleEncoder(
             ILibraryManager libraryManager,
-            ILoggerFactory loggerFactory,
+            ILogger<SubtitleEncoder> logger,
             IApplicationPaths appPaths,
             IFileSystem fileSystem,
             IMediaEncoder mediaEncoder,
-            IJsonSerializer json,
             IHttpClient httpClient,
             IMediaSourceManager mediaSourceManager,
             IProcessFactory processFactory)
         {
             _libraryManager = libraryManager;
-            _logger = loggerFactory.CreateLogger(nameof(SubtitleEncoder));
+            _logger = logger;
             _appPaths = appPaths;
             _fileSystem = fileSystem;
             _mediaEncoder = mediaEncoder;
-            _json = json;
             _httpClient = httpClient;
             _mediaSourceManager = mediaSourceManager;
             _processFactory = processFactory;
@@ -59,7 +55,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         private string SubtitleCachePath => Path.Combine(_appPaths.DataPath, "subtitles");
 
-        private Stream ConvertSubtitles(Stream stream,
+        private Stream ConvertSubtitles(
+            Stream stream,
             string inputFormat,
             string outputFormat,
             long startTimeTicks,
@@ -170,7 +167,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 && (mediaSource.VideoType.Value == VideoType.BluRay || mediaSource.VideoType.Value == VideoType.Dvd))
             {
                 var mediaSourceItem = (Video)_libraryManager.GetItemById(new Guid(mediaSource.Id));
-                inputFiles = mediaSourceItem.GetPlayableStreamFileNames(_mediaEncoder);
+                inputFiles = mediaSourceItem.GetPlayableStreamFileNames();
             }
             else
             {
@@ -179,32 +176,27 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             var fileInfo = await GetReadableFile(mediaSource.Path, inputFiles, mediaSource.Protocol, subtitleStream, cancellationToken).ConfigureAwait(false);
 
-            var stream = await GetSubtitleStream(fileInfo.Path, subtitleStream.Language, fileInfo.Protocol, fileInfo.IsExternal, cancellationToken).ConfigureAwait(false);
+            var stream = await GetSubtitleStream(fileInfo.Path, fileInfo.Protocol, fileInfo.IsExternal, cancellationToken).ConfigureAwait(false);
 
             return (stream, fileInfo.Format);
         }
 
-        private async Task<Stream> GetSubtitleStream(string path, string language, MediaProtocol protocol, bool requiresCharset, CancellationToken cancellationToken)
+        private async Task<Stream> GetSubtitleStream(string path, MediaProtocol protocol, bool requiresCharset, CancellationToken cancellationToken)
         {
             if (requiresCharset)
             {
-                var bytes = await GetBytes(path, protocol, cancellationToken).ConfigureAwait(false);
-
-                var charset = CharsetDetector.DetectFromBytes(bytes).Detected?.EncodingName;
-                _logger.LogDebug("charset {CharSet} detected for {Path}", charset ?? "null", path);
-
-                if (!string.IsNullOrEmpty(charset))
+                using (var stream = await GetStream(path, protocol, cancellationToken).ConfigureAwait(false))
                 {
-                    // Make sure we have all the code pages we can get
-                    Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-                    using (var inputStream = new MemoryStream(bytes))
-                    using (var reader = new StreamReader(inputStream, Encoding.GetEncoding(charset)))
+                    var result = CharsetDetector.DetectFromStream(stream).Detected;
+
+                    if (result != null)
                     {
-                        var text = await reader.ReadToEndAsync().ConfigureAwait(false);
+                        _logger.LogDebug("charset {CharSet} detected for {Path}", result.EncodingName, path);
 
-                        bytes = Encoding.UTF8.GetBytes(text);
+                        using var reader = new StreamReader(stream, result.Encoding);
+                        var text = await reader.ReadToEndAsync().ConfigureAwait(false);
 
-                        return new MemoryStream(bytes);
+                        return new MemoryStream(Encoding.UTF8.GetBytes(text));
                     }
                 }
             }
@@ -323,7 +315,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             if (string.Equals(format, "json", StringComparison.OrdinalIgnoreCase))
             {
-                return new JsonWriter(_json);
+                return new JsonWriter();
             }
             if (string.Equals(format, SubtitleFormat.SRT, StringComparison.OrdinalIgnoreCase))
             {
@@ -544,7 +536,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 if (!File.Exists(outputPath))
                 {
-                    await ExtractTextSubtitleInternal(_mediaEncoder.GetInputArgument(inputFiles, protocol), subtitleStreamIndex, outputCodec, outputPath, cancellationToken).ConfigureAwait(false);
+                    await ExtractTextSubtitleInternal(
+                        _mediaEncoder.GetInputArgument(inputFiles, protocol),
+                        subtitleStreamIndex,
+                        outputCodec,
+                        outputPath,
+                        cancellationToken).ConfigureAwait(false);
                 }
             }
             finally
@@ -572,8 +569,13 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
 
-            var processArgs = string.Format("-i {0} -map 0:{1} -an -vn -c:s {2} \"{3}\"", inputPath,
-                subtitleStreamIndex, outputCodec, outputPath);
+            var processArgs = string.Format(
+                CultureInfo.InvariantCulture,
+                "-i {0} -map 0:{1} -an -vn -c:s {2} \"{3}\"",
+                inputPath,
+                subtitleStreamIndex,
+                outputCodec,
+                outputPath);
 
             var process = _processFactory.Create(new ProcessOptions
             {
@@ -721,41 +723,38 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             }
         }
 
+        /// <inheritdoc />
         public async Task<string> GetSubtitleFileCharacterSet(string path, string language, MediaProtocol protocol, CancellationToken cancellationToken)
         {
-            var bytes = await GetBytes(path, protocol, cancellationToken).ConfigureAwait(false);
-
-            var charset = CharsetDetector.DetectFromBytes(bytes).Detected?.EncodingName;
+            using (var stream = await GetStream(path, protocol, cancellationToken).ConfigureAwait(false))
+            {
+                var charset = CharsetDetector.DetectFromStream(stream).Detected?.EncodingName;
 
-            _logger.LogDebug("charset {0} detected for {Path}", charset ?? "null", path);
+                _logger.LogDebug("charset {0} detected for {Path}", charset ?? "null", path);
 
-            return charset;
+                return charset;
+            }
         }
 
-        private async Task<byte[]> GetBytes(string path, MediaProtocol protocol, CancellationToken cancellationToken)
+        private Task<Stream> GetStream(string path, MediaProtocol protocol, CancellationToken cancellationToken)
         {
-            if (protocol == MediaProtocol.Http)
+            switch (protocol)
             {
-                var opts = new HttpRequestOptions()
-                {
-                    Url = path,
-                    CancellationToken = cancellationToken
-                };
-                using (var file = await _httpClient.Get(opts).ConfigureAwait(false))
-                using (var memoryStream = new MemoryStream())
-                {
-                    await file.CopyToAsync(memoryStream).ConfigureAwait(false);
-                    memoryStream.Position = 0;
+                case MediaProtocol.Http:
+                    var opts = new HttpRequestOptions()
+                    {
+                        Url = path,
+                        CancellationToken = cancellationToken,
+                        BufferContent = true
+                    };
 
-                    return memoryStream.ToArray();
-                }
-            }
-            if (protocol == MediaProtocol.File)
-            {
-                return File.ReadAllBytes(path);
-            }
+                    return _httpClient.Get(opts);
 
-            throw new ArgumentOutOfRangeException(nameof(protocol));
+            case MediaProtocol.File:
+                return Task.FromResult<Stream>(File.OpenRead(path));
+            default:
+                throw new ArgumentOutOfRangeException(nameof(protocol));
+            }
         }
     }
 }

MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs

@@ -49,12 +49,5 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 writer.WriteLine("</tt>");
             }
         }
-
-        private string FormatTime(long ticks)
-        {
-            var time = TimeSpan.FromTicks(ticks);
-
-            return string.Format(@"{0:hh\:mm\:ss\,fff}", time);
-        }
     }
 }

MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -233,7 +233,6 @@ namespace MediaBrowser.Model.Configuration
             LocalNetworkSubnets = Array.Empty<string>();
             LocalNetworkAddresses = Array.Empty<string>();
             CodecsUsed = Array.Empty<string>();
-            ImageExtractionTimeoutMs = 0;
             PathSubstitutions = Array.Empty<PathSubstitution>();
             IgnoreVirtualInterfaces = false;
             EnableSimpleArtistDetection = true;

MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs

@@ -1,12 +1,15 @@
+using System;
+using System.Collections.Generic;
+
 namespace MediaBrowser.Model.MediaInfo
 {
     public class SubtitleTrackInfo
     {
-        public SubtitleTrackEvent[] TrackEvents { get; set; }
+        public IReadOnlyList<SubtitleTrackEvent> TrackEvents { get; set; }
 
         public SubtitleTrackInfo()
         {
-            TrackEvents = new SubtitleTrackEvent[] { };
+            TrackEvents = Array.Empty<SubtitleTrackEvent>();
         }
     }
 }

MediaBrowser.Model/Querying/QueryResult.cs

@@ -17,6 +17,12 @@ namespace MediaBrowser.Model.Querying
         /// <value>The total record count.</value>
         public int TotalRecordCount { get; set; }
 
+        /// <summary>
+        /// The index of the first record in Items.
+        /// </summary>
+        /// <value>First record index.</value>
+        public int StartIndex { get; set; }
+
         public QueryResult()
         {
             Items = Array.Empty<T>();

MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs

@@ -62,7 +62,11 @@ namespace MediaBrowser.Providers.MediaInfo
         {
             var protocol = item.PathProtocol ?? MediaProtocol.File;
 
-            var inputPath = MediaEncoderHelpers.GetInputArgument(_fileSystem, item.Path, null, item.GetPlayableStreamFileNames(_mediaEncoder));
+            var inputPath = MediaEncoderHelpers.GetInputArgument(
+                _fileSystem,
+                item.Path,
+                null,
+                item.GetPlayableStreamFileNames());
 
             var mediaStreams =
                 item.GetMediaStreams();

MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs

@@ -35,9 +35,8 @@ namespace MediaBrowser.Providers.TV.TheTVDB
         {
             var list = new List<RemoteSearchResult>();
 
-            // The search query must either provide an episode number or date
-            if (!searchInfo.IndexNumber.HasValue
-                || !searchInfo.PremiereDate.HasValue
+            // Either an episode number or date must be provided; and the dictionary of provider ids must be valid
+            if ((searchInfo.IndexNumber == null && searchInfo.PremiereDate == null)
                 || !TvdbSeriesProvider.IsValidSeries(searchInfo.SeriesProviderIds))
             {
                 return list;

MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs

@@ -170,11 +170,16 @@ namespace MediaBrowser.Providers.TV.TheTVDB
             return result?.Data.First().Id.ToString();
         }
 
+        /// <summary>
+        /// Check whether a dictionary of provider IDs includes an entry for a valid TV metadata provider.
+        /// </summary>
+        /// <param name="seriesProviderIds">The dictionary to check.</param>
+        /// <returns>True, if the dictionary contains a valid TV provider ID, otherwise false.</returns>
         internal static bool IsValidSeries(Dictionary<string, string> seriesProviderIds)
         {
-            return seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out _) ||
-                   seriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out _) ||
-                   seriesProviderIds.TryGetValue(MetadataProviders.Zap2It.ToString(), out _);
+            return seriesProviderIds.ContainsKey(MetadataProviders.Tvdb.ToString()) ||
+                   seriesProviderIds.ContainsKey(MetadataProviders.Imdb.ToString()) ||
+                   seriesProviderIds.ContainsKey(MetadataProviders.Zap2It.ToString());
         }
 
         /// <summary>

MediaBrowser.sln

@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Notifications", "Emby.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Naming", "Emby.Naming\Emby.Naming.csproj", "{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.XmlTv", "Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj", "{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediaBrowser.MediaEncoding", "MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj", "{960295EE-4AF4-4440-A525-B4C295B01A61}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jellyfin.Server", "Jellyfin.Server\Jellyfin.Server.csproj", "{07E39F42-A2C6-4B32-AF8C-725F957A73FF}"
@@ -136,10 +134,6 @@ Global
 		{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{960295EE-4AF4-4440-A525-B4C295B01A61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{960295EE-4AF4-4440-A525-B4C295B01A61}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{960295EE-4AF4-4440-A525-B4C295B01A61}.Release|Any CPU.ActiveCfg = Release|Any CPU

deployment/ubuntu-package-x64/Dockerfile

@@ -1,19 +1,28 @@
-FROM microsoft/dotnet:2.2-sdk-bionic
+FROM ubuntu:bionic
 # Docker build arguments
 ARG SOURCE_DIR=/jellyfin
 ARG PLATFORM_DIR=/jellyfin/deployment/ubuntu-package-x64
 ARG ARTIFACT_DIR=/dist
+ARG SDK_VERSION=3.0
 # Docker run environment
 ENV SOURCE_DIR=/jellyfin
 ENV ARTIFACT_DIR=/dist
 ENV DEB_BUILD_OPTIONS=noddebs
+ENV ARCH=amd64
 
 # Prepare Ubuntu build environment
 RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev \
+ && apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libssl-dev liblttng-ust0 \
  && ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
  && mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
 
+# Install dotnet repository
+# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
+RUN wget https://download.visualstudio.microsoft.com/download/pr/4f51cfd8-311d-43fe-a887-c80b40358cfd/440d10dc2091b8d0f1a12b7124034e49/dotnet-sdk-3.0.101-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
+ && mkdir -p dotnet-sdk \
+ && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
+ && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
+
 # Install npm package manager
 RUN wget -q -O- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
  && echo "deb https://deb.nodesource.com/node_8.x $(lsb_release -s -c) main" > /etc/apt/sources.list.d/npm.list \