Merge branch 'jellyfin:master' into master

Emby.Server.Implementations/ApplicationHost.cs

@@ -41,7 +41,6 @@ using Emby.Server.Implementations.Updates;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Drawing;
 using Jellyfin.MediaEncoding.Hls.Playlist;
-using Jellyfin.Networking.Configuration;
 using Jellyfin.Networking.Manager;
 using Jellyfin.Server.Implementations;
 using MediaBrowser.Common;
@@ -100,6 +99,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Prometheus.DotNetRuntime;
 using static MediaBrowser.Controller.Extensions.ConfigurationExtensions;
+using IConfigurationManager = MediaBrowser.Common.Configuration.IConfigurationManager;
 using WebSocketManager = Emby.Server.Implementations.HttpServer.WebSocketManager;
 
 namespace Emby.Server.Implementations
@@ -310,7 +310,9 @@ namespace Emby.Server.Implementations
             {
                 _creatingInstances.Add(type);
                 Logger.LogDebug("Creating instance of {Type}", type);
-                return ActivatorUtilities.CreateInstance(ServiceProvider, type);
+                return ServiceProvider is null
+                    ? Activator.CreateInstance(type)
+                    : ActivatorUtilities.CreateInstance(ServiceProvider, type);
             }
             catch (Exception ex)
             {
@@ -866,7 +868,7 @@ namespace Emby.Server.Implementations
             yield return typeof(MediaBrowser.MediaEncoding.Encoder.MediaEncoder).Assembly;
 
             // Dlna
-            yield return typeof(DlnaEntryPoint).Assembly;
+            yield return typeof(DlnaHost).Assembly;
 
             // Local metadata
             yield return typeof(BoxSetXmlSaver).Assembly;

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

@@ -40,7 +40,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs

@@ -9,7 +9,7 @@ using System.Net;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Jellyfin.Networking.Configuration;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Plugins;

Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs

@@ -1,7 +1,3 @@
-#nullable disable
-
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -23,476 +19,382 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.EntryPoints
+namespace Emby.Server.Implementations.EntryPoints;
+
+/// <summary>
+/// A <see cref="IServerEntryPoint"/> that notifies users when libraries are updated.
+/// </summary>
+public sealed class LibraryChangedNotifier : IServerEntryPoint
 {
-    public class LibraryChangedNotifier : IServerEntryPoint
+    private readonly ILibraryManager _libraryManager;
+    private readonly IServerConfigurationManager _configurationManager;
+    private readonly IProviderManager _providerManager;
+    private readonly ISessionManager _sessionManager;
+    private readonly IUserManager _userManager;
+    private readonly ILogger<LibraryChangedNotifier> _logger;
+
+    private readonly object _libraryChangedSyncLock = new();
+    private readonly List<Folder> _foldersAddedTo = new();
+    private readonly List<Folder> _foldersRemovedFrom = new();
+    private readonly List<BaseItem> _itemsAdded = new();
+    private readonly List<BaseItem> _itemsRemoved = new();
+    private readonly List<BaseItem> _itemsUpdated = new();
+    private readonly ConcurrentDictionary<Guid, DateTime> _lastProgressMessageTimes = new();
+
+    private Timer? _libraryUpdateTimer;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LibraryChangedNotifier"/> class.
+    /// </summary>
+    /// <param name="libraryManager">The <see cref="ILibraryManager"/>.</param>
+    /// <param name="configurationManager">The <see cref="IServerConfigurationManager"/>.</param>
+    /// <param name="sessionManager">The <see cref="ISessionManager"/>.</param>
+    /// <param name="userManager">The <see cref="IUserManager"/>.</param>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    /// <param name="providerManager">The <see cref="IProviderManager"/>.</param>
+    public LibraryChangedNotifier(
+        ILibraryManager libraryManager,
+        IServerConfigurationManager configurationManager,
+        ISessionManager sessionManager,
+        IUserManager userManager,
+        ILogger<LibraryChangedNotifier> logger,
+        IProviderManager providerManager)
     {
-        private readonly ILibraryManager _libraryManager;
-        private readonly IServerConfigurationManager _configurationManager;
-        private readonly IProviderManager _providerManager;
-        private readonly ISessionManager _sessionManager;
-        private readonly IUserManager _userManager;
-        private readonly ILogger<LibraryChangedNotifier> _logger;
+        _libraryManager = libraryManager;
+        _configurationManager = configurationManager;
+        _sessionManager = sessionManager;
+        _userManager = userManager;
+        _logger = logger;
+        _providerManager = providerManager;
+    }
 
-        /// <summary>
-        /// The library changed sync lock.
-        /// </summary>
-        private readonly object _libraryChangedSyncLock = new object();
+    /// <inheritdoc />
+    public Task RunAsync()
+    {
+        _libraryManager.ItemAdded += OnLibraryItemAdded;
+        _libraryManager.ItemUpdated += OnLibraryItemUpdated;
+        _libraryManager.ItemRemoved += OnLibraryItemRemoved;
 
-        private readonly List<Folder> _foldersAddedTo = new List<Folder>();
-        private readonly List<Folder> _foldersRemovedFrom = new List<Folder>();
-        private readonly List<BaseItem> _itemsAdded = new List<BaseItem>();
-        private readonly List<BaseItem> _itemsRemoved = new List<BaseItem>();
-        private readonly List<BaseItem> _itemsUpdated = new List<BaseItem>();
-        private readonly ConcurrentDictionary<Guid, DateTime> _lastProgressMessageTimes = new ConcurrentDictionary<Guid, DateTime>();
+        _providerManager.RefreshCompleted += OnProviderRefreshCompleted;
+        _providerManager.RefreshStarted += OnProviderRefreshStarted;
+        _providerManager.RefreshProgress += OnProviderRefreshProgress;
 
-        public LibraryChangedNotifier(
-            ILibraryManager libraryManager,
-            IServerConfigurationManager configurationManager,
-            ISessionManager sessionManager,
-            IUserManager userManager,
-            ILogger<LibraryChangedNotifier> logger,
-            IProviderManager providerManager)
+        return Task.CompletedTask;
+    }
+
+    private void OnProviderRefreshProgress(object? sender, GenericEventArgs<Tuple<BaseItem, double>> e)
+    {
+        var item = e.Argument.Item1;
+
+        if (!EnableRefreshMessage(item))
         {
-            _libraryManager = libraryManager;
-            _configurationManager = configurationManager;
-            _sessionManager = sessionManager;
-            _userManager = userManager;
-            _logger = logger;
-            _providerManager = providerManager;
+            return;
         }
 
-        /// <summary>
-        /// Gets or sets the library update timer.
-        /// </summary>
-        /// <value>The library update timer.</value>
-        private Timer LibraryUpdateTimer { get; set; }
+        var progress = e.Argument.Item2;
 
-        public Task RunAsync()
+        if (_lastProgressMessageTimes.TryGetValue(item.Id, out var lastMessageSendTime))
         {
-            _libraryManager.ItemAdded += OnLibraryItemAdded;
-            _libraryManager.ItemUpdated += OnLibraryItemUpdated;
-            _libraryManager.ItemRemoved += OnLibraryItemRemoved;
-
-            _providerManager.RefreshCompleted += OnProviderRefreshCompleted;
-            _providerManager.RefreshStarted += OnProviderRefreshStarted;
-            _providerManager.RefreshProgress += OnProviderRefreshProgress;
-
-            return Task.CompletedTask;
-        }
-
-        private void OnProviderRefreshProgress(object sender, GenericEventArgs<Tuple<BaseItem, double>> e)
-        {
-            var item = e.Argument.Item1;
-
-            if (!EnableRefreshMessage(item))
+            if (progress > 0 && progress < 100 && (DateTime.UtcNow - lastMessageSendTime).TotalMilliseconds < 1000)
             {
                 return;
             }
+        }
 
-            var progress = e.Argument.Item2;
+        _lastProgressMessageTimes.AddOrUpdate(item.Id, _ => DateTime.UtcNow, (_, _) => DateTime.UtcNow);
 
-            if (_lastProgressMessageTimes.TryGetValue(item.Id, out var lastMessageSendTime))
+        var dict = new Dictionary<string, string>();
+        dict["ItemId"] = item.Id.ToString("N", CultureInfo.InvariantCulture);
+        dict["Progress"] = progress.ToString(CultureInfo.InvariantCulture);
+
+        try
+        {
+            _sessionManager.SendMessageToAdminSessions(SessionMessageType.RefreshProgress, dict, CancellationToken.None);
+        }
+        catch
+        {
+        }
+
+        var collectionFolders = _libraryManager.GetCollectionFolders(item);
+
+        foreach (var collectionFolder in collectionFolders)
+        {
+            var collectionFolderDict = new Dictionary<string, string>
             {
-                if (progress > 0 && progress < 100 && (DateTime.UtcNow - lastMessageSendTime).TotalMilliseconds < 1000)
-                {
-                    return;
-                }
-            }
-
-            _lastProgressMessageTimes.AddOrUpdate(item.Id, _ => DateTime.UtcNow, (_, _) => DateTime.UtcNow);
-
-            var dict = new Dictionary<string, string>();
-            dict["ItemId"] = item.Id.ToString("N", CultureInfo.InvariantCulture);
-            dict["Progress"] = progress.ToString(CultureInfo.InvariantCulture);
+                ["ItemId"] = collectionFolder.Id.ToString("N", CultureInfo.InvariantCulture),
+                ["Progress"] = (collectionFolder.GetRefreshProgress() ?? 0).ToString(CultureInfo.InvariantCulture)
+            };
 
             try
             {
-                _sessionManager.SendMessageToAdminSessions(SessionMessageType.RefreshProgress, dict, CancellationToken.None);
+                _sessionManager.SendMessageToAdminSessions(SessionMessageType.RefreshProgress, collectionFolderDict, CancellationToken.None);
             }
             catch
             {
             }
+        }
+    }
 
-            var collectionFolders = _libraryManager.GetCollectionFolders(item);
+    private void OnProviderRefreshStarted(object? sender, GenericEventArgs<BaseItem> e)
+    {
+        OnProviderRefreshProgress(sender, new GenericEventArgs<Tuple<BaseItem, double>>(new Tuple<BaseItem, double>(e.Argument, 0)));
+    }
 
-            foreach (var collectionFolder in collectionFolders)
-            {
-                var collectionFolderDict = new Dictionary<string, string>
-                {
-                    ["ItemId"] = collectionFolder.Id.ToString("N", CultureInfo.InvariantCulture),
-                    ["Progress"] = (collectionFolder.GetRefreshProgress() ?? 0).ToString(CultureInfo.InvariantCulture)
-                };
+    private void OnProviderRefreshCompleted(object? sender, GenericEventArgs<BaseItem> e)
+    {
+        OnProviderRefreshProgress(sender, new GenericEventArgs<Tuple<BaseItem, double>>(new Tuple<BaseItem, double>(e.Argument, 100)));
 
-                try
-                {
-                    _sessionManager.SendMessageToAdminSessions(SessionMessageType.RefreshProgress, collectionFolderDict, CancellationToken.None);
-                }
-                catch
-                {
-                }
-            }
+        _lastProgressMessageTimes.TryRemove(e.Argument.Id, out _);
+    }
+
+    private static bool EnableRefreshMessage(BaseItem item)
+        => item is Folder { IsRoot: false, IsTopParent: true }
+            and not (AggregateFolder or UserRootFolder or UserView or Channel);
+
+    private void OnLibraryItemAdded(object? sender, ItemChangeEventArgs e)
+        => OnLibraryChange(e.Item, e.Parent, _itemsAdded, _foldersAddedTo);
+
+    private void OnLibraryItemUpdated(object? sender, ItemChangeEventArgs e)
+        => OnLibraryChange(e.Item, e.Parent, _itemsUpdated, null);
+
+    private void OnLibraryItemRemoved(object? sender, ItemChangeEventArgs e)
+        => OnLibraryChange(e.Item, e.Parent, _itemsRemoved, _foldersRemovedFrom);
+
+    private void OnLibraryChange(BaseItem item, BaseItem parent, List<BaseItem> itemsList, List<Folder>? foldersList)
+    {
+        if (!FilterItem(item))
+        {
+            return;
         }
 
-        private void OnProviderRefreshStarted(object sender, GenericEventArgs<BaseItem> e)
+        lock (_libraryChangedSyncLock)
         {
-            OnProviderRefreshProgress(sender, new GenericEventArgs<Tuple<BaseItem, double>>(new Tuple<BaseItem, double>(e.Argument, 0)));
+            var updateDuration = TimeSpan.FromSeconds(_configurationManager.Configuration.LibraryUpdateDuration);
+
+            if (_libraryUpdateTimer is null)
+            {
+                _libraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, updateDuration, Timeout.InfiniteTimeSpan);
+            }
+            else
+            {
+                _libraryUpdateTimer.Change(updateDuration, Timeout.InfiniteTimeSpan);
+            }
+
+            if (foldersList is not null && parent is Folder folder)
+            {
+                foldersList.Add(folder);
+            }
+
+            itemsList.Add(item);
+        }
+    }
+
+    private async void LibraryUpdateTimerCallback(object? state)
+    {
+        List<Folder> foldersAddedTo;
+        List<Folder> foldersRemovedFrom;
+        List<BaseItem> itemsUpdated;
+        List<BaseItem> itemsAdded;
+        List<BaseItem> itemsRemoved;
+        lock (_libraryChangedSyncLock)
+        {
+            // Remove dupes in case some were saved multiple times
+            foldersAddedTo = _foldersAddedTo
+                .DistinctBy(x => x.Id)
+                .ToList();
+
+            foldersRemovedFrom = _foldersRemovedFrom
+                .DistinctBy(x => x.Id)
+                .ToList();
+
+            itemsUpdated = _itemsUpdated
+                .Where(i => !_itemsAdded.Contains(i))
+                .DistinctBy(x => x.Id)
+                .ToList();
+
+            itemsAdded = _itemsAdded.ToList();
+            itemsRemoved = _itemsRemoved.ToList();
+
+            if (_libraryUpdateTimer is not null)
+            {
+                _libraryUpdateTimer.Dispose();
+                _libraryUpdateTimer = null;
+            }
+
+            _itemsAdded.Clear();
+            _itemsRemoved.Clear();
+            _itemsUpdated.Clear();
+            _foldersAddedTo.Clear();
+            _foldersRemovedFrom.Clear();
         }
 
-        private void OnProviderRefreshCompleted(object sender, GenericEventArgs<BaseItem> e)
+        await SendChangeNotifications(itemsAdded, itemsUpdated, itemsRemoved, foldersAddedTo, foldersRemovedFrom, CancellationToken.None).ConfigureAwait(false);
+    }
+
+    private async Task SendChangeNotifications(
+        List<BaseItem> itemsAdded,
+        List<BaseItem> itemsUpdated,
+        List<BaseItem> itemsRemoved,
+        List<Folder> foldersAddedTo,
+        List<Folder> foldersRemovedFrom,
+        CancellationToken cancellationToken)
+    {
+        var userIds = _sessionManager.Sessions
+            .Select(i => i.UserId)
+            .Where(i => !i.Equals(default))
+            .Distinct()
+            .ToArray();
+
+        foreach (var userId in userIds)
         {
-            OnProviderRefreshProgress(sender, new GenericEventArgs<Tuple<BaseItem, double>>(new Tuple<BaseItem, double>(e.Argument, 100)));
+            LibraryUpdateInfo info;
 
-            _lastProgressMessageTimes.TryRemove(e.Argument.Id, out _);
-        }
-
-        private static bool EnableRefreshMessage(BaseItem item)
-        {
-            if (item is not Folder folder)
+            try
             {
-                return false;
+                info = GetLibraryUpdateInfo(itemsAdded, itemsUpdated, itemsRemoved, foldersAddedTo, foldersRemovedFrom, userId);
             }
-
-            if (folder.IsRoot)
-            {
-                return false;
-            }
-
-            if (folder is AggregateFolder || folder is UserRootFolder)
-            {
-                return false;
-            }
-
-            if (folder is UserView || folder is Channel)
-            {
-                return false;
-            }
-
-            if (!folder.IsTopParent)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Handles the ItemAdded event of the libraryManager control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="ItemChangeEventArgs"/> instance containing the event data.</param>
-        private void OnLibraryItemAdded(object sender, ItemChangeEventArgs e)
-        {
-            if (!FilterItem(e.Item))
+            catch (Exception ex)
             {
+                _logger.LogError(ex, "Error in GetLibraryUpdateInfo");
                 return;
             }
 
-            lock (_libraryChangedSyncLock)
+            if (info.IsEmpty)
             {
-                if (LibraryUpdateTimer is null)
-                {
-                    LibraryUpdateTimer = new Timer(
-                        LibraryUpdateTimerCallback,
-                        null,
-                        TimeSpan.FromSeconds(_configurationManager.Configuration.LibraryUpdateDuration),
-                        Timeout.InfiniteTimeSpan);
-                }
-                else
-                {
-                    LibraryUpdateTimer.Change(TimeSpan.FromSeconds(_configurationManager.Configuration.LibraryUpdateDuration), Timeout.InfiniteTimeSpan);
-                }
+                continue;
+            }
 
-                if (e.Item.GetParent() is Folder parent)
-                {
-                    _foldersAddedTo.Add(parent);
-                }
-
-                _itemsAdded.Add(e.Item);
+            try
+            {
+                await _sessionManager.SendMessageToUserSessions(
+                        new List<Guid> { userId },
+                        SessionMessageType.LibraryChanged,
+                        info,
+                        cancellationToken)
+                    .ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error sending LibraryChanged message");
             }
         }
+    }
 
-        /// <summary>
-        /// Handles the ItemUpdated event of the libraryManager control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="ItemChangeEventArgs"/> instance containing the event data.</param>
-        private void OnLibraryItemUpdated(object sender, ItemChangeEventArgs e)
+    private LibraryUpdateInfo GetLibraryUpdateInfo(
+        List<BaseItem> itemsAdded,
+        List<BaseItem> itemsUpdated,
+        List<BaseItem> itemsRemoved,
+        List<Folder> foldersAddedTo,
+        List<Folder> foldersRemovedFrom,
+        Guid userId)
+    {
+        var user = _userManager.GetUserById(userId);
+        ArgumentNullException.ThrowIfNull(user);
+
+        var newAndRemoved = new List<BaseItem>();
+        newAndRemoved.AddRange(foldersAddedTo);
+        newAndRemoved.AddRange(foldersRemovedFrom);
+
+        var allUserRootChildren = _libraryManager.GetUserRootFolder()
+            .GetChildren(user, true)
+            .OfType<Folder>()
+            .ToList();
+
+        return new LibraryUpdateInfo
         {
-            if (!FilterItem(e.Item))
-            {
-                return;
-            }
-
-            lock (_libraryChangedSyncLock)
-            {
-                if (LibraryUpdateTimer is null)
-                {
-                    LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, TimeSpan.FromSeconds(_configurationManager.Configuration.LibraryUpdateDuration), Timeout.InfiniteTimeSpan);
-                }
-                else
-                {
-                    LibraryUpdateTimer.Change(TimeSpan.FromSeconds(_configurationManager.Configuration.LibraryUpdateDuration), Timeout.InfiniteTimeSpan);
-                }
-
-                _itemsUpdated.Add(e.Item);
-            }
-        }
-
-        /// <summary>
-        /// Handles the ItemRemoved event of the libraryManager control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="ItemChangeEventArgs"/> instance containing the event data.</param>
-        private void OnLibraryItemRemoved(object sender, ItemChangeEventArgs e)
-        {
-            if (!FilterItem(e.Item))
-            {
-                return;
-            }
-
-            lock (_libraryChangedSyncLock)
-            {
-                if (LibraryUpdateTimer is null)
-                {
-                    LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, TimeSpan.FromSeconds(_configurationManager.Configuration.LibraryUpdateDuration), Timeout.InfiniteTimeSpan);
-                }
-                else
-                {
-                    LibraryUpdateTimer.Change(TimeSpan.FromSeconds(_configurationManager.Configuration.LibraryUpdateDuration), Timeout.InfiniteTimeSpan);
-                }
-
-                if (e.Parent is Folder parent)
-                {
-                    _foldersRemovedFrom.Add(parent);
-                }
-
-                _itemsRemoved.Add(e.Item);
-            }
-        }
-
-        /// <summary>
-        /// Libraries the update timer callback.
-        /// </summary>
-        /// <param name="state">The state.</param>
-        private async void LibraryUpdateTimerCallback(object state)
-        {
-            List<Folder> foldersAddedTo;
-            List<Folder> foldersRemovedFrom;
-            List<BaseItem> itemsUpdated;
-            List<BaseItem> itemsAdded;
-            List<BaseItem> itemsRemoved;
-            lock (_libraryChangedSyncLock)
-            {
-                // Remove dupes in case some were saved multiple times
-                foldersAddedTo = _foldersAddedTo
-                                        .DistinctBy(x => x.Id)
-                                        .ToList();
-
-                foldersRemovedFrom = _foldersRemovedFrom
-                                            .DistinctBy(x => x.Id)
-                                            .ToList();
-
-                itemsUpdated = _itemsUpdated
-                                    .Where(i => !_itemsAdded.Contains(i))
-                                    .DistinctBy(x => x.Id)
-                                    .ToList();
-
-                itemsAdded = _itemsAdded.ToList();
-                itemsRemoved = _itemsRemoved.ToList();
-
-                if (LibraryUpdateTimer is not null)
-                {
-                    LibraryUpdateTimer.Dispose();
-                    LibraryUpdateTimer = null;
-                }
-
-                _itemsAdded.Clear();
-                _itemsRemoved.Clear();
-                _itemsUpdated.Clear();
-                _foldersAddedTo.Clear();
-                _foldersRemovedFrom.Clear();
-            }
-
-            await SendChangeNotifications(itemsAdded, itemsUpdated, itemsRemoved, foldersAddedTo, foldersRemovedFrom, CancellationToken.None).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Sends the change notifications.
-        /// </summary>
-        /// <param name="itemsAdded">The items added.</param>
-        /// <param name="itemsUpdated">The items updated.</param>
-        /// <param name="itemsRemoved">The items removed.</param>
-        /// <param name="foldersAddedTo">The folders added to.</param>
-        /// <param name="foldersRemovedFrom">The folders removed from.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        private async Task SendChangeNotifications(List<BaseItem> itemsAdded, List<BaseItem> itemsUpdated, List<BaseItem> itemsRemoved, List<Folder> foldersAddedTo, List<Folder> foldersRemovedFrom, CancellationToken cancellationToken)
-        {
-            var userIds = _sessionManager.Sessions
-                .Select(i => i.UserId)
-                .Where(i => !i.Equals(default))
+            ItemsAdded = itemsAdded.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user))
+                .Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture))
                 .Distinct()
-                .ToArray();
+                .ToArray(),
+            ItemsUpdated = itemsUpdated.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user))
+                .Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture))
+                .Distinct()
+                .ToArray(),
+            ItemsRemoved = itemsRemoved.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, true))
+                .Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture))
+                .Distinct()
+                .ToArray(),
+            FoldersAddedTo = foldersAddedTo.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user))
+                .Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture))
+                .Distinct()
+                .ToArray(),
+            FoldersRemovedFrom = foldersRemovedFrom.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user))
+                .Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture))
+                .Distinct()
+                .ToArray(),
+            CollectionFolders = GetTopParentIds(newAndRemoved, allUserRootChildren).ToArray()
+        };
+    }
 
-            foreach (var userId in userIds)
-            {
-                LibraryUpdateInfo info;
-
-                try
-                {
-                    info = GetLibraryUpdateInfo(itemsAdded, itemsUpdated, itemsRemoved, foldersAddedTo, foldersRemovedFrom, userId);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error in GetLibraryUpdateInfo");
-                    return;
-                }
-
-                if (info.IsEmpty)
-                {
-                    continue;
-                }
-
-                try
-                {
-                    await _sessionManager.SendMessageToUserSessions(new List<Guid> { userId }, SessionMessageType.LibraryChanged, info, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error sending LibraryChanged message");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the library update info.
-        /// </summary>
-        /// <param name="itemsAdded">The items added.</param>
-        /// <param name="itemsUpdated">The items updated.</param>
-        /// <param name="itemsRemoved">The items removed.</param>
-        /// <param name="foldersAddedTo">The folders added to.</param>
-        /// <param name="foldersRemovedFrom">The folders removed from.</param>
-        /// <param name="userId">The user id.</param>
-        /// <returns>LibraryUpdateInfo.</returns>
-        private LibraryUpdateInfo GetLibraryUpdateInfo(List<BaseItem> itemsAdded, List<BaseItem> itemsUpdated, List<BaseItem> itemsRemoved, List<Folder> foldersAddedTo, List<Folder> foldersRemovedFrom, Guid userId)
+    private static bool FilterItem(BaseItem item)
+    {
+        if (!item.IsFolder && !item.HasPathProtocol)
         {
-            var user = _userManager.GetUserById(userId);
-
-            var newAndRemoved = new List<BaseItem>();
-            newAndRemoved.AddRange(foldersAddedTo);
-            newAndRemoved.AddRange(foldersRemovedFrom);
-
-            var allUserRootChildren = _libraryManager.GetUserRootFolder().GetChildren(user, true).OfType<Folder>().ToList();
-
-            return new LibraryUpdateInfo
-            {
-                ItemsAdded = itemsAdded.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user)).Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture)).Distinct().ToArray(),
-
-                ItemsUpdated = itemsUpdated.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user)).Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture)).Distinct().ToArray(),
-
-                ItemsRemoved = itemsRemoved.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, true)).Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture)).Distinct().ToArray(),
-
-                FoldersAddedTo = foldersAddedTo.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user)).Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture)).Distinct().ToArray(),
-
-                FoldersRemovedFrom = foldersRemovedFrom.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user)).Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture)).Distinct().ToArray(),
-
-                CollectionFolders = GetTopParentIds(newAndRemoved, allUserRootChildren).ToArray()
-            };
+            return false;
         }
 
-        private static bool FilterItem(BaseItem item)
+        if (item is IItemByName && item is not MusicArtist)
         {
-            if (!item.IsFolder && !item.HasPathProtocol)
-            {
-                return false;
-            }
-
-            if (item is IItemByName && item is not MusicArtist)
-            {
-                return false;
-            }
-
-            return item.SourceType == SourceType.Library;
+            return false;
         }
 
-        private IEnumerable<string> GetTopParentIds(List<BaseItem> items, List<Folder> allUserRootChildren)
-        {
-            var list = new List<string>();
+        return item.SourceType == SourceType.Library;
+    }
 
-            foreach (var item in items)
-            {
-                // If the physical root changed, return the user root
-                if (item is AggregateFolder)
-                {
-                    continue;
-                }
+    private IEnumerable<string> GetTopParentIds(List<BaseItem> items, List<Folder> allUserRootChildren)
+    {
+        var list = new List<string>();
 
-                foreach (var folder in allUserRootChildren)
-                {
-                    list.Add(folder.Id.ToString("N", CultureInfo.InvariantCulture));
-                }
-            }
-
-            return list.Distinct(StringComparer.Ordinal);
-        }
-
-        /// <summary>
-        /// Translates the physical item to user library.
-        /// </summary>
-        /// <typeparam name="T">The type of item.</typeparam>
-        /// <param name="item">The item.</param>
-        /// <param name="user">The user.</param>
-        /// <param name="includeIfNotFound">if set to <c>true</c> [include if not found].</param>
-        /// <returns>IEnumerable{``0}.</returns>
-        private IEnumerable<T> TranslatePhysicalItemToUserLibrary<T>(T item, User user, bool includeIfNotFound = false)
-            where T : BaseItem
+        foreach (var item in items)
         {
             // If the physical root changed, return the user root
             if (item is AggregateFolder)
             {
-                return new[] { _libraryManager.GetUserRootFolder() as T };
+                continue;
             }
 
-            // Return it only if it's in the user's library
-            if (includeIfNotFound || item.IsVisibleStandalone(user))
+            foreach (var folder in allUserRootChildren)
             {
-                return new[] { item };
+                list.Add(folder.Id.ToString("N", CultureInfo.InvariantCulture));
             }
-
-            return Array.Empty<T>();
         }
 
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
+        return list.Distinct(StringComparer.Ordinal);
+    }
+
+    private IEnumerable<T> TranslatePhysicalItemToUserLibrary<T>(T item, User user, bool includeIfNotFound = false)
+        where T : BaseItem
+    {
+        // If the physical root changed, return the user root
+        if (item is AggregateFolder)
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            return _libraryManager.GetUserRootFolder() is T t ? new[] { t } : Array.Empty<T>();
         }
 
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool dispose)
+        // Return it only if it's in the user's library
+        if (includeIfNotFound || item.IsVisibleStandalone(user))
         {
-            if (dispose)
-            {
-                if (LibraryUpdateTimer is not null)
-                {
-                    LibraryUpdateTimer.Dispose();
-                    LibraryUpdateTimer = null;
-                }
+            return new[] { item };
+        }
 
-                _libraryManager.ItemAdded -= OnLibraryItemAdded;
-                _libraryManager.ItemUpdated -= OnLibraryItemUpdated;
-                _libraryManager.ItemRemoved -= OnLibraryItemRemoved;
+        return Array.Empty<T>();
+    }
 
-                _providerManager.RefreshCompleted -= OnProviderRefreshCompleted;
-                _providerManager.RefreshStarted -= OnProviderRefreshStarted;
-                _providerManager.RefreshProgress -= OnProviderRefreshProgress;
-            }
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        _libraryManager.ItemAdded -= OnLibraryItemAdded;
+        _libraryManager.ItemUpdated -= OnLibraryItemUpdated;
+        _libraryManager.ItemRemoved -= OnLibraryItemRemoved;
+
+        _providerManager.RefreshCompleted -= OnProviderRefreshCompleted;
+        _providerManager.RefreshStarted -= OnProviderRefreshStarted;
+        _providerManager.RefreshProgress -= OnProviderRefreshProgress;
+
+        if (_libraryUpdateTimer is not null)
+        {
+            _libraryUpdateTimer.Dispose();
+            _libraryUpdateTimer = null;
         }
     }
 }

Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs

@@ -6,14 +6,13 @@ using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.Udp;
-using Jellyfin.Networking.Configuration;
-using Jellyfin.Networking.Extensions;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Plugins;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using IConfigurationManager = MediaBrowser.Common.Configuration.IConfigurationManager;
 
 namespace Emby.Server.Implementations.EntryPoints
 {
@@ -92,7 +91,7 @@ namespace Emby.Server.Implementations.EntryPoints
                     var validInterfaces = _networkManager.GetInternalBindAddresses().Where(i => i.AddressFamily == AddressFamily.InterNetwork);
                     foreach (var intf in validInterfaces)
                     {
-                        var broadcastAddress = NetworkExtensions.GetBroadcastAddress(intf.Subnet);
+                        var broadcastAddress = NetworkUtils.GetBroadcastAddress(intf.Subnet);
                         _logger.LogDebug("Binding UDP server to {Address} on port {PortNumber}", broadcastAddress, PortNumber);
 
                         server = new UdpServer(_logger, _appHost, _config, broadcastAddress, PortNumber);

Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs

@@ -84,15 +84,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             return Task.CompletedTask;
         }
 
-        public Task Close()
+        public async Task Close()
         {
             EnableStreamSharing = false;
 
             Logger.LogInformation("Closing {Type}", GetType().Name);
 
-            LiveStreamCancellationTokenSource.Cancel();
-
-            return Task.CompletedTask;
+            await LiveStreamCancellationTokenSource.CancelAsync().ConfigureAwait(false);
         }
 
         public Stream GetStream()

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

@@ -123,5 +123,7 @@
     "TaskKeyframeExtractorDescription": "Haal keyframes vanuit video lêers om meer presiese HLS afspeellyste te maak. Dit kan lank duur.",
     "TaskKeyframeExtractor": "Keyframe Ekstraktor",
     "External": "Ekstern",
-    "HearingImpaired": "gehoorgestremd"
+    "HearingImpaired": "gehoorgestremd",
+    "TaskRefreshTrickplayImages": "Genereer Fopspeel Beelde",
+    "TaskRefreshTrickplayImagesDescription": "Skep fopspeel voorskou vir videos in aangeskakelde media versameling."
 }

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

@@ -124,5 +124,6 @@
     "TaskKeyframeExtractorDescription": "يستخرج الإطارات الرئيسية من ملفات الفيديو لكي ينشئ قوائم تشغيل بث HTTP المباشر. قد تستمر هذه العملية لوقت طويل.",
     "TaskKeyframeExtractor": "مستخرج الإطار الرئيسي",
     "External": "خارجي",
-    "HearingImpaired": "ضعاف السمع"
+    "HearingImpaired": "ضعاف السمع",
+    "TaskRefreshTrickplayImages": "توليد صور Trickplay"
 }

Emby.Server.Implementations/Localization/Core/lt-LT.json

@@ -124,5 +124,7 @@
     "TaskKeyframeExtractor": "Pagrindinių kadrų ištraukėjas",
     "TaskOptimizeDatabaseDescription": "Suspaudžia duomenų bazę ir atlaisvina vietą. Paleidžiant šią užduotį, po bibliotekos skenavimo arba kitų veiksmų kurie galimai modifikuoja duomenų bazė, gali pagerinti greitaveiką.",
     "External": "Išorinis",
-    "HearingImpaired": "Su klausos sutrikimais"
+    "HearingImpaired": "Su klausos sutrikimais",
+    "TaskRefreshTrickplayImages": "Generuoti Trickplay atvaizdus",
+    "TaskRefreshTrickplayImagesDescription": "Sukuria trickplay peržiūras vaizdo įrašams įgalintose bibliotekose."
 }

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

@@ -123,5 +123,7 @@
     "DeviceOnlineWithName": "{0} कनेक्ट झाले",
     "DeviceOfflineWithName": "{0} डिस्कनेक्ट झाला आहे",
     "AuthenticationSucceededWithUserName": "{0} यशस्वीरित्या प्रमाणीकृत",
-    "HearingImpaired": "कर्णबधीर"
+    "HearingImpaired": "कर्णबधीर",
+    "TaskRefreshTrickplayImages": "ट्रिकप्ले प्रतिमा तयार करा",
+    "TaskRefreshTrickplayImagesDescription": "सक्षम लायब्ररीमधील व्हिडिओंसाठी ट्रिकप्ले पूर्वावलोकन तयार करते."
 }

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

@@ -124,5 +124,7 @@
     "TaskKeyframeExtractor": "Extrator de quadro-chave",
     "TaskKeyframeExtractorDescription": "Extrai quadros-chave de arquivos de vídeo para criar listas de reprodução HLS mais precisas. Esta tarefa pode ser executada por um longo tempo.",
     "External": "Externo",
-    "HearingImpaired": "Deficiência Auditiva"
+    "HearingImpaired": "Deficiência Auditiva",
+    "TaskRefreshTrickplayImages": "Gerar imagens Trickplay",
+    "TaskRefreshTrickplayImagesDescription": "Cria prévias Trickplay para vídeos em bibliotecas em que o recurso está habilitado."
 }

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

@@ -123,5 +123,7 @@
     "TaskKeyframeExtractorDescription": "Extrage cadrele cheie din fișierele video pentru a crea liste de redare HLS mai precise. Această sarcină poate rula o perioadă lungă de timp.",
     "External": "Extern",
     "TaskKeyframeExtractor": "Extractor de cadre cheie",
-    "HearingImpaired": "Ascultare Impară"
+    "HearingImpaired": "Ascultare Impară",
+    "TaskRefreshTrickplayImages": "Generează imagini Trickplay",
+    "TaskRefreshTrickplayImagesDescription": "Generează previzualizările trickplay pentru videourile din librăriile selectate."
 }

Emby.Server.Implementations/Plugins/PluginManager.cs

@@ -12,10 +12,11 @@ using System.Threading.Tasks;
 using Emby.Server.Implementations.Library;
 using Jellyfin.Extensions.Json;
 using Jellyfin.Extensions.Json.Converters;
-using MediaBrowser.Common;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Plugins;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Plugins;
@@ -37,7 +38,7 @@ namespace Emby.Server.Implementations.Plugins
         private readonly List<AssemblyLoadContext> _assemblyLoadContexts;
         private readonly JsonSerializerOptions _jsonOptions;
         private readonly ILogger<PluginManager> _logger;
-        private readonly IApplicationHost _appHost;
+        private readonly IServerApplicationHost _appHost;
         private readonly ServerConfiguration _config;
         private readonly List<LocalPlugin> _plugins;
         private readonly Version _minimumVersion;
@@ -48,13 +49,13 @@ namespace Emby.Server.Implementations.Plugins
         /// Initializes a new instance of the <see cref="PluginManager"/> class.
         /// </summary>
         /// <param name="logger">The <see cref="ILogger{PluginManager}"/>.</param>
-        /// <param name="appHost">The <see cref="IApplicationHost"/>.</param>
+        /// <param name="appHost">The <see cref="IServerApplicationHost"/>.</param>
         /// <param name="config">The <see cref="ServerConfiguration"/>.</param>
         /// <param name="pluginsPath">The plugin path.</param>
         /// <param name="appVersion">The application version.</param>
         public PluginManager(
             ILogger<PluginManager> logger,
-            IApplicationHost appHost,
+            IServerApplicationHost appHost,
             ServerConfiguration config,
             string pluginsPath,
             Version appVersion)
@@ -222,7 +223,7 @@ namespace Emby.Server.Implementations.Plugins
                 try
                 {
                     var instance = (IPluginServiceRegistrator?)Activator.CreateInstance(pluginServiceRegistrator);
-                    instance?.RegisterServices(serviceCollection);
+                    instance?.RegisterServices(serviceCollection, _appHost);
                 }
 #pragma warning disable CA1031 // Do not catch general exception types
                 catch (Exception ex)

Emby.Server.Implementations/Updates/InstallationManager.cs

@@ -551,8 +551,7 @@ namespace Emby.Server.Implementations.Updates
             }
 
             stream.Position = 0;
-            using var reader = new ZipArchive(stream);
-            reader.ExtractToDirectory(targetDir, true);
+            ZipFile.ExtractToDirectory(stream, targetDir, true);
 
             // Ensure we create one or populate existing ones with missing data.
             await _pluginManager.PopulateManifest(package.PackageInfo, package.Version, targetDir, status).ConfigureAwait(false);