Merge remote-tracking branch 'upstream/master' into baseurl

2026-04-21 01:24:44 +01:00 · 2019-12-05 17:49:15 +01:00
parent a6f883345f e05c02263a
commit 5f6bca8aeb
75 changed files with 1248 additions and 552 deletions
--- a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
+++ b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
@@ -84,6 +84,7 @@ namespace Emby.Server.Implementations.AppBase
        /// </summary>
        /// <value>The logger.</value>
        protected ILogger Logger { get; private set; }
+
        /// <summary>
        /// Gets the XML serializer.
        /// </summary>
@@ -97,7 +98,7 @@ namespace Emby.Server.Implementations.AppBase
        public IApplicationPaths CommonApplicationPaths { get; private set; }

        /// <summary>
-        /// Gets the system configuration.
+        /// Gets or sets the system configuration.
        /// </summary>
        /// <value>The configuration.</value>
        public BaseApplicationConfiguration CommonConfiguration
@@ -123,6 +124,7 @@ namespace Emby.Server.Implementations.AppBase
                    return _configuration;
                }
            }
+
            protected set
            {
                _configuration = value;
@@ -215,7 +217,7 @@ namespace Emby.Server.Implementations.AppBase
                cachePath = CommonConfiguration.CachePath;
            }

-            Logger.LogInformation("Setting cache path to " + cachePath);
+            Logger.LogInformation("Setting cache path: {Path}", cachePath);
            ((BaseApplicationPaths)CommonApplicationPaths).CachePath = cachePath;
        }

@@ -223,7 +225,7 @@ namespace Emby.Server.Implementations.AppBase
        /// Replaces the cache path.
        /// </summary>
        /// <param name="newConfig">The new configuration.</param>
-        /// <exception cref="DirectoryNotFoundException"></exception>
+        /// <exception cref="DirectoryNotFoundException">The new cache path doesn't exist.</exception>
        private void ValidateCachePath(BaseApplicationConfiguration newConfig)
        {
            var newPath = newConfig.CachePath;
@@ -234,7 +236,7 @@ namespace Emby.Server.Implementations.AppBase
                // Validate
                if (!Directory.Exists(newPath))
                {
-                    throw new FileNotFoundException(
+                    throw new DirectoryNotFoundException(
                        string.Format(
                            CultureInfo.InvariantCulture,
                            "{0} does not exist.",
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -110,7 +110,7 @@ using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using ServiceStack;
+using Microsoft.OpenApi.Models;
 using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;

 namespace Emby.Server.Implementations
@@ -230,7 +230,25 @@ namespace Emby.Server.Implementations
            }
        }

-        protected IServiceProvider _serviceProvider;
+        /// <summary>
+        /// Gets or sets the service provider.
+        /// </summary>
+        public IServiceProvider ServiceProvider { get; set; }
+
+        /// <summary>
+        /// Gets the http port for the webhost.
+        /// </summary>
+        public int HttpPort { get; private set; }
+
+        /// <summary>
+        /// Gets the https port for the webhost.
+        /// </summary>
+        public int HttpsPort { get; private set; }
+
+        /// <summary>
+        /// Gets the content root for the webhost.
+        /// </summary>
+        public string ContentRoot { get; private set; }

        /// <summary>
        /// Gets the server configuration manager.
@@ -459,7 +477,7 @@ namespace Emby.Server.Implementations
        /// <param name="type">The type.</param>
        /// <returns>System.Object.</returns>
        public object CreateInstance(Type type)
-            => ActivatorUtilities.CreateInstance(_serviceProvider, type);
+            => ActivatorUtilities.CreateInstance(ServiceProvider, type);

        /// <summary>
        /// Creates an instance of type and resolves all constructor dependencies.
@@ -467,7 +485,7 @@ namespace Emby.Server.Implementations
        /// /// <typeparam name="T">The type.</typeparam>
        /// <returns>T.</returns>
        public T CreateInstance<T>()
-            => ActivatorUtilities.CreateInstance<T>(_serviceProvider);
+            => ActivatorUtilities.CreateInstance<T>(ServiceProvider);

        /// <summary>
        /// Creates the instance safe.
@@ -479,7 +497,7 @@ namespace Emby.Server.Implementations
            try
            {
                Logger.LogDebug("Creating instance of {Type}", type);
-                return ActivatorUtilities.CreateInstance(_serviceProvider, type);
+                return ActivatorUtilities.CreateInstance(ServiceProvider, type);
            }
            catch (Exception ex)
            {
@@ -493,7 +511,7 @@ namespace Emby.Server.Implementations
        /// </summary>
        /// <typeparam name="T">The type</typeparam>
        /// <returns>``0.</returns>
-        public T Resolve<T>() => _serviceProvider.GetService<T>();
+        public T Resolve<T>() => ServiceProvider.GetService<T>();

        /// <summary>
        /// Gets the export types.
@@ -610,77 +628,14 @@ namespace Emby.Server.Implementations

            await RegisterResources(serviceCollection).ConfigureAwait(false);

-            FindParts();
-
-            string contentRoot = ServerConfigurationManager.Configuration.DashboardSourcePath;
-            if (string.IsNullOrEmpty(contentRoot))
+            ContentRoot = ServerConfigurationManager.Configuration.DashboardSourcePath;
+            if (string.IsNullOrEmpty(ContentRoot))
            {
-                contentRoot = ServerConfigurationManager.ApplicationPaths.WebPath;
-            }
-
-            var host = new WebHostBuilder()
-                .UseKestrel(options =>
-                {
-                    var addresses = ServerConfigurationManager
-                        .Configuration
-                        .LocalNetworkAddresses
-                        .Select(NormalizeConfiguredLocalAddress)
-                        .Where(i => i != null)
-                        .ToList();
-                    if (addresses.Any())
-                    {
-                        foreach (var address in addresses)
-                        {
-                            Logger.LogInformation("Kestrel listening on {ipaddr}", address);
-                            options.Listen(address, HttpPort);
-
-                            if (EnableHttps && Certificate != null)
-                            {
-                                options.Listen(address, HttpsPort, listenOptions => listenOptions.UseHttps(Certificate));
-                            }
-                        }
-                    }
-                    else
-                    {
-                        Logger.LogInformation("Kestrel listening on all interfaces");
-                        options.ListenAnyIP(HttpPort);
-
-                        if (EnableHttps && Certificate != null)
-                        {
-                            options.ListenAnyIP(HttpsPort, listenOptions => listenOptions.UseHttps(Certificate));
-                        }
-                    }
-                })
-                .UseContentRoot(contentRoot)
-                .ConfigureServices(services =>
-                {
-                    services.AddResponseCompression();
-                    services.AddHttpContextAccessor();
-                })
-                .Configure(app =>
-                {
-                    app.UseWebSockets();
-
-                    app.UseResponseCompression();
-
-                    // TODO app.UseMiddleware<WebSocketMiddleware>();
-                    app.Use(ExecuteWebsocketHandlerAsync);
-                    app.Use(ExecuteHttpHandlerAsync);
-                })
-                .Build();
-
-            try
-            {
-                await host.StartAsync().ConfigureAwait(false);
-            }
-            catch
-            {
-                Logger.LogError("Kestrel failed to start! This is most likely due to an invalid address or port bind - correct your bind configuration in system.xml and try again.");
-                throw;
+                ContentRoot = ServerConfigurationManager.ApplicationPaths.WebPath;
            }
        }

-        private async Task ExecuteWebsocketHandlerAsync(HttpContext context, Func<Task> next)
+        public async Task ExecuteWebsocketHandlerAsync(HttpContext context, Func<Task> next)
        {
            if (!context.WebSockets.IsWebSocketRequest)
            {
@@ -691,7 +646,7 @@ namespace Emby.Server.Implementations
            await HttpServer.ProcessWebSocketRequest(context).ConfigureAwait(false);
        }

-        private async Task ExecuteHttpHandlerAsync(HttpContext context, Func<Task> next)
+        public async Task ExecuteHttpHandlerAsync(HttpContext context, Func<Task> next)
        {
            if (context.WebSockets.IsWebSocketRequest)
            {
@@ -909,7 +864,7 @@ namespace Emby.Server.Implementations
            serviceCollection.AddSingleton<IAuthorizationContext>(authContext);
            serviceCollection.AddSingleton<ISessionContext>(new SessionContext(UserManager, authContext, SessionManager));

-            AuthService = new AuthService(authContext, ServerConfigurationManager, SessionManager, NetworkManager);
+            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);
@@ -928,8 +883,6 @@ namespace Emby.Server.Implementations
            ((UserDataManager)UserDataManager).Repository = userDataRepo;
            ItemRepository.Initialize(userDataRepo, UserManager);
            ((LibraryManager)LibraryManager).ItemRepository = ItemRepository;
-
-            _serviceProvider = serviceCollection.BuildServiceProvider();
        }

        public static void LogEnvironmentInfo(ILogger logger, IApplicationPaths appPaths)
@@ -1086,9 +1039,9 @@ namespace Emby.Server.Implementations
        /// <summary>
        /// Finds the parts.
        /// </summary>
-        protected void FindParts()
+        public void FindParts()
        {
-            InstallationManager = _serviceProvider.GetService<IInstallationManager>();
+            InstallationManager = ServiceProvider.GetService<IInstallationManager>();
            InstallationManager.PluginInstalled += PluginInstalled;

            if (!ServerConfigurationManager.Configuration.IsPortAuthorized)
@@ -1217,7 +1170,7 @@ namespace Emby.Server.Implementations

        private CertificateInfo CertificateInfo { get; set; }

-        protected X509Certificate2 Certificate { get; private set; }
+        public X509Certificate2 Certificate { get; private set; }

        private IEnumerable<string> GetUrlPrefixes()
        {
@@ -1602,7 +1555,7 @@ namespace Emby.Server.Implementations
            return resultList;
        }

-        private IPAddress NormalizeConfiguredLocalAddress(string address)
+        public IPAddress NormalizeConfiguredLocalAddress(string address)
        {
            var index = address.Trim('/').IndexOf('/');

@@ -1678,10 +1631,6 @@ namespace Emby.Server.Implementations
                ? Environment.MachineName
                : ServerConfigurationManager.Configuration.ServerName;

-        public int HttpPort { get; private set; }
-
-        public int HttpsPort { get; private set; }
-
        /// <summary>
        /// Shuts down.
        /// </summary>
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <ItemGroup>
    <ProjectReference Include="..\Emby.Naming\Emby.Naming.csproj" />
    <ProjectReference Include="..\Emby.Notifications\Emby.Notifications.csproj" />
+    <ProjectReference Include="..\Jellyfin.Api\Jellyfin.Api.csproj" />
    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
@@ -36,6 +37,7 @@
    <PackageReference Include="ServiceStack.Text.Core" Version="5.7.0" />
    <PackageReference Include="sharpcompress" Version="0.24.0" />
    <PackageReference Include="SQLitePCL.pretty.netstandard" Version="2.0.1" />
+    <PackageReference Include="System.Interactive.Async" Version="4.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -18,7 +18,6 @@ using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Services;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -164,7 +163,7 @@ namespace Emby.Server.Implementations.HttpServer
            {
                OnReceive = ProcessWebSocketMessageReceived,
                Url = e.Url,
-                QueryString = e.QueryString ?? new QueryCollection()
+                QueryString = e.QueryString
            };

            connection.Closed += OnConnectionClosed;
--- a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Emby.Server.Implementations.SocketSharp;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
@@ -7,22 +8,27 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;

 namespace Emby.Server.Implementations.HttpServer.Security
 {
    public class AuthService : IAuthService
    {
+        private readonly ILogger<AuthService> _logger;
        private readonly IAuthorizationContext _authorizationContext;
        private readonly ISessionManager _sessionManager;
        private readonly IServerConfigurationManager _config;
        private readonly INetworkManager _networkManager;

        public AuthService(
+            ILogger<AuthService> logger,
            IAuthorizationContext authorizationContext,
            IServerConfigurationManager config,
            ISessionManager sessionManager,
            INetworkManager networkManager)
        {
+            _logger = logger;
            _authorizationContext = authorizationContext;
            _config = config;
            _sessionManager = sessionManager;
@@ -34,7 +40,14 @@ namespace Emby.Server.Implementations.HttpServer.Security
            ValidateUser(request, authAttribtues);
        }

-        private void ValidateUser(IRequest request, IAuthenticationAttributes authAttribtues)
+        public User Authenticate(HttpRequest request, IAuthenticationAttributes authAttributes)
+        {
+            var req = new WebSocketSharpRequest(request, null, request.Path, _logger);
+            var user = ValidateUser(req, authAttributes);
+            return user;
+        }
+
+        private User ValidateUser(IRequest request, IAuthenticationAttributes authAttribtues)
        {
            // This code is executed before the service
            var auth = _authorizationContext.GetAuthorizationInfo(request);
@@ -81,6 +94,8 @@ namespace Emby.Server.Implementations.HttpServer.Security
                    request.RemoteIp,
                    user);
            }
+
+            return user;
        }

        private void ValidateUserAccess(
--- a/Emby.Server.Implementations/Localization/Core/af.json
+++ b/Emby.Server.Implementations/Localization/Core/af.json
@@ -0,0 +1,96 @@
+{
+    "Artists": "Kunstenare",
+    "Channels": "Kanale",
+    "Folders": "Fouers",
+    "Favorites": "Gunstelinge",
+    "HeaderFavoriteShows": "Gunsteling Vertonings",
+    "ValueSpecialEpisodeName": "Spesiaal - {0}",
+    "HeaderAlbumArtists": "Album Kunstenaars",
+    "Books": "Boeke",
+    "HeaderNextUp": "Volgende",
+    "Movies": "Rolprente",
+    "Shows": "Program",
+    "HeaderContinueWatching": "Hou Aan Kyk",
+    "HeaderFavoriteEpisodes": "Gunsteling Episodes",
+    "Photos": "Fotos",
+    "Playlists": "Speellysse",
+    "HeaderFavoriteArtists": "Gunsteling Kunstenaars",
+    "HeaderFavoriteAlbums": "Gunsteling Albums",
+    "Sync": "Sinkroniseer",
+    "HeaderFavoriteSongs": "Gunsteling Liedjies",
+    "Songs": "Liedjies",
+    "DeviceOnlineWithName": "{0} is verbind",
+    "DeviceOfflineWithName": "{0} het afgesluit",
+    "Collections": "Versamelings",
+    "Inherit": "Ontvang",
+    "HeaderLiveTV": "Live TV",
+    "Application": "Program",
+    "AppDeviceValues": "App: {0}, Toestel: {1}",
+    "VersionNumber": "Weergawe {0}",
+    "ValueHasBeenAddedToLibrary": "{0} is by jou media biblioteek bygevoeg",
+    "UserStoppedPlayingItemWithValues": "{0} het klaar {1} op {2} gespeel",
+    "UserStartedPlayingItemWithValues": "{0} is besig om {1} op {2} te speel",
+    "UserPolicyUpdatedWithName": "Gebruiker beleid is verander vir {0}",
+    "UserPasswordChangedWithName": "Gebruiker {0} se wagwoord is verander",
+    "UserOnlineFromDevice": "{0} is aanlyn van {1}",
+    "UserOfflineFromDevice": "{0} is ontkoppel van {1}",
+    "UserLockedOutWithName": "Gebruiker {0} is uitgesluit",
+    "UserDownloadingItemWithValues": "{0} is besig om {1} af te laai",
+    "UserDeletedWithName": "Gebruiker {0} is verwyder",
+    "UserCreatedWithName": "Gebruiker {0} is geskep",
+    "User": "Gebruiker",
+    "TvShows": "TV Programme",
+    "System": "Stelsel",
+    "SubtitlesDownloadedForItem": "Ondertitels afgelaai vir {0}",
+    "SubtitleDownloadFailureFromForItem": "Ondertitels het misluk om af te laai van {0} vir {1}",
+    "StartupEmbyServerIsLoading": "Jellyfin Bediener is besig om te laai. Probeer weer in 'n kort tyd.",
+    "ServerNameNeedsToBeRestarted": "{0} moet herbegin word",
+    "ScheduledTaskStartedWithName": "{0} het begin",
+    "ScheduledTaskFailedWithName": "{0} het misluk",
+    "ProviderValue": "Voorsiener: {0}",
+    "PluginUpdatedWithName": "{0} was opgedateer",
+    "PluginUninstalledWithName": "{0} was verwyder",
+    "PluginInstalledWithName": "{0} is geïnstalleer",
+    "Plugin": "Inprop module",
+    "NotificationOptionVideoPlaybackStopped": "Video terugspeel het gestop",
+    "NotificationOptionVideoPlayback": "Video terugspeel het begin",
+    "NotificationOptionUserLockedOut": "Gebruiker uitgeslyt",
+    "NotificationOptionTaskFailed": "Geskeduleerde taak het misluk",
+    "NotificationOptionServerRestartRequired": "Bediener herbegin nodig",
+    "NotificationOptionPluginUpdateInstalled": "Nuwe inprop module geïnstalleer",
+    "NotificationOptionPluginUninstalled": "Inprop module verwyder",
+    "NotificationOptionPluginInstalled": "Inprop module geïnstalleer",
+    "NotificationOptionPluginError": "Inprop module het misluk",
+    "NotificationOptionNewLibraryContent": "Nuwe inhoud bygevoeg",
+    "NotificationOptionInstallationFailed": "Installering het misluk",
+    "NotificationOptionCameraImageUploaded": "Kamera foto is opgelaai",
+    "NotificationOptionAudioPlaybackStopped": "Oudio terugspeel het gestop",
+    "NotificationOptionAudioPlayback": "Oudio terugspeel het begin",
+    "NotificationOptionApplicationUpdateInstalled": "Nuwe program weergawe geïnstalleer",
+    "NotificationOptionApplicationUpdateAvailable": "Nuwe program weergawe beskikbaar",
+    "NewVersionIsAvailable": "'n Nuwe Jellyfin Bedienaar weergawe kan afgelaai word.",
+    "NameSeasonUnknown": "Seisoen Onbekend",
+    "NameSeasonNumber": "Seisoen {0}",
+    "NameInstallFailed": "{0} installering het misluk",
+    "MusicVideos": "Musiek videos",
+    "Music": "Musiek",
+    "MixedContent": "Gemengde inhoud",
+    "MessageServerConfigurationUpdated": "Bediener konfigurasie is opgedateer",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Bediener konfigurasie seksie {0} is opgedateer",
+    "MessageApplicationUpdatedTo": "Jellyfin Bediener is opgedateer na {0}",
+    "MessageApplicationUpdated": "Jellyfin Bediener is opgedateer",
+    "Latest": "Nuutste",
+    "LabelRunningTimeValue": "Lopende tyd: {0}",
+    "LabelIpAddressValue": "IP adres: {0}",
+    "ItemRemovedWithName": "{0} is uit versameling verwyder",
+    "ItemAddedWithName": "{0} is in die versameling",
+    "HomeVideos": "Tuis opnames",
+    "HeaderRecordingGroups": "Groep Opnames",
+    "HeaderCameraUploads": "Kamera Oplaai",
+    "Genres": "Genres",
+    "FailedLoginAttemptWithUserName": "Mislukte aansluiting van {0}",
+    "ChapterNameValue": "Hoofstuk",
+    "CameraImageUploadedFrom": "'n Nuwe kamera photo opgelaai van {0}",
+    "AuthenticationSucceededWithUserName": "{0} suksesvol geverifieer",
+    "Albums": "Albums"
+}
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -3,14 +3,14 @@
    "AppDeviceValues": "App: {0}, Gerät: {1}",
    "Application": "Anwendung",
    "Artists": "Interpreten",
-    "AuthenticationSucceededWithUserName": "{0} hat sich angemeldet",
+    "AuthenticationSucceededWithUserName": "{0} hat sich erfolgreich angemeldet",
    "Books": "Bücher",
    "CameraImageUploadedFrom": "Ein neues Foto wurde hochgeladen von {0}",
    "Channels": "Kanäle",
    "ChapterNameValue": "Kapitel {0}",
    "Collections": "Sammlungen",
    "DeviceOfflineWithName": "{0} wurde getrennt",
-    "DeviceOnlineWithName": "{0} hat sich verbunden",
+    "DeviceOnlineWithName": "{0} ist verbunden",
    "FailedLoginAttemptWithUserName": "Fehlgeschlagener Anmeldeversuch von {0}",
    "Favorites": "Favoriten",
    "Folders": "Verzeichnisse",
@@ -23,7 +23,7 @@
    "HeaderFavoriteEpisodes": "Lieblingsepisoden",
    "HeaderFavoriteShows": "Lieblingsserien",
    "HeaderFavoriteSongs": "Lieblingslieder",
-    "HeaderLiveTV": "Live-TV",
+    "HeaderLiveTV": "Live TV",
    "HeaderNextUp": "Als Nächstes",
    "HeaderRecordingGroups": "Aufnahme-Gruppen",
    "HomeVideos": "Heimvideos",
--- a/Emby.Server.Implementations/Localization/Core/he.json
+++ b/Emby.Server.Implementations/Localization/Core/he.json
@@ -1,41 +1,41 @@
 {
    "Albums": "אלבומים",
-    "AppDeviceValues": "App: {0}, Device: {1}",
+    "AppDeviceValues": "יישום: {0}, מכשיר: {1}",
    "Application": "אפליקציה",
    "Artists": "אמנים",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "AuthenticationSucceededWithUserName": "{0} זוהה בהצלחה",
    "Books": "ספרים",
-    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-    "Channels": "Channels",
-    "ChapterNameValue": "Chapter {0}",
-    "Collections": "Collections",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "DeviceOnlineWithName": "{0} is connected",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "Favorites": "Favorites",
-    "Folders": "Folders",
+    "CameraImageUploadedFrom": "תמונה חדשה הועלתה מ{0}",
+    "Channels": "ערוצים",
+    "ChapterNameValue": "פרק {0}",
+    "Collections": "קולקציות",
+    "DeviceOfflineWithName": "{0} התנתק",
+    "DeviceOnlineWithName": "{0} מחובר",
+    "FailedLoginAttemptWithUserName": "ניסיון כניסה שגוי מ{0}",
+    "Favorites": "אהובים",
+    "Folders": "תיקיות",
    "Genres": "ז'אנרים",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderCameraUploads": "Camera Uploads",
-    "HeaderContinueWatching": "המשך בצפייה",
-    "HeaderFavoriteAlbums": "Favorite Albums",
-    "HeaderFavoriteArtists": "Favorite Artists",
-    "HeaderFavoriteEpisodes": "Favorite Episodes",
-    "HeaderFavoriteShows": "Favorite Shows",
-    "HeaderFavoriteSongs": "Favorite Songs",
-    "HeaderLiveTV": "Live TV",
-    "HeaderNextUp": "Next Up",
+    "HeaderAlbumArtists": "אמני האלבום",
+    "HeaderCameraUploads": "העלאות ממצלמה",
+    "HeaderContinueWatching": "המשך לצפות",
+    "HeaderFavoriteAlbums": "אלבומים שאהבתי",
+    "HeaderFavoriteArtists": "אמנים שאהבתי",
+    "HeaderFavoriteEpisodes": "פרקים אהובים",
+    "HeaderFavoriteShows": "תוכניות אהובות",
+    "HeaderFavoriteSongs": "שירים שאהבתי",
+    "HeaderLiveTV": "טלוויזיה בשידור חי",
+    "HeaderNextUp": "הבא",
    "HeaderRecordingGroups": "קבוצות הקלטה",
-    "HomeVideos": "Home videos",
-    "Inherit": "Inherit",
+    "HomeVideos": "סרטונים בייתים",
+    "Inherit": "הורש",
    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "LabelRunningTimeValue": "Running time: {0}",
+    "ItemRemovedWithName": "{0} נמחק מהספרייה",
+    "LabelIpAddressValue": "Ip כתובת: {0}",
+    "LabelRunningTimeValue": "משך צפייה: {0}",
    "Latest": "אחרון",
-    "MessageApplicationUpdated": "Jellyfin Server has been updated",
-    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "שרת הJellyfin עודכן",
+    "MessageApplicationUpdatedTo": "שרת הJellyfin עודכן לגרסא {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "הגדרת השרת {0} שונתה",
    "MessageServerConfigurationUpdated": "Server configuration has been updated",
    "MixedContent": "תוכן מעורב",
    "Movies": "סרטים",
@@ -50,7 +50,7 @@
    "NotificationOptionAudioPlayback": "Audio playback started",
    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionInstallationFailed": "התקנה נכשלה",
    "NotificationOptionNewLibraryContent": "New content added",
    "NotificationOptionPluginError": "Plugin failure",
    "NotificationOptionPluginInstalled": "Plugin installed",
--- a/Emby.Server.Implementations/Localization/Core/sk.json
+++ b/Emby.Server.Implementations/Localization/Core/sk.json
@@ -5,7 +5,7 @@
    "Artists": "Umelci",
    "AuthenticationSucceededWithUserName": "{0} úspešne overený",
    "Books": "Knihy",
-    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "CameraImageUploadedFrom": "Z {0} bola nahraná nová fotografia",
    "Channels": "Kanály",
    "ChapterNameValue": "Kapitola {0}",
    "Collections": "Zbierky",
@@ -15,9 +15,9 @@
    "Favorites": "Obľúbené",
    "Folders": "Priečinky",
    "Genres": "Žánre",
-    "HeaderAlbumArtists": "Album Artists",
+    "HeaderAlbumArtists": "Albumy umelcov",
    "HeaderCameraUploads": "Nahrané fotografie",
-    "HeaderContinueWatching": "Pokračujte v pozeraní",
+    "HeaderContinueWatching": "Pokračovať v pozeraní",
    "HeaderFavoriteAlbums": "Obľúbené albumy",
    "HeaderFavoriteArtists": "Obľúbení umelci",
    "HeaderFavoriteEpisodes": "Obľúbené epizódy",
--- a/Emby.Server.Implementations/Localization/Core/tr.json
+++ b/Emby.Server.Implementations/Localization/Core/tr.json
@@ -25,73 +25,73 @@
    "HeaderFavoriteSongs": "Favori Şarkılar",
    "HeaderLiveTV": "Canlı TV",
    "HeaderNextUp": "Sonraki hafta",
-    "HeaderRecordingGroups": "Recording Groups",
-    "HomeVideos": "Home videos",
-    "Inherit": "Inherit",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip adresi: {0}",
+    "HeaderRecordingGroups": "Kayıt Grupları",
+    "HomeVideos": "Ev videoları",
+    "Inherit": "Devral",
+    "ItemAddedWithName": "{0} kütüphaneye eklendi",
+    "ItemRemovedWithName": "{0} kütüphaneden silindi",
+    "LabelIpAddressValue": "IP adresi: {0}",
    "LabelRunningTimeValue": "Çalışma süresi: {0}",
-    "Latest": "Latest",
+    "Latest": "En son",
    "MessageApplicationUpdated": "Jellyfin Sunucusu güncellendi",
-    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MixedContent": "Mixed content",
+    "MessageApplicationUpdatedTo": "Jellyfin Sunucusu {0} olarak güncellendi",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Sunucu ayarları kısım {0} güncellendi",
+    "MessageServerConfigurationUpdated": "Sunucu ayarları güncellendi",
+    "MixedContent": "Karışık içerik",
    "Movies": "Filmler",
    "Music": "Müzik",
    "MusicVideos": "Müzik videoları",
-    "NameInstallFailed": "{0} kurulum başarısız",
+    "NameInstallFailed": "{0} kurulumu başarısız",
    "NameSeasonNumber": "Sezon {0}",
    "NameSeasonUnknown": "Bilinmeyen Sezon",
    "NewVersionIsAvailable": "Jellyfin Sunucusunun yeni bir versiyonu indirmek için hazır.",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionInstallationFailed": "Kurulum hatası",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionApplicationUpdateAvailable": "Uygulama güncellemesi mevcut",
+    "NotificationOptionApplicationUpdateInstalled": "Uygulama güncellemesi yüklendi",
+    "NotificationOptionAudioPlayback": "Ses çalma başladı",
+    "NotificationOptionAudioPlaybackStopped": "Ses çalma durduruldu",
+    "NotificationOptionCameraImageUploaded": "Kamera fotoğrafı yüklendi",
+    "NotificationOptionInstallationFailed": "Yükleme başarısız oldu",
+    "NotificationOptionNewLibraryContent": "Yeni içerik eklendi",
+    "NotificationOptionPluginError": "Eklenti hatası",
+    "NotificationOptionPluginInstalled": "Eklenti yüklendi",
+    "NotificationOptionPluginUninstalled": "Eklenti kaldırıldı",
+    "NotificationOptionPluginUpdateInstalled": "Eklenti güncellemesi yüklendi",
+    "NotificationOptionServerRestartRequired": "Sunucu yeniden başlatma gerekli",
+    "NotificationOptionTaskFailed": "Zamanlanmış görev hatası",
+    "NotificationOptionUserLockedOut": "Kullanıcı kitlendi",
+    "NotificationOptionVideoPlayback": "Video oynatma başladı",
+    "NotificationOptionVideoPlaybackStopped": "Video oynatma durduruldu",
    "Photos": "Fotoğraflar",
    "Playlists": "Çalma listeleri",
-    "Plugin": "Plugin",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "PluginUpdatedWithName": "{0} was updated",
-    "ProviderValue": "Provider: {0}",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Plugin": "Eklenti",
+    "PluginInstalledWithName": "{0} yüklendi",
+    "PluginUninstalledWithName": "{0} kaldırıldı",
+    "PluginUpdatedWithName": "{0} güncellendi",
+    "ProviderValue": "Sağlayıcı: {0}",
+    "ScheduledTaskFailedWithName": "{0} başarısız oldu",
+    "ScheduledTaskStartedWithName": "{0} başladı",
+    "ServerNameNeedsToBeRestarted": "{0} yeniden başlatılması gerekiyor",
    "Shows": "Diziler",
    "Songs": "Şarkılar",
-    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "StartupEmbyServerIsLoading": "Jellyfin Sunucusu yükleniyor. Lütfen kısa süre sonra tekrar deneyin.",
    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "SubtitleDownloadFailureFromForItem": "{1} için alt yazılar {0} 'dan indirilemedi",
+    "SubtitlesDownloadedForItem": "{0} için altyazılar indirildi",
    "Sync": "Eşitle",
-    "System": "System",
-    "TvShows": "TV Shows",
-    "User": "User",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-    "ValueSpecialEpisodeName": "Özel -{0}",
-    "VersionNumber": "Version {0}"
+    "System": "Sistem",
+    "TvShows": "Diziler",
+    "User": "Kullanıcı",
+    "UserCreatedWithName": "{0} kullanıcısı oluşturuldu",
+    "UserDeletedWithName": "Kullanıcı {0} silindi",
+    "UserDownloadingItemWithValues": "{0} indiriliyor {1}",
+    "UserLockedOutWithName": "Kullanıcı {0} kitlendi",
+    "UserOfflineFromDevice": "{0}, {1} ile bağlantısı kesildi",
+    "UserOnlineFromDevice": "{0}, {1} çevrimiçi",
+    "UserPasswordChangedWithName": "{0} kullanıcısı için şifre değiştirildi",
+    "UserPolicyUpdatedWithName": "Kullanıcı politikası {0} için güncellendi",
+    "UserStartedPlayingItemWithValues": "{0}, {2} cihazında {1} izliyor",
+    "UserStoppedPlayingItemWithValues": "{0}, {2} cihazında {1} izlemeyi bitirdi",
+    "ValueHasBeenAddedToLibrary": "Medya kitaplığınıza {0} eklendi",
+    "ValueSpecialEpisodeName": "Özel - {0}",
+    "VersionNumber": "Versiyon {0}"
 }
--- a/Emby.Server.Implementations/Localization/Core/zh-HK.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-HK.json
@@ -2,7 +2,7 @@
    "Albums": "Albums",
    "AppDeviceValues": "App: {0}, Device: {1}",
    "Application": "Application",
-    "Artists": "Artists",
+    "Artists": "藝人",
    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
    "Books": "Books",
    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
--- a/Emby.Server.Implementations/Localization/Core/zh-TW.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-TW.json
@@ -1,6 +1,6 @@
 {
    "Albums": "專輯",
-    "AppDeviceValues": "應用: {0}, 裝置: {1}",
+    "AppDeviceValues": "軟體: {0}, 裝置: {1}",
    "Application": "應用程式",
    "Artists": "演出者",
    "AuthenticationSucceededWithUserName": "{0} 成功授權",
--- a/Emby.Server.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Server.Implementations/Networking/NetworkManager.cs
@@ -7,8 +7,6 @@ using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Net;
 using Microsoft.Extensions.Logging;

 namespace Emby.Server.Implementations.Networking
@@ -55,10 +53,7 @@ namespace Emby.Server.Implementations.Networking
                _macAddresses = null;
            }

-            if (NetworkChanged != null)
-            {
-                NetworkChanged(this, EventArgs.Empty);
-            }
+            NetworkChanged?.Invoke(this, EventArgs.Empty);
        }

        public IPAddress[] GetLocalIpAddresses(bool ignoreVirtualInterface = true)
@@ -261,10 +256,10 @@ namespace Emby.Server.Implementations.Networking
                    return true;
                }

-                if (normalizedSubnet.IndexOf('/') != -1)
+                if (normalizedSubnet.Contains('/', StringComparison.Ordinal))
                {
-                    var ipnetwork = IPNetwork.Parse(normalizedSubnet);
-                    if (ipnetwork.Contains(address))
+                    var ipNetwork = IPNetwork.Parse(normalizedSubnet);
+                    if (ipNetwork.Contains(address))
                    {
                        return true;
                    }
@@ -455,9 +450,9 @@ namespace Emby.Server.Implementations.Networking

        public bool IsInSameSubnet(IPAddress address1, IPAddress address2, IPAddress subnetMask)
        {
-             IPAddress network1 = GetNetworkAddress(address1, subnetMask);
-             IPAddress network2 = GetNetworkAddress(address2, subnetMask);
-             return network1.Equals(network2);
+            IPAddress network1 = GetNetworkAddress(address1, subnetMask);
+            IPAddress network2 = GetNetworkAddress(address2, subnetMask);
+            return network1.Equals(network2);
        }

        private IPAddress GetNetworkAddress(IPAddress address, IPAddress subnetMask)
@@ -473,7 +468,7 @@ namespace Emby.Server.Implementations.Networking
            byte[] broadcastAddress = new byte[ipAdressBytes.Length];
            for (int i = 0; i < broadcastAddress.Length; i++)
            {
-                broadcastAddress[i] = (byte)(ipAdressBytes[i] & (subnetMaskBytes[i]));
+                broadcastAddress[i] = (byte)(ipAdressBytes[i] & subnetMaskBytes[i]);
            }

            return new IPAddress(broadcastAddress);
@@ -513,24 +508,5 @@ namespace Emby.Server.Implementations.Networking

            return null;
        }
-
-        /// <summary>
-        /// Gets the network shares.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>IEnumerable{NetworkShare}.</returns>
-        public virtual IEnumerable<NetworkShare> GetNetworkShares(string path)
-        {
-            return new List<NetworkShare>();
-        }
-
-        /// <summary>
-        /// Gets available devices within the domain
-        /// </summary>
-        /// <returns>PC's in the Domain</returns>
-        public virtual IEnumerable<FileSystemEntryInfo> GetNetworkDevices()
-        {
-            return new List<FileSystemEntryInfo>();
-        }
    }
 }
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
@@ -52,7 +52,9 @@ namespace Emby.Server.Implementations.ScheduledTasks
        {
            progress.Report(0);

-            var packagesToInstall = (await _installationManager.GetAvailablePluginUpdates(cancellationToken).ConfigureAwait(false)).ToList();
+            var packagesToInstall = await _installationManager.GetAvailablePluginUpdates(cancellationToken)
+                .ToListAsync(cancellationToken)
+                .ConfigureAwait(false);

            progress.Report(10);

--- a/Emby.Server.Implementations/ServerApplicationPaths.cs
+++ b/Emby.Server.Implementations/ServerApplicationPaths.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using Emby.Server.Implementations.AppBase;
 using MediaBrowser.Controller;
@@ -10,8 +9,6 @@ namespace Emby.Server.Implementations
    /// </summary>
    public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths
    {
-        private string _defaultTranscodePath;
-        private string _transcodePath;
        private string _internalMetadataPath;

        /// <summary>
@@ -23,7 +20,8 @@ namespace Emby.Server.Implementations
            string configurationDirectoryPath,
            string cacheDirectoryPath,
            string webDirectoryPath)
-            : base(programDataPath,
+            : base(
+                programDataPath,
                logDirectoryPath,
                configurationDirectoryPath,
                cacheDirectoryPath,
@@ -31,8 +29,6 @@ namespace Emby.Server.Implementations
        {
        }

-        public string ApplicationResourcesPath { get; } = AppContext.BaseDirectory;
-
        /// <summary>
        /// Gets the path to the base root media directory.
        /// </summary>
@@ -45,18 +41,13 @@ namespace Emby.Server.Implementations
        /// <value>The default user views path.</value>
        public string DefaultUserViewsPath => Path.Combine(RootFolderPath, "default");

-        /// <summary>
-        /// Gets the path to localization data.
-        /// </summary>
-        /// <value>The localization path.</value>
-        public string LocalizationPath => Path.Combine(ProgramDataPath, "localization");
-
        /// <summary>
        /// Gets the path to the People directory.
        /// </summary>
        /// <value>The people path.</value>
        public string PeoplePath => Path.Combine(InternalMetadataPath, "People");

+        /// <inheritdoc />
        public string ArtistsPath => Path.Combine(InternalMetadataPath, "artists");

        /// <summary>
@@ -107,12 +98,14 @@ namespace Emby.Server.Implementations
        /// <value>The user configuration directory path.</value>
        public string UserConfigurationDirectoryPath => Path.Combine(ConfigurationDirectoryPath, "users");

+        /// <inheritdoc />
        public string InternalMetadataPath
        {
            get => _internalMetadataPath ?? (_internalMetadataPath = Path.Combine(DataPath, "metadata"));
            set => _internalMetadataPath = value;
        }

+        /// <inheritdoc />
        public string VirtualInternalMetadataPath { get; } = "%MetadataPath%";
    }
 }
--- a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;

@@ -67,7 +66,7 @@ namespace Emby.Server.Implementations.Session
        {
            if (queryString == null)
            {
-                throw new ArgumentNullException(nameof(queryString));
+                return null;
            }

            var token = queryString["api_key"];
@@ -75,6 +74,7 @@ namespace Emby.Server.Implementations.Session
            {
                return null;
            }
+
            var deviceId = queryString["deviceId"];
            return _sessionManager.GetSessionByAuthenticationToken(token, deviceId, remoteEndpoint);
        }
--- a/Emby.Server.Implementations/SocketSharp/WebSocketSharpRequest.cs
+++ b/Emby.Server.Implementations/SocketSharp/WebSocketSharpRequest.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
+using System.Net.Mime;
 using MediaBrowser.Common.Net;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
@@ -14,9 +15,9 @@ namespace Emby.Server.Implementations.SocketSharp
 {
    public class WebSocketSharpRequest : IHttpRequest
    {
-        public const string FormUrlEncoded = "application/x-www-form-urlencoded";
-        public const string MultiPartFormData = "multipart/form-data";
-        public const string Soap11 = "text/xml; charset=utf-8";
+        private const string FormUrlEncoded = "application/x-www-form-urlencoded";
+        private const string MultiPartFormData = "multipart/form-data";
+        private const string Soap11 = "text/xml; charset=utf-8";

        private string _remoteIp;
        private Dictionary<string, object> _items;
@@ -77,7 +78,7 @@ namespace Emby.Server.Implementations.SocketSharp
            get =>
                _responseContentType
                ?? (_responseContentType = GetResponseContentType(Request));
-            set => this._responseContentType = value;
+            set => _responseContentType = value;
        }

        public string PathInfo => Request.Path.Value;
@@ -90,7 +91,6 @@ namespace Emby.Server.Implementations.SocketSharp

        public bool IsLocal => Request.HttpContext.Connection.LocalIpAddress.Equals(Request.HttpContext.Connection.RemoteIpAddress);

-
        public string HttpMethod => Request.Method;

        public string Verb => HttpMethod;
@@ -123,24 +123,29 @@ namespace Emby.Server.Implementations.SocketSharp
                return specifiedContentType;
            }

-            const string serverDefaultContentType = "application/json";
+            const string ServerDefaultContentType = MediaTypeNames.Application.Json;

            var acceptContentTypes = httpReq.Headers.GetCommaSeparatedValues(HeaderNames.Accept);
            string defaultContentType = null;
            if (HasAnyOfContentTypes(httpReq, FormUrlEncoded, MultiPartFormData))
            {
-                defaultContentType = serverDefaultContentType;
+                defaultContentType = ServerDefaultContentType;
            }

            var acceptsAnything = false;
            var hasDefaultContentType = defaultContentType != null;
            if (acceptContentTypes != null)
            {
-                foreach (var acceptsType in acceptContentTypes)
+                foreach (ReadOnlySpan<char> acceptsType in acceptContentTypes)
                {
-                    // TODO: @bond move to Span when Span.Split lands
-                    // https://github.com/dotnet/corefx/issues/26528
-                    var contentType = acceptsType?.Split(';')[0].Trim();
+                    ReadOnlySpan<char> contentType = acceptsType;
+                    var index = contentType.IndexOf(';');
+                    if (index != -1)
+                    {
+                        contentType = contentType.Slice(0, index);
+                    }
+
+                    contentType = contentType.Trim();
                    acceptsAnything = contentType.Equals("*/*", StringComparison.OrdinalIgnoreCase);

                    if (acceptsAnything)
@@ -157,7 +162,7 @@ namespace Emby.Server.Implementations.SocketSharp
                    }
                    else
                    {
-                        return serverDefaultContentType;
+                        return ServerDefaultContentType;
                    }
                }
            }
@@ -168,7 +173,7 @@ namespace Emby.Server.Implementations.SocketSharp
            }

            // We could also send a '406 Not Acceptable', but this is allowed also
-            return serverDefaultContentType;
+            return ServerDefaultContentType;
        }

        public static bool HasAnyOfContentTypes(HttpRequest request, params string[] contentTypes)
@@ -196,12 +201,12 @@ namespace Emby.Server.Implementations.SocketSharp

        private static string GetQueryStringContentType(HttpRequest httpReq)
        {
-            ReadOnlySpan<char> format = httpReq.Query["format"].ToString().AsSpan();
+            ReadOnlySpan<char> format = httpReq.Query["format"].ToString();
            if (format == null)
            {
-                const int formatMaxLength = 4;
-                ReadOnlySpan<char> pi = httpReq.Path.ToString().AsSpan();
-                if (pi == null || pi.Length <= formatMaxLength)
+                const int FormatMaxLength = 4;
+                ReadOnlySpan<char> pi = httpReq.Path.ToString();
+                if (pi == null || pi.Length <= FormatMaxLength)
                {
                    return null;
                }
@@ -212,18 +217,18 @@ namespace Emby.Server.Implementations.SocketSharp
                }

                format = LeftPart(pi, '/');
-                if (format.Length > formatMaxLength)
+                if (format.Length > FormatMaxLength)
                {
                    return null;
                }
            }

            format = LeftPart(format, '.');
-            if (format.Contains("json".AsSpan(), StringComparison.OrdinalIgnoreCase))
+            if (format.Contains("json", StringComparison.OrdinalIgnoreCase))
            {
                return "application/json";
            }
-            else if (format.Contains("xml".AsSpan(), StringComparison.OrdinalIgnoreCase))
+            else if (format.Contains("xml", StringComparison.OrdinalIgnoreCase))
            {
                return "application/xml";
            }
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -180,7 +180,7 @@ namespace Emby.Server.Implementations.Updates
            // Package not found.
            if (package == null)
            {
-                return null;
+                return Enumerable.Empty<PackageVersionInfo>();
            }

            return GetCompatibleVersions(
@@ -190,19 +190,23 @@ namespace Emby.Server.Implementations.Updates
        }

        /// <inheritdoc />
-        public async Task<IEnumerable<PackageVersionInfo>> GetAvailablePluginUpdates(CancellationToken cancellationToken = default)
+        public async IAsyncEnumerable<PackageVersionInfo> GetAvailablePluginUpdates(CancellationToken cancellationToken = default)
        {
            var catalog = await GetAvailablePackages(cancellationToken).ConfigureAwait(false);

            var systemUpdateLevel = _applicationHost.SystemUpdateLevel;

            // Figure out what needs to be installed
-            return _applicationHost.Plugins.Select(x =>
+            foreach (var plugin in _applicationHost.Plugins)
            {
-                var compatibleversions = GetCompatibleVersions(catalog, x.Name, x.Id, x.Version, systemUpdateLevel);
-                return compatibleversions.FirstOrDefault(y => y.Version > x.Version);
-            }).Where(x => x != null)
-            .Where(x => !CompletedInstallations.Any(y => string.Equals(y.AssemblyGuid, x.guid, StringComparison.OrdinalIgnoreCase)));
+                var compatibleversions = GetCompatibleVersions(catalog, plugin.Name, plugin.Id, plugin.Version, systemUpdateLevel);
+                var version = compatibleversions.FirstOrDefault(y => y.Version > plugin.Version);
+                if (version != null
+                    && !CompletedInstallations.Any(x => string.Equals(x.AssemblyGuid, version.guid, StringComparison.OrdinalIgnoreCase)))
+                {
+                    yield return version;
+                }
+            }
        }

        /// <inheritdoc />