Merge branch 'master' into update-plugin

2026-03-15 14:46:19 +00:00 · 2020-10-17 09:47:20 +01:00
parent ee976bb47a 86090ab1f6
commit 38da2ee26e
301 changed files with 3872 additions and 7017 deletions
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -95,6 +95,7 @@ using MediaBrowser.Model.Tasks;
 using MediaBrowser.Providers.Chapters;
 using MediaBrowser.Providers.Manager;
 using MediaBrowser.Providers.Plugins.TheTvdb;
+using MediaBrowser.Providers.Plugins.Tmdb;
 using MediaBrowser.Providers.Subtitles;
 using MediaBrowser.XbmcMetadata.Providers;
 using Microsoft.AspNetCore.Mvc;
@@ -125,7 +126,6 @@ namespace Emby.Server.Implementations
        private IMediaEncoder _mediaEncoder;
        private ISessionManager _sessionManager;
        private IHttpClientFactory _httpClientFactory;
-        private IWebSocketManager _webSocketManager;

        private string[] _urlPrefixes;

@@ -535,6 +535,7 @@ namespace Emby.Server.Implementations

            ServiceCollection.AddSingleton(_fileSystemManager);
            ServiceCollection.AddSingleton<TvdbClientManager>();
+            ServiceCollection.AddSingleton<TmdbClientManager>();

            ServiceCollection.AddSingleton(_networkManager);

@@ -663,7 +664,6 @@ namespace Emby.Server.Implementations
            _mediaEncoder = Resolve<IMediaEncoder>();
            _sessionManager = Resolve<ISessionManager>();
            _httpClientFactory = Resolve<IHttpClientFactory>();
-            _webSocketManager = Resolve<IWebSocketManager>();

            ((AuthenticationRepository)Resolve<IAuthenticationRepository>()).Initialize();

@@ -784,7 +784,6 @@ namespace Emby.Server.Implementations
                        .ToArray();

            _urlPrefixes = GetUrlPrefixes().ToArray();
-            _webSocketManager.Init(GetExports<IWebSocketListener>());

            Resolve<ILibraryManager>().AddParts(
                GetExports<IResolverIgnoreRule>(),
@@ -817,38 +816,6 @@ namespace Emby.Server.Implementations
        {
            try
            {
-                if (plugin is IPluginAssembly assemblyPlugin)
-                {
-                    var assembly = plugin.GetType().Assembly;
-                    var assemblyName = assembly.GetName();
-                    var assemblyFilePath = assembly.Location;
-
-                    var dataFolderPath = Path.Combine(ApplicationPaths.PluginsPath, Path.GetFileNameWithoutExtension(assemblyFilePath));
-
-                    assemblyPlugin.SetAttributes(assemblyFilePath, dataFolderPath, assemblyName.Version);
-
-                    try
-                    {
-                        var idAttributes = assembly.GetCustomAttributes(typeof(GuidAttribute), true);
-                        if (idAttributes.Length > 0)
-                        {
-                            var attribute = (GuidAttribute)idAttributes[0];
-                            var assemblyId = new Guid(attribute.Value);
-
-                            assemblyPlugin.SetId(assemblyId);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogError(ex, "Error getting plugin Id from {PluginName}.", plugin.GetType().FullName);
-                    }
-                }
-
-                if (plugin is IHasPluginConfiguration hasPluginConfiguration)
-                {
-                    hasPluginConfiguration.SetStartupInfo(s => Directory.CreateDirectory(s));
-                }
-
                plugin.RegisterServices(ServiceCollection);
            }
            catch (Exception ex)
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -157,7 +157,8 @@ namespace Emby.Server.Implementations.Data

        protected bool TableExists(ManagedConnection connection, string name)
        {
-            return connection.RunInTransaction(db =>
+            return connection.RunInTransaction(
+            db =>
            {
                using (var statement = PrepareStatement(db, "select DISTINCT tbl_name from sqlite_master"))
                {
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -219,7 +219,8 @@ namespace Emby.Server.Implementations.Data
            {
                connection.RunQueries(queries);

-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    var existingColumnNames = GetColumnNames(db, "AncestorIds");
                    AddColumn(db, "AncestorIds", "AncestorIdText", "Text", existingColumnNames);
@@ -495,7 +496,8 @@ namespace Emby.Server.Implementations.Data

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    using (var saveImagesStatement = base.PrepareStatement(db, "Update TypedBaseItems set Images=@Images where guid=@Id"))
                    {
@@ -546,7 +548,8 @@ namespace Emby.Server.Implementations.Data

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    SaveItemsInTranscation(db, tuples);
                }, TransactionMode);
@@ -2032,7 +2035,8 @@ namespace Emby.Server.Implementations.Data

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    // First delete chapters
                    db.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", idBlob);
@@ -2921,7 +2925,8 @@ namespace Emby.Server.Implementations.Data
            var result = new QueryResult<BaseItem>();
            using (var connection = GetConnection(true))
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    var statements = PrepareAll(db, statementTexts);

@@ -3324,7 +3329,8 @@ namespace Emby.Server.Implementations.Data
            var result = new QueryResult<Guid>();
            using (var connection = GetConnection(true))
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    var statements = PrepareAll(db, statementTexts);

@@ -4899,7 +4905,8 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    connection.ExecuteAll(sql);
                }, TransactionMode);
@@ -4950,7 +4957,8 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    var idBlob = id.ToByteArray();

@@ -5357,7 +5365,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type

                itemCountColumns = new Dictionary<string, string>()
                {
-                    { "itemTypes", "(" + itemCountColumnQuery + ") as itemTypes"}
+                    { "itemTypes", "(" + itemCountColumnQuery + ") as itemTypes" }
                };
            }

@@ -5744,7 +5752,8 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    var itemIdBlob = itemId.ToByteArray();

@@ -5898,7 +5907,8 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    var itemIdBlob = id.ToByteArray();

@@ -6232,7 +6242,8 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    var itemIdBlob = id.ToByteArray();

--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -44,7 +44,8 @@ namespace Emby.Server.Implementations.Data

                var users = userDatasTableExists ? null : userManager.Users;

-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    db.ExecuteAll(string.Join(";", new[] {

@@ -178,7 +179,8 @@ namespace Emby.Server.Implementations.Data

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    SaveUserData(db, internalUserId, key, userData);
                }, TransactionMode);
@@ -246,7 +248,8 @@ namespace Emby.Server.Implementations.Data

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    foreach (var userItemData in userDataList)
                    {
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -32,10 +32,10 @@
    <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.DependencyInjection" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.9" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.9" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.9" />
    <PackageReference Include="Mono.Nat" Version="3.0.0" />
    <PackageReference Include="prometheus-net.DotNetRuntime" Version="3.4.0" />
    <PackageReference Include="ServiceStack.Text.Core" Version="5.9.2" />
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -16,6 +16,7 @@ using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;

 namespace Emby.Server.Implementations.EntryPoints
@@ -105,7 +106,7 @@ namespace Emby.Server.Implementations.EntryPoints

            try
            {
-                _sessionManager.SendMessageToAdminSessions("RefreshProgress", dict, CancellationToken.None);
+                _sessionManager.SendMessageToAdminSessions(SessionMessageType.RefreshProgress, dict, CancellationToken.None);
            }
            catch
            {
@@ -123,7 +124,7 @@ namespace Emby.Server.Implementations.EntryPoints

                try
                {
-                    _sessionManager.SendMessageToAdminSessions("RefreshProgress", collectionFolderDict, CancellationToken.None);
+                    _sessionManager.SendMessageToAdminSessions(SessionMessageType.RefreshProgress, collectionFolderDict, CancellationToken.None);
                }
                catch
                {
@@ -345,7 +346,7 @@ namespace Emby.Server.Implementations.EntryPoints

                try
                {
-                    await _sessionManager.SendMessageToUserSessions(new List<Guid> { userId }, "LibraryChanged", info, cancellationToken).ConfigureAwait(false);
+                    await _sessionManager.SendMessageToUserSessions(new List<Guid> { userId }, SessionMessageType.LibraryChanged, info, cancellationToken).ConfigureAwait(false);
                }
                catch (Exception ex)
                {
--- a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
@@ -10,6 +10,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;

 namespace Emby.Server.Implementations.EntryPoints
@@ -46,25 +47,25 @@ namespace Emby.Server.Implementations.EntryPoints

        private async void OnLiveTvManagerSeriesTimerCreated(object sender, GenericEventArgs<TimerEventInfo> e)
        {
-            await SendMessage("SeriesTimerCreated", e.Argument).ConfigureAwait(false);
+            await SendMessage(SessionMessageType.SeriesTimerCreated, e.Argument).ConfigureAwait(false);
        }

        private async void OnLiveTvManagerTimerCreated(object sender, GenericEventArgs<TimerEventInfo> e)
        {
-            await SendMessage("TimerCreated", e.Argument).ConfigureAwait(false);
+            await SendMessage(SessionMessageType.TimerCreated, e.Argument).ConfigureAwait(false);
        }

        private async void OnLiveTvManagerSeriesTimerCancelled(object sender, GenericEventArgs<TimerEventInfo> e)
        {
-            await SendMessage("SeriesTimerCancelled", e.Argument).ConfigureAwait(false);
+            await SendMessage(SessionMessageType.SeriesTimerCancelled, e.Argument).ConfigureAwait(false);
        }

        private async void OnLiveTvManagerTimerCancelled(object sender, GenericEventArgs<TimerEventInfo> e)
        {
-            await SendMessage("TimerCancelled", e.Argument).ConfigureAwait(false);
+            await SendMessage(SessionMessageType.TimerCancelled, e.Argument).ConfigureAwait(false);
        }

-        private async Task SendMessage(string name, TimerEventInfo info)
+        private async Task SendMessage(SessionMessageType name, TimerEventInfo info)
        {
            var users = _userManager.Users.Where(i => i.HasPermission(PermissionKind.EnableLiveTvAccess)).Select(i => i.Id).ToList();

--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -115,7 +115,7 @@ namespace Emby.Server.Implementations.EntryPoints

        private Task SendNotifications(Guid userId, List<BaseItem> changedItems, CancellationToken cancellationToken)
        {
-            return _sessionManager.SendMessageToUserSessions(new List<Guid> { userId }, "UserDataChanged", () => GetUserDataChangeInfo(userId, changedItems), cancellationToken);
+            return _sessionManager.SendMessageToUserSessions(new List<Guid> { userId }, SessionMessageType.UserDataChanged, () => GetUserDataChangeInfo(userId, changedItems), cancellationToken);
        }

        private UserDataChangeInfo GetUserDataChangeInfo(Guid userId, List<BaseItem> changedItems)
--- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
+++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Common.Json;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;

@@ -227,7 +228,7 @@ namespace Emby.Server.Implementations.HttpServer
                Connection = this
            };

-            if (info.MessageType.Equals("KeepAlive", StringComparison.Ordinal))
+            if (info.MessageType == SessionMessageType.KeepAlive)
            {
                await SendKeepAliveResponse().ConfigureAwait(false);
            }
@@ -244,7 +245,7 @@ namespace Emby.Server.Implementations.HttpServer
                new WebSocketMessage<string>
                {
                    MessageId = Guid.NewGuid(),
-                    MessageType = "KeepAlive"
+                    MessageType = SessionMessageType.KeepAlive
                }, CancellationToken.None);
        }

--- a/Emby.Server.Implementations/HttpServer/WebSocketManager.cs
+++ b/Emby.Server.Implementations/HttpServer/WebSocketManager.cs
@@ -2,7 +2,6 @@

 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
 using Jellyfin.Data.Events;
@@ -14,16 +13,18 @@ namespace Emby.Server.Implementations.HttpServer
 {
    public class WebSocketManager : IWebSocketManager
    {
+        private readonly Lazy<IEnumerable<IWebSocketListener>> _webSocketListeners;
        private readonly ILogger<WebSocketManager> _logger;
        private readonly ILoggerFactory _loggerFactory;

-        private IWebSocketListener[] _webSocketListeners = Array.Empty<IWebSocketListener>();
        private bool _disposed = false;

        public WebSocketManager(
+            Lazy<IEnumerable<IWebSocketListener>> webSocketListeners,
            ILogger<WebSocketManager> logger,
            ILoggerFactory loggerFactory)
        {
+            _webSocketListeners = webSocketListeners;
            _logger = logger;
            _loggerFactory = loggerFactory;
        }
@@ -68,15 +69,6 @@ namespace Emby.Server.Implementations.HttpServer
            }
        }

-        /// <summary>
-        /// Adds the rest handlers.
-        /// </summary>
-        /// <param name="listeners">The web socket listeners.</param>
-        public void Init(IEnumerable<IWebSocketListener> listeners)
-        {
-            _webSocketListeners = listeners.ToArray();
-        }
-
        /// <summary>
        /// Processes the web socket message received.
        /// </summary>
@@ -90,7 +82,8 @@ namespace Emby.Server.Implementations.HttpServer

            IEnumerable<Task> GetTasks()
            {
-                foreach (var x in _webSocketListeners)
+                var listeners = _webSocketListeners.Value;
+                foreach (var x in listeners)
                {
                    yield return x.ProcessMessageAsync(result);
                }
--- a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
+++ b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
@@ -133,9 +133,20 @@ namespace Emby.Server.Implementations.Images

        protected virtual IEnumerable<string> GetStripCollageImagePaths(BaseItem primaryItem, IEnumerable<BaseItem> items)
        {
+            var useBackdrop = primaryItem is CollectionFolder;
            return items
                .Select(i =>
                {
+                    // Use Backdrop instead of Primary image for Library images.
+                    if (useBackdrop)
+                    {
+                        var backdrop = i.GetImageInfo(ImageType.Backdrop, 0);
+                        if (backdrop != null && backdrop.IsLocalFile)
+                        {
+                            return backdrop.Path;
+                        }
+                    }
+
                    var image = i.GetImageInfo(ImageType.Primary, 0);
                    if (image != null && image.IsLocalFile)
                    {
@@ -190,7 +201,7 @@ namespace Emby.Server.Implementations.Images
                return null;
            }

-            ImageProcessor.CreateImageCollage(options);
+            ImageProcessor.CreateImageCollage(options, primaryItem.Name);
            return outputPath;
        }

--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -1,6 +1,7 @@
 #pragma warning disable CS1591

 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -43,7 +44,7 @@ namespace Emby.Server.Implementations.Library
        private readonly ILocalizationManager _localizationManager;
        private readonly IApplicationPaths _appPaths;

-        private readonly Dictionary<string, ILiveStream> _openStreams = new Dictionary<string, ILiveStream>(StringComparer.OrdinalIgnoreCase);
+        private readonly ConcurrentDictionary<string, ILiveStream> _openStreams = new ConcurrentDictionary<string, ILiveStream>(StringComparer.OrdinalIgnoreCase);
        private readonly SemaphoreSlim _liveStreamSemaphore = new SemaphoreSlim(1, 1);

        private IMediaSourceProvider[] _providers;
@@ -582,29 +583,20 @@ namespace Emby.Server.Implementations.Library
            mediaSource.InferTotalBitrate();
        }

-        public async Task<IDirectStreamProvider> GetDirectStreamProviderByUniqueId(string uniqueId, CancellationToken cancellationToken)
+        public Task<IDirectStreamProvider> GetDirectStreamProviderByUniqueId(string uniqueId, CancellationToken cancellationToken)
        {
-            await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            try
+            var info = _openStreams.Values.FirstOrDefault(i =>
            {
-                var info = _openStreams.Values.FirstOrDefault(i =>
+                var liveStream = i as ILiveStream;
+                if (liveStream != null)
                {
-                    var liveStream = i as ILiveStream;
-                    if (liveStream != null)
-                    {
-                        return string.Equals(liveStream.UniqueId, uniqueId, StringComparison.OrdinalIgnoreCase);
-                    }
+                    return string.Equals(liveStream.UniqueId, uniqueId, StringComparison.OrdinalIgnoreCase);
+                }

-                    return false;
-                });
+                return false;
+            });

-                return info as IDirectStreamProvider;
-            }
-            finally
-            {
-                _liveStreamSemaphore.Release();
-            }
+            return Task.FromResult(info as IDirectStreamProvider);
        }

        public async Task<LiveStreamResponse> OpenLiveStream(LiveStreamRequest request, CancellationToken cancellationToken)
@@ -793,29 +785,20 @@ namespace Emby.Server.Implementations.Library
            return new Tuple<MediaSourceInfo, IDirectStreamProvider>(info.MediaSource, info as IDirectStreamProvider);
        }

-        private async Task<ILiveStream> GetLiveStreamInfo(string id, CancellationToken cancellationToken)
+        private Task<ILiveStream> GetLiveStreamInfo(string id, CancellationToken cancellationToken)
        {
            if (string.IsNullOrEmpty(id))
            {
                throw new ArgumentNullException(nameof(id));
            }

-            await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            try
+            if (_openStreams.TryGetValue(id, out ILiveStream info))
            {
-                if (_openStreams.TryGetValue(id, out ILiveStream info))
-                {
-                    return info;
-                }
-                else
-                {
-                    throw new ResourceNotFoundException();
-                }
+                return Task.FromResult(info);
            }
-            finally
+            else
            {
-                _liveStreamSemaphore.Release();
+                return Task.FromException<ILiveStream>(new ResourceNotFoundException());
            }
        }

@@ -844,7 +827,7 @@ namespace Emby.Server.Implementations.Library

                    if (liveStream.ConsumerCount <= 0)
                    {
-                        _openStreams.Remove(id);
+                        _openStreams.TryRemove(id, out _);

                        _logger.LogInformation("Closing live stream {0}", id);

--- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -32,7 +32,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
        /// <value>The priority.</value>
        public override ResolverPriority Priority => ResolverPriority.Fourth;

-        public MultiItemResolverResult ResolveMultiple(Folder parent,
+        public MultiItemResolverResult ResolveMultiple(
+            Folder parent,
            List<FileSystemMetadata> files,
            string collectionType,
            IDirectoryService directoryService)
@@ -50,7 +51,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
            return result;
        }

-        private MultiItemResolverResult ResolveMultipleInternal(Folder parent,
+        private MultiItemResolverResult ResolveMultipleInternal(
+            Folder parent,
            List<FileSystemMetadata> files,
            string collectionType,
            IDirectoryService directoryService)
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Emby.Naming.Audio;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
@@ -113,52 +116,48 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
            IFileSystem fileSystem,
            ILibraryManager libraryManager)
        {
+            // check for audio files before digging down into directories
+            var foundAudioFile = list.Any(fileSystemInfo => !fileSystemInfo.IsDirectory && libraryManager.IsAudioFile(fileSystemInfo.FullName));
+            if (foundAudioFile)
+            {
+                // at least one audio file exists
+                return true;
+            }
+
+            if (!allowSubfolders)
+            {
+                // not music since no audio file exists and we're not looking into subfolders
+                return false;
+            }
+
            var discSubfolderCount = 0;
-            var notMultiDisc = false;

            var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
            var parser = new AlbumParser(namingOptions);
-            foreach (var fileSystemInfo in list)
+
+            var directories = list.Where(fileSystemInfo => fileSystemInfo.IsDirectory);
+
+            var result = Parallel.ForEach(directories, (fileSystemInfo, state) =>
            {
-                if (fileSystemInfo.IsDirectory)
+                var path = fileSystemInfo.FullName;
+                var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryManager);
+
+                if (hasMusic)
                {
-                    if (allowSubfolders)
+                    if (parser.IsMultiPart(path))
                    {
-                        if (notMultiDisc)
-                        {
-                            continue;
-                        }
-
-                        var path = fileSystemInfo.FullName;
-                        var hasMusic = ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem, libraryManager);
-
-                        if (hasMusic)
-                        {
-                            if (parser.IsMultiPart(path))
-                            {
-                                logger.LogDebug("Found multi-disc folder: " + path);
-                                discSubfolderCount++;
-                            }
-                            else
-                            {
-                                // If there are folders underneath with music that are not multidisc, then this can't be a multi-disc album
-                                notMultiDisc = true;
-                            }
-                        }
+                        logger.LogDebug("Found multi-disc folder: " + path);
+                        Interlocked.Increment(ref discSubfolderCount);
+                    }
+                    else
+                    {
+                        // If there are folders underneath with music that are not multidisc, then this can't be a multi-disc album
+                        state.Stop();
                    }
                }
-                else
-                {
-                    var fullName = fileSystemInfo.FullName;
+            });

-                    if (libraryManager.IsAudioFile(fullName))
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            if (notMultiDisc)
+            if (!result.IsCompleted)
            {
                return false;
            }
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
@@ -94,7 +95,18 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
            var albumResolver = new MusicAlbumResolver(_logger, _fileSystem, _libraryManager);

            // If we contain an album assume we are an artist folder
-            return args.FileSystemChildren.Where(i => i.IsDirectory).Any(i => albumResolver.IsMusicAlbum(i.FullName, directoryService)) ? new MusicArtist() : null;
+            var directories = args.FileSystemChildren.Where(i => i.IsDirectory);
+
+            var result = Parallel.ForEach(directories, (fileSystemInfo, state) =>
+            {
+                if (albumResolver.IsMusicAlbum(fileSystemInfo.FullName, directoryService))
+                {
+                    // stop once we see a music album
+                    state.Stop();
+                }
+            });
+
+            return !result.IsCompleted ? new MusicArtist() : null;
        }
    }
 }
--- a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
@@ -50,7 +50,8 @@ namespace Emby.Server.Implementations.Library.Resolvers.Books
                var fileExtension = Path.GetExtension(f.FullName) ??
                                    string.Empty;

-                return _validExtensions.Contains(fileExtension,
+                return _validExtensions.Contains(
+                    fileExtension,
                                                StringComparer
                                                    .OrdinalIgnoreCase);
            }).ToList();
--- a/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
+++ b/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
@@ -43,7 +43,7 @@ namespace Emby.Server.Implementations.LiveTv
            return new[]
            {
                // Every so often
-                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks}
+                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks }
            };
        }

--- a/Emby.Server.Implementations/Localization/Core/af.json
+++ b/Emby.Server.Implementations/Localization/Core/af.json
@@ -85,7 +85,6 @@
    "ItemAddedWithName": "{0} is in die versameling",
    "HomeVideos": "Tuis opnames",
    "HeaderRecordingGroups": "Groep Opnames",
-    "HeaderCameraUploads": "Kamera Oplaai",
    "Genres": "Genres",
    "FailedLoginAttemptWithUserName": "Mislukte aansluiting van {0}",
    "ChapterNameValue": "Hoofstuk",
--- a/Emby.Server.Implementations/Localization/Core/ar.json
+++ b/Emby.Server.Implementations/Localization/Core/ar.json
@@ -16,7 +16,6 @@
    "Folders": "المجلدات",
    "Genres": "التضنيفات",
    "HeaderAlbumArtists": "فناني الألبومات",
-    "HeaderCameraUploads": "تحميلات الكاميرا",
    "HeaderContinueWatching": "استئناف",
    "HeaderFavoriteAlbums": "الألبومات المفضلة",
    "HeaderFavoriteArtists": "الفنانون المفضلون",
--- a/Emby.Server.Implementations/Localization/Core/bg-BG.json
+++ b/Emby.Server.Implementations/Localization/Core/bg-BG.json
@@ -16,7 +16,6 @@
    "Folders": "Папки",
    "Genres": "Жанрове",
    "HeaderAlbumArtists": "Изпълнители на албуми",
-    "HeaderCameraUploads": "Качени от камера",
    "HeaderContinueWatching": "Продължаване на гледането",
    "HeaderFavoriteAlbums": "Любими албуми",
    "HeaderFavoriteArtists": "Любими изпълнители",
--- a/Emby.Server.Implementations/Localization/Core/bn.json
+++ b/Emby.Server.Implementations/Localization/Core/bn.json
@@ -14,7 +14,6 @@
    "HeaderFavoriteArtists": "প্রিয় শিল্পীরা",
    "HeaderFavoriteAlbums": "প্রিয় এলবামগুলো",
    "HeaderContinueWatching": "দেখতে থাকুন",
-    "HeaderCameraUploads": "ক্যামেরার আপলোড সমূহ",
    "HeaderAlbumArtists": "এলবাম শিল্পী",
    "Genres": "জেনার",
    "Folders": "ফোল্ডারগুলো",
--- a/Emby.Server.Implementations/Localization/Core/ca.json
+++ b/Emby.Server.Implementations/Localization/Core/ca.json
@@ -16,7 +16,6 @@
    "Folders": "Carpetes",
    "Genres": "Gèneres",
    "HeaderAlbumArtists": "Artistes del Àlbum",
-    "HeaderCameraUploads": "Pujades de Càmera",
    "HeaderContinueWatching": "Continua Veient",
    "HeaderFavoriteAlbums": "Àlbums Preferits",
    "HeaderFavoriteArtists": "Artistes Preferits",
--- a/Emby.Server.Implementations/Localization/Core/cs.json
+++ b/Emby.Server.Implementations/Localization/Core/cs.json
@@ -16,7 +16,6 @@
    "Folders": "Složky",
    "Genres": "Žánry",
    "HeaderAlbumArtists": "Umělci alba",
-    "HeaderCameraUploads": "Nahrané fotografie",
    "HeaderContinueWatching": "Pokračovat ve sledování",
    "HeaderFavoriteAlbums": "Oblíbená alba",
    "HeaderFavoriteArtists": "Oblíbení interpreti",
--- a/Emby.Server.Implementations/Localization/Core/da.json
+++ b/Emby.Server.Implementations/Localization/Core/da.json
@@ -16,7 +16,6 @@
    "Folders": "Mapper",
    "Genres": "Genrer",
    "HeaderAlbumArtists": "Albumkunstnere",
-    "HeaderCameraUploads": "Kamera Uploads",
    "HeaderContinueWatching": "Fortsæt Afspilning",
    "HeaderFavoriteAlbums": "Favoritalbummer",
    "HeaderFavoriteArtists": "Favoritkunstnere",
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -16,7 +16,6 @@
    "Folders": "Verzeichnisse",
    "Genres": "Genres",
    "HeaderAlbumArtists": "Album-Interpreten",
-    "HeaderCameraUploads": "Kamera-Uploads",
    "HeaderContinueWatching": "Fortsetzen",
    "HeaderFavoriteAlbums": "Lieblingsalben",
    "HeaderFavoriteArtists": "Lieblings-Interpreten",
--- a/Emby.Server.Implementations/Localization/Core/el.json
+++ b/Emby.Server.Implementations/Localization/Core/el.json
@@ -16,7 +16,6 @@
    "Folders": "Φάκελοι",
    "Genres": "Είδη",
    "HeaderAlbumArtists": "Καλλιτέχνες του Άλμπουμ",
-    "HeaderCameraUploads": "Μεταφορτώσεις Κάμερας",
    "HeaderContinueWatching": "Συνεχίστε την παρακολούθηση",
    "HeaderFavoriteAlbums": "Αγαπημένα Άλμπουμ",
    "HeaderFavoriteArtists": "Αγαπημένοι Καλλιτέχνες",
--- a/Emby.Server.Implementations/Localization/Core/en-GB.json
+++ b/Emby.Server.Implementations/Localization/Core/en-GB.json
@@ -16,7 +16,6 @@
    "Folders": "Folders",
    "Genres": "Genres",
    "HeaderAlbumArtists": "Album Artists",
-    "HeaderCameraUploads": "Camera Uploads",
    "HeaderContinueWatching": "Continue Watching",
    "HeaderFavoriteAlbums": "Favourite Albums",
    "HeaderFavoriteArtists": "Favourite Artists",
--- a/Emby.Server.Implementations/Localization/Core/en-US.json
+++ b/Emby.Server.Implementations/Localization/Core/en-US.json
@@ -16,7 +16,6 @@
    "Folders": "Folders",
    "Genres": "Genres",
    "HeaderAlbumArtists": "Album Artists",
-    "HeaderCameraUploads": "Camera Uploads",
    "HeaderContinueWatching": "Continue Watching",
    "HeaderFavoriteAlbums": "Favorite Albums",
    "HeaderFavoriteArtists": "Favorite Artists",
--- a/Emby.Server.Implementations/Localization/Core/es-AR.json
+++ b/Emby.Server.Implementations/Localization/Core/es-AR.json
@@ -16,7 +16,6 @@
    "Folders": "Carpetas",
    "Genres": "Géneros",
    "HeaderAlbumArtists": "Artistas de álbum",
-    "HeaderCameraUploads": "Subidas de cámara",
    "HeaderContinueWatching": "Seguir viendo",
    "HeaderFavoriteAlbums": "Álbumes favoritos",
    "HeaderFavoriteArtists": "Artistas favoritos",
--- a/Emby.Server.Implementations/Localization/Core/es-MX.json
+++ b/Emby.Server.Implementations/Localization/Core/es-MX.json
@@ -16,7 +16,6 @@
    "Folders": "Carpetas",
    "Genres": "Géneros",
    "HeaderAlbumArtists": "Artistas del álbum",
-    "HeaderCameraUploads": "Subidas desde la cámara",
    "HeaderContinueWatching": "Continuar viendo",
    "HeaderFavoriteAlbums": "Álbumes favoritos",
    "HeaderFavoriteArtists": "Artistas favoritos",
--- a/Emby.Server.Implementations/Localization/Core/es.json
+++ b/Emby.Server.Implementations/Localization/Core/es.json
@@ -16,7 +16,6 @@
    "Folders": "Carpetas",
    "Genres": "Géneros",
    "HeaderAlbumArtists": "Artistas del álbum",
-    "HeaderCameraUploads": "Subidas desde la cámara",
    "HeaderContinueWatching": "Continuar viendo",
    "HeaderFavoriteAlbums": "Álbumes favoritos",
    "HeaderFavoriteArtists": "Artistas favoritos",
--- a/Emby.Server.Implementations/Localization/Core/es_419.json
+++ b/Emby.Server.Implementations/Localization/Core/es_419.json
@@ -105,7 +105,6 @@
    "Inherit": "Heredar",
    "HomeVideos": "Videos caseros",
    "HeaderRecordingGroups": "Grupos de grabación",
-    "HeaderCameraUploads": "Subidas desde la cámara",
    "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesión desde {0}",
    "DeviceOnlineWithName": "{0} está conectado",
    "DeviceOfflineWithName": "{0} se ha desconectado",
--- a/Emby.Server.Implementations/Localization/Core/es_DO.json
+++ b/Emby.Server.Implementations/Localization/Core/es_DO.json
@@ -12,7 +12,6 @@
    "Application": "Aplicación",
    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
    "HeaderContinueWatching": "Continuar Viendo",
-    "HeaderCameraUploads": "Subidas de Cámara",
    "HeaderAlbumArtists": "Artistas del Álbum",
    "Genres": "Géneros",
    "Folders": "Carpetas",
--- a/Emby.Server.Implementations/Localization/Core/fa.json
+++ b/Emby.Server.Implementations/Localization/Core/fa.json
@@ -16,7 +16,6 @@
    "Folders": "پوشه‌ها",
    "Genres": "ژانرها",
    "HeaderAlbumArtists": "هنرمندان آلبوم",
-    "HeaderCameraUploads": "آپلودهای دوربین",
    "HeaderContinueWatching": "ادامه تماشا",
    "HeaderFavoriteAlbums": "آلبوم‌های مورد علاقه",
    "HeaderFavoriteArtists": "هنرمندان مورد علاقه",
--- a/Emby.Server.Implementations/Localization/Core/fi.json
+++ b/Emby.Server.Implementations/Localization/Core/fi.json
@@ -24,7 +24,6 @@
    "HeaderFavoriteSongs": "Lempikappaleet",
    "HeaderFavoriteShows": "Lempisarjat",
    "HeaderFavoriteEpisodes": "Lempijaksot",
-    "HeaderCameraUploads": "Kamerasta Lähetetyt",
    "HeaderFavoriteArtists": "Lempiartistit",
    "HeaderFavoriteAlbums": "Lempialbumit",
    "HeaderContinueWatching": "Jatka katsomista",
--- a/Emby.Server.Implementations/Localization/Core/fil.json
+++ b/Emby.Server.Implementations/Localization/Core/fil.json
@@ -73,7 +73,6 @@
    "HeaderFavoriteArtists": "Paboritong Artista",
    "HeaderFavoriteAlbums": "Paboritong Albums",
    "HeaderContinueWatching": "Ituloy Manood",
-    "HeaderCameraUploads": "Camera Uploads",
    "HeaderAlbumArtists": "Artista ng Album",
    "Genres": "Kategorya",
    "Folders": "Folders",
--- a/Emby.Server.Implementations/Localization/Core/fr-CA.json
+++ b/Emby.Server.Implementations/Localization/Core/fr-CA.json
@@ -16,7 +16,6 @@
    "Folders": "Dossiers",
    "Genres": "Genres",
    "HeaderAlbumArtists": "Artistes de l'album",
-    "HeaderCameraUploads": "Photos transférées",
    "HeaderContinueWatching": "Continuer à regarder",
    "HeaderFavoriteAlbums": "Albums favoris",
    "HeaderFavoriteArtists": "Artistes favoris",
--- a/Emby.Server.Implementations/Localization/Core/fr.json
+++ b/Emby.Server.Implementations/Localization/Core/fr.json
@@ -16,7 +16,6 @@
    "Folders": "Dossiers",
    "Genres": "Genres",
    "HeaderAlbumArtists": "Artistes",
-    "HeaderCameraUploads": "Photos transférées",
    "HeaderContinueWatching": "Continuer à regarder",
    "HeaderFavoriteAlbums": "Albums favoris",
    "HeaderFavoriteArtists": "Artistes préférés",
--- a/Emby.Server.Implementations/Localization/Core/gsw.json
+++ b/Emby.Server.Implementations/Localization/Core/gsw.json
@@ -16,7 +16,6 @@
    "Folders": "Ordner",
    "Genres": "Genres",
    "HeaderAlbumArtists": "Album-Künstler",
-    "HeaderCameraUploads": "Kamera-Uploads",
    "HeaderContinueWatching": "weiter schauen",
    "HeaderFavoriteAlbums": "Lieblingsalben",
    "HeaderFavoriteArtists": "Lieblings-Künstler",
--- a/Emby.Server.Implementations/Localization/Core/he.json
+++ b/Emby.Server.Implementations/Localization/Core/he.json
@@ -16,7 +16,6 @@
    "Folders": "תיקיות",
    "Genres": "ז'אנרים",
    "HeaderAlbumArtists": "אמני האלבום",
-    "HeaderCameraUploads": "העלאות ממצלמה",
    "HeaderContinueWatching": "המשך לצפות",
    "HeaderFavoriteAlbums": "אלבומים מועדפים",
    "HeaderFavoriteArtists": "אמנים מועדפים",
--- a/Emby.Server.Implementations/Localization/Core/hr.json
+++ b/Emby.Server.Implementations/Localization/Core/hr.json
@@ -16,7 +16,6 @@
    "Folders": "Mape",
    "Genres": "Žanrovi",
    "HeaderAlbumArtists": "Izvođači na albumu",
-    "HeaderCameraUploads": "Uvoz sa kamere",
    "HeaderContinueWatching": "Nastavi gledati",
    "HeaderFavoriteAlbums": "Omiljeni albumi",
    "HeaderFavoriteArtists": "Omiljeni izvođači",
--- a/Emby.Server.Implementations/Localization/Core/hu.json
+++ b/Emby.Server.Implementations/Localization/Core/hu.json
@@ -16,7 +16,6 @@
    "Folders": "Könyvtárak",
    "Genres": "Műfajok",
    "HeaderAlbumArtists": "Album előadók",
-    "HeaderCameraUploads": "Kamera feltöltések",
    "HeaderContinueWatching": "Megtekintés folytatása",
    "HeaderFavoriteAlbums": "Kedvenc albumok",
    "HeaderFavoriteArtists": "Kedvenc előadók",
--- a/Emby.Server.Implementations/Localization/Core/id.json
+++ b/Emby.Server.Implementations/Localization/Core/id.json
@@ -20,7 +20,6 @@
    "HeaderFavoriteArtists": "Artis Favorit",
    "HeaderFavoriteAlbums": "Album Favorit",
    "HeaderContinueWatching": "Lanjut Menonton",
-    "HeaderCameraUploads": "Unggahan Kamera",
    "HeaderAlbumArtists": "Album Artis",
    "Genres": "Aliran",
    "Folders": "Folder",
--- a/Emby.Server.Implementations/Localization/Core/is.json
+++ b/Emby.Server.Implementations/Localization/Core/is.json
@@ -13,7 +13,6 @@
    "HeaderFavoriteArtists": "Uppáhalds Listamenn",
    "HeaderFavoriteAlbums": "Uppáhalds Plötur",
    "HeaderContinueWatching": "Halda áfram að horfa",
-    "HeaderCameraUploads": "Myndavéla upphal",
    "HeaderAlbumArtists": "Höfundur plötu",
    "Genres": "Tegundir",
    "Folders": "Möppur",
--- a/Emby.Server.Implementations/Localization/Core/it.json
+++ b/Emby.Server.Implementations/Localization/Core/it.json
@@ -16,7 +16,6 @@
    "Folders": "Cartelle",
    "Genres": "Generi",
    "HeaderAlbumArtists": "Artisti degli Album",
-    "HeaderCameraUploads": "Caricamenti Fotocamera",
    "HeaderContinueWatching": "Continua a guardare",
    "HeaderFavoriteAlbums": "Album Preferiti",
    "HeaderFavoriteArtists": "Artisti Preferiti",
--- a/Emby.Server.Implementations/Localization/Core/ja.json
+++ b/Emby.Server.Implementations/Localization/Core/ja.json
@@ -16,7 +16,6 @@
    "Folders": "フォルダー",
    "Genres": "ジャンル",
    "HeaderAlbumArtists": "アルバムアーティスト",
-    "HeaderCameraUploads": "カメラアップロード",
    "HeaderContinueWatching": "視聴を続ける",
    "HeaderFavoriteAlbums": "お気に入りのアルバム",
    "HeaderFavoriteArtists": "お気に入りのアーティスト",
--- a/Emby.Server.Implementations/Localization/Core/kk.json
+++ b/Emby.Server.Implementations/Localization/Core/kk.json
@@ -16,7 +16,6 @@
    "Folders": "Qaltalar",
    "Genres": "Janrlar",
    "HeaderAlbumArtists": "Álbom oryndaýshylary",
-    "HeaderCameraUploads": "Kameradan júktelgender",
    "HeaderContinueWatching": "Qaraýdy jalǵastyrý",
    "HeaderFavoriteAlbums": "Tańdaýly álbomdar",
    "HeaderFavoriteArtists": "Tańdaýly oryndaýshylar",
--- a/Emby.Server.Implementations/Localization/Core/ko.json
+++ b/Emby.Server.Implementations/Localization/Core/ko.json
@@ -16,7 +16,6 @@
    "Folders": "폴더",
    "Genres": "장르",
    "HeaderAlbumArtists": "앨범 아티스트",
-    "HeaderCameraUploads": "카메라 업로드",
    "HeaderContinueWatching": "계속 시청하기",
    "HeaderFavoriteAlbums": "즐겨찾는 앨범",
    "HeaderFavoriteArtists": "즐겨찾는 아티스트",
--- a/Emby.Server.Implementations/Localization/Core/lt-LT.json
+++ b/Emby.Server.Implementations/Localization/Core/lt-LT.json
@@ -16,7 +16,6 @@
    "Folders": "Katalogai",
    "Genres": "Žanrai",
    "HeaderAlbumArtists": "Albumo atlikėjai",
-    "HeaderCameraUploads": "Kameros",
    "HeaderContinueWatching": "Žiūrėti toliau",
    "HeaderFavoriteAlbums": "Mėgstami Albumai",
    "HeaderFavoriteArtists": "Mėgstami Atlikėjai",
--- a/Emby.Server.Implementations/Localization/Core/lv.json
+++ b/Emby.Server.Implementations/Localization/Core/lv.json
@@ -72,7 +72,6 @@
    "ItemAddedWithName": "{0} tika pievienots bibliotēkai",
    "HeaderLiveTV": "Tiešraides TV",
    "HeaderContinueWatching": "Turpināt Skatīšanos",
-    "HeaderCameraUploads": "Kameras augšupielādes",
    "HeaderAlbumArtists": "Albumu Izpildītāji",
    "Genres": "Žanri",
    "Folders": "Mapes",
--- a/Emby.Server.Implementations/Localization/Core/mk.json
+++ b/Emby.Server.Implementations/Localization/Core/mk.json
@@ -51,7 +51,6 @@
    "HeaderFavoriteArtists": "Омилени Изведувачи",
    "HeaderFavoriteAlbums": "Омилени Албуми",
    "HeaderContinueWatching": "Продолжи со гледање",
-    "HeaderCameraUploads": "Поставувања од камера",
    "HeaderAlbumArtists": "Изведувачи од Албуми",
    "Genres": "Жанрови",
    "Folders": "Папки",
--- a/Emby.Server.Implementations/Localization/Core/mr.json
+++ b/Emby.Server.Implementations/Localization/Core/mr.json
@@ -54,7 +54,6 @@
    "ItemAddedWithName": "{0} हे संग्रहालयात जोडले गेले",
    "HomeVideos": "घरचे व्हिडीयो",
    "HeaderRecordingGroups": "रेकॉर्डिंग गट",
-    "HeaderCameraUploads": "कॅमेरा अपलोड",
    "CameraImageUploadedFrom": "एक नवीन कॅमेरा चित्र {0} येथून अपलोड केले आहे",
    "Application": "अ‍ॅप्लिकेशन",
    "AppDeviceValues": "अ‍ॅप: {0}, यंत्र: {1}",
--- a/Emby.Server.Implementations/Localization/Core/ms.json
+++ b/Emby.Server.Implementations/Localization/Core/ms.json
@@ -16,7 +16,6 @@
    "Folders": "Fail-fail",
    "Genres": "Genre-genre",
    "HeaderAlbumArtists": "Album Artis-artis",
-    "HeaderCameraUploads": "Muatnaik Kamera",
    "HeaderContinueWatching": "Terus Menonton",
    "HeaderFavoriteAlbums": "Album-album Kegemaran",
    "HeaderFavoriteArtists": "Artis-artis Kegemaran",
--- a/Emby.Server.Implementations/Localization/Core/nb.json
+++ b/Emby.Server.Implementations/Localization/Core/nb.json
@@ -16,7 +16,6 @@
    "Folders": "Mapper",
    "Genres": "Sjangre",
    "HeaderAlbumArtists": "Albumartister",
-    "HeaderCameraUploads": "Kameraopplastinger",
    "HeaderContinueWatching": "Fortsett å se",
    "HeaderFavoriteAlbums": "Favorittalbum",
    "HeaderFavoriteArtists": "Favorittartister",
--- a/Emby.Server.Implementations/Localization/Core/ne.json
+++ b/Emby.Server.Implementations/Localization/Core/ne.json
@@ -41,7 +41,6 @@
    "HeaderFavoriteArtists": "मनपर्ने कलाकारहरू",
    "HeaderFavoriteAlbums": "मनपर्ने एल्बमहरू",
    "HeaderContinueWatching": "हेर्न जारी राख्नुहोस्",
-    "HeaderCameraUploads": "क्यामेरा अपलोडहरू",
    "HeaderAlbumArtists": "एल्बमका कलाकारहरू",
    "Genres": "विधाहरू",
    "Folders": "फोल्डरहरू",
--- a/Emby.Server.Implementations/Localization/Core/nl.json
+++ b/Emby.Server.Implementations/Localization/Core/nl.json
@@ -16,7 +16,6 @@
    "Folders": "Mappen",
    "Genres": "Genres",
    "HeaderAlbumArtists": "Albumartiesten",
-    "HeaderCameraUploads": "Camera-uploads",
    "HeaderContinueWatching": "Kijken hervatten",
    "HeaderFavoriteAlbums": "Favoriete albums",
    "HeaderFavoriteArtists": "Favoriete artiesten",
--- a/Emby.Server.Implementations/Localization/Core/nn.json
+++ b/Emby.Server.Implementations/Localization/Core/nn.json
@@ -19,7 +19,6 @@
    "HeaderFavoriteArtists": "Favoritt Artistar",
    "HeaderFavoriteAlbums": "Favoritt Album",
    "HeaderContinueWatching": "Fortsett å sjå",
-    "HeaderCameraUploads": "Kamera Opplastingar",
    "HeaderAlbumArtists": "Album Artist",
    "Genres": "Sjangrar",
    "Folders": "Mapper",
--- a/Emby.Server.Implementations/Localization/Core/pl.json
+++ b/Emby.Server.Implementations/Localization/Core/pl.json
@@ -16,7 +16,6 @@
    "Folders": "Foldery",
    "Genres": "Gatunki",
    "HeaderAlbumArtists": "Wykonawcy albumów",
-    "HeaderCameraUploads": "Przekazane obrazy",
    "HeaderContinueWatching": "Kontynuuj odtwarzanie",
    "HeaderFavoriteAlbums": "Ulubione albumy",
    "HeaderFavoriteArtists": "Ulubieni wykonawcy",
--- a/Emby.Server.Implementations/Localization/Core/pt-BR.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-BR.json
@@ -16,7 +16,6 @@
    "Folders": "Pastas",
    "Genres": "Gêneros",
    "HeaderAlbumArtists": "Artistas do Álbum",
-    "HeaderCameraUploads": "Envios da Câmera",
    "HeaderContinueWatching": "Continuar Assistindo",
    "HeaderFavoriteAlbums": "Álbuns Favoritos",
    "HeaderFavoriteArtists": "Artistas favoritos",
--- a/Emby.Server.Implementations/Localization/Core/pt-PT.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-PT.json
@@ -16,7 +16,6 @@
    "Folders": "Pastas",
    "Genres": "Géneros",
    "HeaderAlbumArtists": "Artistas do Álbum",
-    "HeaderCameraUploads": "Envios a partir da câmara",
    "HeaderContinueWatching": "Continuar a Ver",
    "HeaderFavoriteAlbums": "Álbuns Favoritos",
    "HeaderFavoriteArtists": "Artistas Favoritos",
@@ -26,7 +25,7 @@
    "HeaderLiveTV": "TV em Direto",
    "HeaderNextUp": "A Seguir",
    "HeaderRecordingGroups": "Grupos de Gravação",
-    "HomeVideos": "Videos caseiros",
+    "HomeVideos": "Vídeos Caseiros",
    "Inherit": "Herdar",
    "ItemAddedWithName": "{0} foi adicionado à biblioteca",
    "ItemRemovedWithName": "{0} foi removido da biblioteca",
--- a/Emby.Server.Implementations/Localization/Core/pt.json
+++ b/Emby.Server.Implementations/Localization/Core/pt.json
@@ -83,7 +83,6 @@
    "Playlists": "Listas de Reprodução",
    "Photos": "Fotografias",
    "Movies": "Filmes",
-    "HeaderCameraUploads": "Carregamentos a partir da câmara",
    "FailedLoginAttemptWithUserName": "Tentativa de ligação falhada a partir de {0}",
    "DeviceOnlineWithName": "{0} está connectado",
    "DeviceOfflineWithName": "{0} desconectou-se",
--- a/Emby.Server.Implementations/Localization/Core/ro.json
+++ b/Emby.Server.Implementations/Localization/Core/ro.json
@@ -74,7 +74,6 @@
    "HeaderFavoriteArtists": "Artiști Favoriți",
    "HeaderFavoriteAlbums": "Albume Favorite",
    "HeaderContinueWatching": "Vizionează în continuare",
-    "HeaderCameraUploads": "Incărcări Cameră Foto",
    "HeaderAlbumArtists": "Album Artiști",
    "Genres": "Genuri",
    "Folders": "Dosare",
--- a/Emby.Server.Implementations/Localization/Core/ru.json
+++ b/Emby.Server.Implementations/Localization/Core/ru.json
@@ -16,7 +16,6 @@
    "Folders": "Папки",
    "Genres": "Жанры",
    "HeaderAlbumArtists": "Исполнители альбома",
-    "HeaderCameraUploads": "Камеры",
    "HeaderContinueWatching": "Продолжение просмотра",
    "HeaderFavoriteAlbums": "Избранные альбомы",
    "HeaderFavoriteArtists": "Избранные исполнители",
--- a/Emby.Server.Implementations/Localization/Core/sk.json
+++ b/Emby.Server.Implementations/Localization/Core/sk.json
@@ -16,7 +16,6 @@
    "Folders": "Priečinky",
    "Genres": "Žánre",
    "HeaderAlbumArtists": "Umelci albumu",
-    "HeaderCameraUploads": "Nahrané fotografie",
    "HeaderContinueWatching": "Pokračovať v pozeraní",
    "HeaderFavoriteAlbums": "Obľúbené albumy",
    "HeaderFavoriteArtists": "Obľúbení umelci",
--- a/Emby.Server.Implementations/Localization/Core/sl-SI.json
+++ b/Emby.Server.Implementations/Localization/Core/sl-SI.json
@@ -16,7 +16,6 @@
    "Folders": "Mape",
    "Genres": "Zvrsti",
    "HeaderAlbumArtists": "Izvajalci albuma",
-    "HeaderCameraUploads": "Posnetki kamere",
    "HeaderContinueWatching": "Nadaljuj gledanje",
    "HeaderFavoriteAlbums": "Priljubljeni albumi",
    "HeaderFavoriteArtists": "Priljubljeni izvajalci",
--- a/Emby.Server.Implementations/Localization/Core/sq.json
+++ b/Emby.Server.Implementations/Localization/Core/sq.json
@@ -96,7 +96,6 @@
    "HeaderFavoriteArtists": "Artistët e preferuar",
    "HeaderFavoriteAlbums": "Albumet e preferuar",
    "HeaderContinueWatching": "Vazhdo të shikosh",
-    "HeaderCameraUploads": "Ngarkimet nga Kamera",
    "HeaderAlbumArtists": "Artistët e albumeve",
    "Genres": "Zhanre",
    "Folders": "Dosje",
--- a/Emby.Server.Implementations/Localization/Core/sr.json
+++ b/Emby.Server.Implementations/Localization/Core/sr.json
@@ -74,7 +74,6 @@
    "HeaderFavoriteArtists": "Омиљени извођачи",
    "HeaderFavoriteAlbums": "Омиљени албуми",
    "HeaderContinueWatching": "Настави гледање",
-    "HeaderCameraUploads": "Слања са камере",
    "HeaderAlbumArtists": "Извођачи албума",
    "Genres": "Жанрови",
    "Folders": "Фасцикле",
--- a/Emby.Server.Implementations/Localization/Core/sv.json
+++ b/Emby.Server.Implementations/Localization/Core/sv.json
@@ -16,7 +16,6 @@
    "Folders": "Mappar",
    "Genres": "Genrer",
    "HeaderAlbumArtists": "Albumartister",
-    "HeaderCameraUploads": "Kamerauppladdningar",
    "HeaderContinueWatching": "Fortsätt kolla",
    "HeaderFavoriteAlbums": "Favoritalbum",
    "HeaderFavoriteArtists": "Favoritartister",
--- a/Emby.Server.Implementations/Localization/Core/ta.json
+++ b/Emby.Server.Implementations/Localization/Core/ta.json
@@ -20,7 +20,6 @@
    "MessageApplicationUpdated": "ஜெல்லிஃபின் சேவையகம் புதுப்பிக்கப்பட்டது",
    "Inherit": "மரபுரிமையாகப் பெறு",
    "HeaderRecordingGroups": "பதிவு குழுக்கள்",
-    "HeaderCameraUploads": "புகைப்பட பதிவேற்றங்கள்",
    "Folders": "கோப்புறைகள்",
    "FailedLoginAttemptWithUserName": "{0} இலிருந்து உள்நுழைவு முயற்சி தோல்வியடைந்தது",
    "DeviceOnlineWithName": "{0} இணைக்கப்பட்டது",
--- a/Emby.Server.Implementations/Localization/Core/th.json
+++ b/Emby.Server.Implementations/Localization/Core/th.json
@@ -50,7 +50,6 @@
    "HeaderFavoriteArtists": "ศิลปินที่ชื่นชอบ",
    "HeaderFavoriteAlbums": "อัมบั้มที่ชื่นชอบ",
    "HeaderContinueWatching": "ดูต่อ",
-    "HeaderCameraUploads": "อัปโหลดรูปถ่าย",
    "HeaderAlbumArtists": "อัลบั้มศิลปิน",
    "Genres": "ประเภท",
    "Folders": "โฟลเดอร์",
--- a/Emby.Server.Implementations/Localization/Core/tr.json
+++ b/Emby.Server.Implementations/Localization/Core/tr.json
@@ -16,7 +16,6 @@
    "Folders": "Klasörler",
    "Genres": "Türler",
    "HeaderAlbumArtists": "Albüm Sanatçıları",
-    "HeaderCameraUploads": "Kamera Yüklemeleri",
    "HeaderContinueWatching": "İzlemeye Devam Et",
    "HeaderFavoriteAlbums": "Favori Albümler",
    "HeaderFavoriteArtists": "Favori Sanatçılar",
--- a/Emby.Server.Implementations/Localization/Core/uk.json
+++ b/Emby.Server.Implementations/Localization/Core/uk.json
@@ -16,7 +16,6 @@
    "HeaderFavoriteArtists": "Улюблені виконавці",
    "HeaderFavoriteAlbums": "Улюблені альбоми",
    "HeaderContinueWatching": "Продовжити перегляд",
-    "HeaderCameraUploads": "Завантажено з камери",
    "HeaderAlbumArtists": "Виконавці альбому",
    "Genres": "Жанри",
    "Folders": "Каталоги",
--- a/Emby.Server.Implementations/Localization/Core/ur_PK.json
+++ b/Emby.Server.Implementations/Localization/Core/ur_PK.json
@@ -105,7 +105,6 @@
    "Inherit": "وراثت میں",
    "HomeVideos": "ہوم ویڈیو",
    "HeaderRecordingGroups": "ریکارڈنگ گروپس",
-    "HeaderCameraUploads": "کیمرہ اپلوڈز",
    "FailedLoginAttemptWithUserName": "لاگن کئ کوشش ناکام {0}",
    "DeviceOnlineWithName": "{0} متصل ھو چکا ھے",
    "DeviceOfflineWithName": "{0} منقطع ھو چکا ھے",
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -103,7 +103,6 @@
    "HeaderFavoriteEpisodes": "Tập Phim Yêu Thích",
    "HeaderFavoriteArtists": "Nghệ Sĩ Yêu Thích",
    "HeaderFavoriteAlbums": "Album Ưa Thích",
-    "HeaderCameraUploads": "Máy Ảnh Tải Lên",
    "FailedLoginAttemptWithUserName": "Nỗ lực đăng nhập thất bại từ {0}",
    "DeviceOnlineWithName": "{0} đã kết nối",
    "DeviceOfflineWithName": "{0} đã ngắt kết nối",
--- a/Emby.Server.Implementations/Localization/Core/zh-CN.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-CN.json
@@ -16,7 +16,6 @@
    "Folders": "文件夹",
    "Genres": "风格",
    "HeaderAlbumArtists": "专辑作家",
-    "HeaderCameraUploads": "相机上传",
    "HeaderContinueWatching": "继续观影",
    "HeaderFavoriteAlbums": "收藏的专辑",
    "HeaderFavoriteArtists": "最爱的艺术家",
--- a/Emby.Server.Implementations/Localization/Core/zh-HK.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-HK.json
@@ -16,7 +16,6 @@
    "Folders": "檔案夾",
    "Genres": "風格",
    "HeaderAlbumArtists": "專輯藝人",
-    "HeaderCameraUploads": "相機上載",
    "HeaderContinueWatching": "繼續觀看",
    "HeaderFavoriteAlbums": "最愛專輯",
    "HeaderFavoriteArtists": "最愛的藝人",
--- a/Emby.Server.Implementations/Localization/Core/zh-TW.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-TW.json
@@ -16,7 +16,6 @@
    "Folders": "資料夾",
    "Genres": "風格",
    "HeaderAlbumArtists": "專輯演出者",
-    "HeaderCameraUploads": "相機上傳",
    "HeaderContinueWatching": "繼續觀賞",
    "HeaderFavoriteAlbums": "最愛專輯",
    "HeaderFavoriteArtists": "最愛演出者",
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
@@ -71,7 +71,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
            return new[]
            {
                // Every so often
-                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks}
+                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks }
            };
        }

--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
@@ -65,7 +65,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
        {
            return new[]
            {
-                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks}
+                new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks }
            };
        }

--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs
@@ -148,7 +148,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
        public bool IsHidden => false;

        /// <inheritdoc />
-        public bool IsEnabled => false;
+        public bool IsEnabled => true;

        /// <inheritdoc />
        public bool IsLogged => true;
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -54,7 +54,8 @@ namespace Emby.Server.Implementations.Security
            {
                if (tableNewlyCreated && TableExists(connection, "AccessTokens"))
                {
-                    connection.RunInTransaction(db =>
+                    connection.RunInTransaction(
+                    db =>
                    {
                        var existingColumnNames = GetColumnNames(db, "AccessTokens");

@@ -88,7 +89,8 @@ namespace Emby.Server.Implementations.Security

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    using (var statement = db.PrepareStatement("insert into Tokens (AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, UserName, IsActive, DateCreated, DateLastActivity) values (@AccessToken, @DeviceId, @AppName, @AppVersion, @DeviceName, @UserId, @UserName, @IsActive, @DateCreated, @DateLastActivity)"))
                    {
@@ -119,7 +121,8 @@ namespace Emby.Server.Implementations.Security

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    using (var statement = db.PrepareStatement("Update Tokens set AccessToken=@AccessToken, DeviceId=@DeviceId, AppName=@AppName, AppVersion=@AppVersion, DeviceName=@DeviceName, UserId=@UserId, UserName=@UserName, DateCreated=@DateCreated, DateLastActivity=@DateLastActivity where Id=@Id"))
                    {
@@ -151,7 +154,8 @@ namespace Emby.Server.Implementations.Security

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    using (var statement = db.PrepareStatement("Delete from Tokens where Id=@Id"))
                    {
@@ -346,7 +350,8 @@ namespace Emby.Server.Implementations.Security
        {
            using (var connection = GetConnection(true))
            {
-                return connection.RunInTransaction(db =>
+                return connection.RunInTransaction(
+                db =>
                {
                    using (var statement = base.PrepareStatement(db, "select CustomName from Devices where Id=@DeviceId"))
                    {
@@ -377,7 +382,8 @@ namespace Emby.Server.Implementations.Security

            using (var connection = GetConnection())
            {
-                connection.RunInTransaction(db =>
+                connection.RunInTransaction(
+                db =>
                {
                    using (var statement = db.PrepareStatement("replace into devices (Id, CustomName, Capabilities) VALUES (@Id, @CustomName, (Select Capabilities from Devices where Id=@Id))"))
                    {
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -666,7 +666,7 @@ namespace Emby.Server.Implementations.Session
                }
            }

-            var eventArgs = new PlaybackProgressEventArgs
+            var eventArgs = new PlaybackStartEventArgs
            {
                Item = libraryItem,
                Users = users,
@@ -1064,10 +1064,10 @@ namespace Emby.Server.Implementations.Session
                AssertCanControl(session, controllingSession);
            }

-            return SendMessageToSession(session, "GeneralCommand", command, cancellationToken);
+            return SendMessageToSession(session, SessionMessageType.GeneralCommand, command, cancellationToken);
        }

-        private static async Task SendMessageToSession<T>(SessionInfo session, string name, T data, CancellationToken cancellationToken)
+        private static async Task SendMessageToSession<T>(SessionInfo session, SessionMessageType name, T data, CancellationToken cancellationToken)
        {
            var controllers = session.SessionControllers;
            var messageId = Guid.NewGuid();
@@ -1078,7 +1078,7 @@ namespace Emby.Server.Implementations.Session
            }
        }

-        private static Task SendMessageToSessions<T>(IEnumerable<SessionInfo> sessions, string name, T data, CancellationToken cancellationToken)
+        private static Task SendMessageToSessions<T>(IEnumerable<SessionInfo> sessions, SessionMessageType name, T data, CancellationToken cancellationToken)
        {
            IEnumerable<Task> GetTasks()
            {
@@ -1178,7 +1178,7 @@ namespace Emby.Server.Implementations.Session
                }
            }

-            await SendMessageToSession(session, "Play", command, cancellationToken).ConfigureAwait(false);
+            await SendMessageToSession(session, SessionMessageType.Play, command, cancellationToken).ConfigureAwait(false);
        }

        /// <inheritdoc />
@@ -1186,7 +1186,7 @@ namespace Emby.Server.Implementations.Session
        {
            CheckDisposed();
            var session = GetSessionToRemoteControl(sessionId);
-            await SendMessageToSession(session, "SyncPlayCommand", command, cancellationToken).ConfigureAwait(false);
+            await SendMessageToSession(session, SessionMessageType.SyncPlayCommand, command, cancellationToken).ConfigureAwait(false);
        }

        /// <inheritdoc />
@@ -1194,7 +1194,7 @@ namespace Emby.Server.Implementations.Session
        {
            CheckDisposed();
            var session = GetSessionToRemoteControl(sessionId);
-            await SendMessageToSession(session, "SyncPlayGroupUpdate", command, cancellationToken).ConfigureAwait(false);
+            await SendMessageToSession(session, SessionMessageType.SyncPlayGroupUpdate, command, cancellationToken).ConfigureAwait(false);
        }

        private IEnumerable<BaseItem> TranslateItemForPlayback(Guid id, User user)
@@ -1297,7 +1297,7 @@ namespace Emby.Server.Implementations.Session
                }
            }

-            return SendMessageToSession(session, "Playstate", command, cancellationToken);
+            return SendMessageToSession(session, SessionMessageType.PlayState, command, cancellationToken);
        }

        private static void AssertCanControl(SessionInfo session, SessionInfo controllingSession)
@@ -1322,7 +1322,7 @@ namespace Emby.Server.Implementations.Session
        {
            CheckDisposed();

-            return SendMessageToSessions(Sessions, "RestartRequired", string.Empty, cancellationToken);
+            return SendMessageToSessions(Sessions, SessionMessageType.RestartRequired, string.Empty, cancellationToken);
        }

        /// <summary>
@@ -1334,7 +1334,7 @@ namespace Emby.Server.Implementations.Session
        {
            CheckDisposed();

-            return SendMessageToSessions(Sessions, "ServerShuttingDown", string.Empty, cancellationToken);
+            return SendMessageToSessions(Sessions, SessionMessageType.ServerShuttingDown, string.Empty, cancellationToken);
        }

        /// <summary>
@@ -1348,7 +1348,7 @@ namespace Emby.Server.Implementations.Session

            _logger.LogDebug("Beginning SendServerRestartNotification");

-            return SendMessageToSessions(Sessions, "ServerRestarting", string.Empty, cancellationToken);
+            return SendMessageToSessions(Sessions, SessionMessageType.ServerRestarting, string.Empty, cancellationToken);
        }

        /// <summary>
@@ -1484,6 +1484,14 @@ namespace Emby.Server.Implementations.Session
                throw new SecurityException("User is not allowed access from this device.");
            }

+            int sessionsCount = Sessions.Count(i => i.UserId.Equals(user.Id));
+            int maxActiveSessions = user.MaxActiveSessions;
+            _logger.LogInformation("Current/Max sessions for user {User}: {Sessions}/{Max}", user.Username, sessionsCount, maxActiveSessions);
+            if (maxActiveSessions >= 1 && sessionsCount >= maxActiveSessions)
+            {
+                throw new SecurityException("User is at their maximum number of sessions.");
+            }
+
            var token = GetAuthorizationToken(user, request.DeviceId, request.App, request.AppVersion, request.DeviceName);

            var session = LogSessionActivity(
@@ -1866,7 +1874,7 @@ namespace Emby.Server.Implementations.Session
        }

        /// <inheritdoc />
-        public Task SendMessageToAdminSessions<T>(string name, T data, CancellationToken cancellationToken)
+        public Task SendMessageToAdminSessions<T>(SessionMessageType name, T data, CancellationToken cancellationToken)
        {
            CheckDisposed();

@@ -1879,7 +1887,7 @@ namespace Emby.Server.Implementations.Session
        }

        /// <inheritdoc />
-        public Task SendMessageToUserSessions<T>(List<Guid> userIds, string name, Func<T> dataFn, CancellationToken cancellationToken)
+        public Task SendMessageToUserSessions<T>(List<Guid> userIds, SessionMessageType name, Func<T> dataFn, CancellationToken cancellationToken)
        {
            CheckDisposed();

@@ -1894,7 +1902,7 @@ namespace Emby.Server.Implementations.Session
        }

        /// <inheritdoc />
-        public Task SendMessageToUserSessions<T>(List<Guid> userIds, string name, T data, CancellationToken cancellationToken)
+        public Task SendMessageToUserSessions<T>(List<Guid> userIds, SessionMessageType name, T data, CancellationToken cancellationToken)
        {
            CheckDisposed();

@@ -1903,7 +1911,7 @@ namespace Emby.Server.Implementations.Session
        }

        /// <inheritdoc />
-        public Task SendMessageToUserDeviceSessions<T>(string deviceId, string name, T data, CancellationToken cancellationToken)
+        public Task SendMessageToUserDeviceSessions<T>(string deviceId, SessionMessageType name, T data, CancellationToken cancellationToken)
        {
            CheckDisposed();

--- a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -8,6 +8,7 @@ using Jellyfin.Data.Events;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;

@@ -316,7 +317,7 @@ namespace Emby.Server.Implementations.Session
            return webSocket.SendAsync(
                new WebSocketMessage<int>
                {
-                    MessageType = "ForceKeepAlive",
+                    MessageType = SessionMessageType.ForceKeepAlive,
                    Data = WebSocketLostTimeout
                },
                CancellationToken.None);
--- a/Emby.Server.Implementations/Session/WebSocketController.cs
+++ b/Emby.Server.Implementations/Session/WebSocketController.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;

 namespace Emby.Server.Implementations.Session
@@ -65,7 +66,7 @@ namespace Emby.Server.Implementations.Session

        /// <inheritdoc />
        public Task SendMessage<T>(
-            string name,
+            SessionMessageType name,
            Guid messageId,
            T data,
            CancellationToken cancellationToken)
--- a/Emby.Server.Implementations/SyncPlay/SyncPlayController.cs
+++ b/Emby.Server.Implementations/SyncPlay/SyncPlayController.cs
@@ -301,8 +301,7 @@ namespace Emby.Server.Implementations.SyncPlay
            if (_group.IsPaused)
            {
                // Pick a suitable time that accounts for latency
-                var delay = _group.GetHighestPing() * 2;
-                delay = delay < _group.DefaultPing ? _group.DefaultPing : delay;
+                var delay = Math.Max(_group.GetHighestPing() * 2, GroupInfo.DefaultPing);

                // Unpause group and set starting point in future
                // Clients will start playback at LastActivity (datetime) from PositionTicks (playback position)
@@ -452,8 +451,7 @@ namespace Emby.Server.Implementations.SyncPlay
                    else
                    {
                        // Client, that was buffering, resumed playback but did not update others in time
-                        delay = _group.GetHighestPing() * 2;
-                        delay = delay < _group.DefaultPing ? _group.DefaultPing : delay;
+                        delay = Math.Max(_group.GetHighestPing() * 2, GroupInfo.DefaultPing);

                        _group.LastActivity = currentTime.AddMilliseconds(
                            delay);
@@ -497,7 +495,7 @@ namespace Emby.Server.Implementations.SyncPlay
        private void HandlePingUpdateRequest(SessionInfo session, PlaybackRequest request)
        {
            // Collected pings are used to account for network latency when unpausing playback
-            _group.UpdatePing(session, request.Ping ?? _group.DefaultPing);
+            _group.UpdatePing(session, request.Ping ?? GroupInfo.DefaultPing);
        }

        /// <inheritdoc />