1 files changed, 89 insertions, 36 deletions
diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index 4516b89dc..9a80eafe5 100644
--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -1,66 +1,119 @@
 #pragma warning disable CS1591
 
 using System;
+using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Database.Implementations;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.Data
+namespace Emby.Server.Implementations.Data;
+
+public class CleanDatabaseScheduledTask : ILibraryPostScanTask
 {
-    public class CleanDatabaseScheduledTask : ILibraryPostScanTask
+    private readonly ILibraryManager _libraryManager;
+    private readonly ILogger<CleanDatabaseScheduledTask> _logger;
+    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
+    private readonly IPathManager _pathManager;
+
+    public CleanDatabaseScheduledTask(
+        ILibraryManager libraryManager,
+        ILogger<CleanDatabaseScheduledTask> logger,
+        IDbContextFactory<JellyfinDbContext> dbProvider,
+        IPathManager pathManager)
     {
-        private readonly ILibraryManager _libraryManager;
-        private readonly ILogger<CleanDatabaseScheduledTask> _logger;
+        _libraryManager = libraryManager;
+        _logger = logger;
+        _dbProvider = dbProvider;
+        _pathManager = pathManager;
+    }
 
-        public CleanDatabaseScheduledTask(ILibraryManager libraryManager, ILogger<CleanDatabaseScheduledTask> logger)
-        {
-            _libraryManager = libraryManager;
-            _logger = logger;
-        }
+    public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        await CleanDeadItems(cancellationToken, progress).ConfigureAwait(false);
+    }
 
-        public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
+    private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
+    {
+        var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
         {
-            CleanDeadItems(cancellationToken, progress);
-            return Task.CompletedTask;
-        }
+            HasDeadParentId = true
+        });
 
-        private void CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
-            {
-                HasDeadParentId = true
-            });
+        var numComplete = 0;
+        var numItems = itemIds.Count + 1;
 
-            var numComplete = 0;
-            var numItems = itemIds.Count;
+        _logger.LogDebug("Cleaning {Number} items with dead parent links", numItems);
 
-            _logger.LogDebug("Cleaning {0} items with dead parent links", numItems);
+        foreach (var itemId in itemIds)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
 
-            foreach (var itemId in itemIds)
+            var item = _libraryManager.GetItemById(itemId);
+            if (item is not null)
             {
-                cancellationToken.ThrowIfCancellationRequested();
+                _logger.LogInformation("Cleaning item {Item} type: {Type} path: {Path}", item.Name, item.GetType().Name, item.Path ?? string.Empty);
 
-                var item = _libraryManager.GetItemById(itemId);
-
-                if (item is not null)
+                foreach (var mediaSource in item.GetMediaSources(false))
                 {
-                    _logger.LogInformation("Cleaning item {0} type: {1} path: {2}", item.Name, item.GetType().Name, item.Path ?? string.Empty);
+                    // Delete extracted subtitles
+                    try
+                    {
+                        var subtitleFolder = _pathManager.GetSubtitleFolderPath(mediaSource.Id);
+                        if (Directory.Exists(subtitleFolder))
+                        {
+                            Directory.Delete(subtitleFolder, true);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.LogWarning("Failed to remove subtitle cache folder for {Item}: {Exception}", item.Id, e.Message);
+                    }
 
-                    _libraryManager.DeleteItem(item, new DeleteOptions
+                    // Delete extracted attachments
+                    try
                     {
-                        DeleteFileLocation = false
-                    });
+                        var attachmentFolder = _pathManager.GetAttachmentFolderPath(mediaSource.Id);
+                        if (Directory.Exists(attachmentFolder))
+                        {
+                            Directory.Delete(attachmentFolder, true);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.LogWarning("Failed to remove attachment cache folder for {Item}: {Exception}", item.Id, e.Message);
+                    }
                 }
 
-                numComplete++;
-                double percent = numComplete;
-                percent /= numItems;
-                progress.Report(percent * 100);
+                // Delete item
+                _libraryManager.DeleteItem(item, new DeleteOptions
+                {
+                    DeleteFileLocation = false
+                });
             }
 
-            progress.Report(100);
+            numComplete++;
+            double percent = numComplete;
+            percent /= numItems;
+            progress.Report(percent * 100);
         }
+
+        var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+        await using (context.ConfigureAwait(false))
+        {
+            var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
+            await using (transaction.ConfigureAwait(false))
+            {
+                await context.ItemValues.Where(e => e.BaseItemsMap!.Count == 0).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+                await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+            }
+        }
+
+        progress.Report(100);
     }
 }