Extend collections cleanup task to include playlists too

Emby.Server.Implementations/Playlists/PlaylistManager.cs

@@ -518,6 +518,11 @@ namespace Emby.Server.Implementations.Playlists
             return relativePath;
         }
 
+        public Folder GetPlaylistsFolder()
+        {
+            return GetPlaylistsFolder(Guid.Empty);
+        }
+
         public Folder GetPlaylistsFolder(Guid userId)
         {
             const string TypeName = "PlaylistsFolder";

Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionAndPlaylistPathsTask.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Collections;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.ScheduledTasks.Tasks;
+
+/// <summary>
+/// Deletes path references from collections and playlists that no longer exists.
+/// </summary>
+public class CleanupCollectionAndPlaylistPathsTask : IScheduledTask
+{
+    private readonly ILocalizationManager _localization;
+    private readonly ICollectionManager _collectionManager;
+    private readonly IPlaylistManager _playlistManager;
+    private readonly ILogger<CleanupCollectionAndPlaylistPathsTask> _logger;
+    private readonly IProviderManager _providerManager;
+    private readonly IFileSystem _fileSystem;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CleanupCollectionAndPlaylistPathsTask"/> class.
+    /// </summary>
+    /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
+    /// <param name="collectionManager">Instance of the <see cref="ICollectionManager"/> interface.</param>
+    /// <param name="playlistManager">Instance of the <see cref="IPlaylistManager"/> interface.</param>
+    /// <param name="logger">The logger.</param>
+    /// <param name="providerManager">The provider manager.</param>
+    /// <param name="fileSystem">The filesystem.</param>
+    public CleanupCollectionAndPlaylistPathsTask(
+        ILocalizationManager localization,
+        ICollectionManager collectionManager,
+        IPlaylistManager playlistManager,
+        ILogger<CleanupCollectionAndPlaylistPathsTask> logger,
+        IProviderManager providerManager,
+        IFileSystem fileSystem)
+    {
+        _localization = localization;
+        _collectionManager = collectionManager;
+        _playlistManager = playlistManager;
+        _logger = logger;
+        _providerManager = providerManager;
+        _fileSystem = fileSystem;
+    }
+
+    /// <inheritdoc />
+    public string Name => _localization.GetLocalizedString("TaskCleanCollectionsAndPlaylists");
+
+    /// <inheritdoc />
+    public string Key => "CleanCollectionsAndPlaylists";
+
+    /// <inheritdoc />
+    public string Description => _localization.GetLocalizedString("TaskCleanCollectionsAndPlaylistsDescription");
+
+    /// <inheritdoc />
+    public string Category => _localization.GetLocalizedString("TasksMaintenanceCategory");
+
+    /// <inheritdoc />
+    public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        var collectionsFolder = await _collectionManager.GetCollectionsFolder(false).ConfigureAwait(false);
+        if (collectionsFolder is null)
+        {
+            _logger.LogDebug("There is no collection folder to be found");
+        }
+        else
+        {
+            var collections = collectionsFolder.Children.OfType<BoxSet>().ToArray();
+            _logger.LogDebug("Found {CollectionLength} boxsets", collections.Length);
+
+            for (var index = 0; index < collections.Length; index++)
+            {
+                var collection = collections[index];
+                _logger.LogDebug("Checking boxset {CollectionName}", collection.Name);
+
+                CleanupLinkedChildren(collection, cancellationToken);
+                progress.Report(50D / collections.Length * (index + 1));
+            }
+        }
+
+        var playlistsFolder = _playlistManager.GetPlaylistsFolder();
+        if (playlistsFolder is null)
+        {
+            _logger.LogDebug("There is no collection folder to be found");
+            return;
+        }
+
+        var playlists = playlistsFolder.Children.OfType<Playlist>().ToArray();
+        _logger.LogDebug("Found {PlaylistLength} boxsets", playlists.Length);
+
+        for (var index = 0; index < playlists.Length; index++)
+        {
+            var playlist = playlists[index];
+            _logger.LogDebug("Checking playlist {PlaylistName}", playlist.Name);
+
+            CleanupLinkedChildren(playlist, cancellationToken);
+            progress.Report(50D / playlists.Length * (index + 1));
+        }
+    }
+
+    private void CleanupLinkedChildren<T>(T folder, CancellationToken cancellationToken) where T : Folder
+    {
+        var itemsToRemove = new List<LinkedChild>();
+        foreach (var linkedChild in folder.LinkedChildren)
+        {
+            if (!File.Exists(folder.Path))
+            {
+                _logger.LogInformation("Item in {FolderName} cannot be found at {ItemPath}", folder.Name, linkedChild.Path);
+                itemsToRemove.Add(linkedChild);
+            }
+        }
+
+        if (itemsToRemove.Count != 0)
+        {
+            _logger.LogDebug("Updating {FolderName}", folder.Name);
+            folder.LinkedChildren = folder.LinkedChildren.Except(itemsToRemove).ToArray();
+            folder.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken);
+
+            _providerManager.QueueRefresh(
+                folder.Id,
+                new MetadataRefreshOptions(new DirectoryService(_fileSystem))
+                {
+                    ForceSave = true
+                },
+                RefreshPriority.High);
+
+            itemsToRemove.Clear();
+        }
+    }
+
+    /// <inheritdoc />
+    public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+    {
+        return new[] { new TaskTriggerInfo() { Type = TaskTriggerInfo.TriggerStartup } };
+    }
+}

Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionPathsTask.cs

@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Collections;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Tasks;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.ScheduledTasks.Tasks;
-
-/// <summary>
-/// Deletes Path references from collections that no longer exists.
-/// </summary>
-public class CleanupCollectionPathsTask : IScheduledTask
-{
-    private readonly ILocalizationManager _localization;
-    private readonly ICollectionManager _collectionManager;
-    private readonly ILogger<CleanupCollectionPathsTask> _logger;
-    private readonly IProviderManager _providerManager;
-    private readonly IFileSystem _fileSystem;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CleanupCollectionPathsTask"/> class.
-    /// </summary>
-    /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
-    /// <param name="collectionManager">Instance of the <see cref="ICollectionManager"/> interface.</param>
-    /// <param name="logger">The logger.</param>
-    /// <param name="providerManager">The provider manager.</param>
-    /// <param name="fileSystem">The filesystem.</param>
-    public CleanupCollectionPathsTask(
-        ILocalizationManager localization,
-        ICollectionManager collectionManager,
-        ILogger<CleanupCollectionPathsTask> logger,
-        IProviderManager providerManager,
-        IFileSystem fileSystem)
-    {
-        _localization = localization;
-        _collectionManager = collectionManager;
-        _logger = logger;
-        _providerManager = providerManager;
-        _fileSystem = fileSystem;
-    }
-
-    /// <inheritdoc />
-    public string Name => _localization.GetLocalizedString("TaskCleanCollections");
-
-    /// <inheritdoc />
-    public string Key => "CleanCollections";
-
-    /// <inheritdoc />
-    public string Description => _localization.GetLocalizedString("TaskCleanCollectionsDescription");
-
-    /// <inheritdoc />
-    public string Category => _localization.GetLocalizedString("TasksMaintenanceCategory");
-
-    /// <inheritdoc />
-    public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
-    {
-        var collectionsFolder = await _collectionManager.GetCollectionsFolder(false).ConfigureAwait(false);
-        if (collectionsFolder is null)
-        {
-            _logger.LogDebug("There is no collection folder to be found");
-            return;
-        }
-
-        var collections = collectionsFolder.Children.OfType<BoxSet>().ToArray();
-        _logger.LogDebug("Found {CollectionLength} Boxsets", collections.Length);
-
-        var itemsToRemove = new List<LinkedChild>();
-        for (var index = 0; index < collections.Length; index++)
-        {
-            var collection = collections[index];
-            _logger.LogDebug("Check Boxset {CollectionName}", collection.Name);
-
-            foreach (var collectionLinkedChild in collection.LinkedChildren)
-            {
-                if (!File.Exists(collectionLinkedChild.Path))
-                {
-                    _logger.LogInformation("Item in boxset {CollectionName} cannot be found at {ItemPath}", collection.Name, collectionLinkedChild.Path);
-                    itemsToRemove.Add(collectionLinkedChild);
-                }
-            }
-
-            if (itemsToRemove.Count != 0)
-            {
-                _logger.LogDebug("Update Boxset {CollectionName}", collection.Name);
-                collection.LinkedChildren = collection.LinkedChildren.Except(itemsToRemove).ToArray();
-                await collection.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken)
-                    .ConfigureAwait(false);
-
-                _providerManager.QueueRefresh(
-                    collection.Id,
-                    new MetadataRefreshOptions(new DirectoryService(_fileSystem))
-                    {
-                        ForceSave = true
-                    },
-                    RefreshPriority.High);
-
-                itemsToRemove.Clear();
-            }
-
-            progress.Report(100D / collections.Length * (index + 1));
-        }
-    }
-
-    /// <inheritdoc />
-    public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
-    {
-        return new[] { new TaskTriggerInfo() { Type = TaskTriggerInfo.TriggerStartup } };
-    }
-}

MediaBrowser.Controller/Playlists/IPlaylistManager.cs

@@ -44,6 +44,12 @@ namespace MediaBrowser.Controller.Playlists
         /// <summary>
         /// Gets the playlists folder.
         /// </summary>
+        /// <returns>Folder.</returns>
+        Folder GetPlaylistsFolder();
+
+        /// <summary>
+        /// Gets the playlists folder for a user.
+        /// </summary>
         /// <param name="userId">The user identifier.</param>
         /// <returns>Folder.</returns>
         Folder GetPlaylistsFolder(Guid userId);