diff --git a/Emby.Server.Implementations/Playlists/PlaylistManager.cs b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
index 702f8d45bc..0cb450cdf3 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/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";
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionAndPlaylistPathsTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionAndPlaylistPathsTask.cs
new file mode 100644
index 0000000000..acd4bf9056
--- /dev/null
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionAndPlaylistPathsTask.cs
@@ -0,0 +1,146 @@
+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;
+
+///
+/// Deletes path references from collections and playlists that no longer exists.
+///
+public class CleanupCollectionAndPlaylistPathsTask : IScheduledTask
+{
+ private readonly ILocalizationManager _localization;
+ private readonly ICollectionManager _collectionManager;
+ private readonly IPlaylistManager _playlistManager;
+ private readonly ILogger _logger;
+ private readonly IProviderManager _providerManager;
+ private readonly IFileSystem _fileSystem;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// Instance of the interface.
+ /// Instance of the interface.
+ /// Instance of the interface.
+ /// The logger.
+ /// The provider manager.
+ /// The filesystem.
+ public CleanupCollectionAndPlaylistPathsTask(
+ ILocalizationManager localization,
+ ICollectionManager collectionManager,
+ IPlaylistManager playlistManager,
+ ILogger logger,
+ IProviderManager providerManager,
+ IFileSystem fileSystem)
+ {
+ _localization = localization;
+ _collectionManager = collectionManager;
+ _playlistManager = playlistManager;
+ _logger = logger;
+ _providerManager = providerManager;
+ _fileSystem = fileSystem;
+ }
+
+ ///
+ public string Name => _localization.GetLocalizedString("TaskCleanCollectionsAndPlaylists");
+
+ ///
+ public string Key => "CleanCollectionsAndPlaylists";
+
+ ///
+ public string Description => _localization.GetLocalizedString("TaskCleanCollectionsAndPlaylistsDescription");
+
+ ///
+ public string Category => _localization.GetLocalizedString("TasksMaintenanceCategory");
+
+ ///
+ public async Task ExecuteAsync(IProgress progress, CancellationToken cancellationToken)
+ {
+ var collectionsFolder = await _collectionManager.GetCollectionsFolder(false).ConfigureAwait(false);
+ if (collectionsFolder is null)
+ {
+ _logger.LogDebug("There is no collections folder to be found");
+ }
+ else
+ {
+ var collections = collectionsFolder.Children.OfType().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 playlists folder to be found");
+ return;
+ }
+
+ var playlists = playlistsFolder.Children.OfType().ToArray();
+ _logger.LogDebug("Found {PlaylistLength} playlists", 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 folder, CancellationToken cancellationToken)
+ where T : Folder
+ {
+ List? itemsToRemove = null;
+ 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 ??= new List()).Add(linkedChild);
+ }
+ }
+
+ if (itemsToRemove is not null)
+ {
+ _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);
+ }
+ }
+
+ ///
+ public IEnumerable GetDefaultTriggers()
+ {
+ return new[] { new TaskTriggerInfo() { Type = TaskTriggerInfo.TriggerStartup } };
+ }
+}
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionPathsTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionPathsTask.cs
deleted file mode 100644
index f78fc6f970..0000000000
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionPathsTask.cs
+++ /dev/null
@@ -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;
-
-///
-/// Deletes Path references from collections that no longer exists.
-///
-public class CleanupCollectionPathsTask : IScheduledTask
-{
- private readonly ILocalizationManager _localization;
- private readonly ICollectionManager _collectionManager;
- private readonly ILogger _logger;
- private readonly IProviderManager _providerManager;
- private readonly IFileSystem _fileSystem;
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// Instance of the interface.
- /// Instance of the interface.
- /// The logger.
- /// The provider manager.
- /// The filesystem.
- public CleanupCollectionPathsTask(
- ILocalizationManager localization,
- ICollectionManager collectionManager,
- ILogger logger,
- IProviderManager providerManager,
- IFileSystem fileSystem)
- {
- _localization = localization;
- _collectionManager = collectionManager;
- _logger = logger;
- _providerManager = providerManager;
- _fileSystem = fileSystem;
- }
-
- ///
- public string Name => _localization.GetLocalizedString("TaskCleanCollections");
-
- ///
- public string Key => "CleanCollections";
-
- ///
- public string Description => _localization.GetLocalizedString("TaskCleanCollectionsDescription");
-
- ///
- public string Category => _localization.GetLocalizedString("TasksMaintenanceCategory");
-
- ///
- public async Task ExecuteAsync(IProgress 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().ToArray();
- _logger.LogDebug("Found {CollectionLength} Boxsets", collections.Length);
-
- var itemsToRemove = new List();
- 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));
- }
- }
-
- ///
- public IEnumerable GetDefaultTriggers()
- {
- return new[] { new TaskTriggerInfo() { Type = TaskTriggerInfo.TriggerStartup } };
- }
-}
diff --git a/MediaBrowser.Controller/Playlists/IPlaylistManager.cs b/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
index d1a51c2cf6..bb68a3b6dd 100644
--- a/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
+++ b/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
@@ -44,6 +44,12 @@ namespace MediaBrowser.Controller.Playlists
///
/// Gets the playlists folder.
///
+ /// Folder.
+ Folder GetPlaylistsFolder();
+
+ ///
+ /// Gets the playlists folder for a user.
+ ///
/// The user identifier.
/// Folder.
Folder GetPlaylistsFolder(Guid userId);