Merge branch 'master' into master

1 files changed, 45 insertions, 20 deletions

diff --git a/Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs b/Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs
index c1a9e8894..0f55465e8 100644
--- a/Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs
+++ b/Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs
@@ -4,7 +4,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using Jellyfin.Data.Enums;
-using MediaBrowser.Common;
+using Jellyfin.Server.ServerSetupApp;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Trickplay;
@@ -16,12 +16,15 @@ namespace Jellyfin.Server.Migrations.Routines;
 /// <summary>
 /// Migration to move trickplay files to the new directory.
 /// </summary>
+#pragma warning disable CS0618 // Type or member is obsolete
+[JellyfinMigration("2025-04-20T23:00:00", nameof(MoveTrickplayFiles), RunMigrationOnSetup = true)]
 public class MoveTrickplayFiles : IMigrationRoutine
+#pragma warning restore CS0618 // Type or member is obsolete
 {
     private readonly ITrickplayManager _trickplayManager;
     private readonly IFileSystem _fileSystem;
     private readonly ILibraryManager _libraryManager;
-    private readonly ILogger<MoveTrickplayFiles> _logger;
+    private readonly IStartupLogger _logger;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="MoveTrickplayFiles"/> class.
@@ -30,7 +33,11 @@ public class MoveTrickplayFiles : IMigrationRoutine
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
     /// <param name="logger">The logger.</param>
-    public MoveTrickplayFiles(ITrickplayManager trickplayManager, IFileSystem fileSystem, ILibraryManager libraryManager, ILogger<MoveTrickplayFiles> logger)
+    public MoveTrickplayFiles(
+        ITrickplayManager trickplayManager,
+        IFileSystem fileSystem,
+        ILibraryManager libraryManager,
+        IStartupLogger<MoveTrickplayFiles> logger)
     {
         _trickplayManager = trickplayManager;
         _fileSystem = fileSystem;
@@ -39,18 +46,9 @@ public class MoveTrickplayFiles : IMigrationRoutine
     }
 
     /// <inheritdoc />
-    public Guid Id => new("4EF123D5-8EFF-4B0B-869D-3AED07A60E1B");
-
-    /// <inheritdoc />
-    public string Name => "MoveTrickplayFiles";
-
-    /// <inheritdoc />
-    public bool PerformOnNewInstall => true;
-
-    /// <inheritdoc />
     public void Perform()
     {
-        const int Limit = 100;
+        const int Limit = 5000;
         int itemCount = 0, offset = 0, previousCount;
 
         var sw = Stopwatch.StartNew();
@@ -65,9 +63,6 @@ public class MoveTrickplayFiles : IMigrationRoutine
         do
         {
             var trickplayInfos = _trickplayManager.GetTrickplayItemsAsync(Limit, offset).GetAwaiter().GetResult();
-            previousCount = trickplayInfos.Count;
-            offset += Limit;
-
             trickplayQuery.ItemIds = trickplayInfos.Select(i => i.ItemId).Distinct().ToArray();
             var items = _libraryManager.GetItemList(trickplayQuery);
             foreach (var trickplayInfo in trickplayInfos)
@@ -78,18 +73,32 @@ public class MoveTrickplayFiles : IMigrationRoutine
                     continue;
                 }
 
-                if (++itemCount % 1_000 == 0)
+                var moved = false;
+                var oldPath = GetOldTrickplayDirectory(item, trickplayInfo.Width);
+                var newPath = _trickplayManager.GetTrickplayDirectory(item, trickplayInfo.TileWidth, trickplayInfo.TileHeight, trickplayInfo.Width, false);
+                if (_fileSystem.DirectoryExists(oldPath))
                 {
-                    _logger.LogInformation("Moved {Count} items in {Time}", itemCount, sw.Elapsed);
+                    _fileSystem.MoveDirectory(oldPath, newPath);
+                    moved = true;
                 }
 
-                var oldPath = GetOldTrickplayDirectory(item, trickplayInfo.Width);
-                var newPath = _trickplayManager.GetTrickplayDirectory(item, trickplayInfo.TileWidth, trickplayInfo.TileHeight, trickplayInfo.Width, false);
+                oldPath = GetNewOldTrickplayDirectory(item, trickplayInfo.TileWidth, trickplayInfo.TileHeight, trickplayInfo.Width, false);
                 if (_fileSystem.DirectoryExists(oldPath))
                 {
                     _fileSystem.MoveDirectory(oldPath, newPath);
+                    moved = true;
+                }
+
+                if (moved)
+                {
+                    itemCount++;
                 }
             }
+
+            offset += Limit;
+            previousCount = trickplayInfos.Count;
+
+            _logger.LogInformation("Checked: {Checked} - Moved: {Count} - Time: {Time}", offset, itemCount, sw.Elapsed);
         } while (previousCount == Limit);
 
         _logger.LogInformation("Moved {Count} items in {Time}", itemCount, sw.Elapsed);
@@ -101,4 +110,20 @@ public class MoveTrickplayFiles : IMigrationRoutine
 
         return width.HasValue ? Path.Combine(path, width.Value.ToString(CultureInfo.InvariantCulture)) : path;
     }
+
+    private string GetNewOldTrickplayDirectory(BaseItem item, int tileWidth, int tileHeight, int width, bool saveWithMedia = false)
+    {
+        var path = saveWithMedia
+            ? Path.Combine(item.ContainingFolderPath, Path.ChangeExtension(item.Path, ".trickplay"))
+            : Path.Combine(item.GetInternalMetadataPath(), "trickplay");
+
+        var subdirectory = string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} - {1}x{2}",
+            width.ToString(CultureInfo.InvariantCulture),
+            tileWidth.ToString(CultureInfo.InvariantCulture),
+            tileHeight.ToString(CultureInfo.InvariantCulture));
+
+        return Path.Combine(path, subdirectory);
+    }
 }