1 files changed, 21 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/Library/PathManager.cs b/Emby.Server.Implementations/Library/PathManager.cs
index dbd2333ff..a9b7a1274 100644
--- a/Emby.Server.Implementations/Library/PathManager.cs
+++ b/Emby.Server.Implementations/Library/PathManager.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using MediaBrowser.Common.Configuration;
@@ -29,14 +30,14 @@ public class PathManager : IPathManager
         _appPaths = appPaths;
     }
 
-    private string SubtitleCachePath => Path.Join(_appPaths.DataPath, "subtitles");
+    private string SubtitleCachePath => Path.Combine(_appPaths.DataPath, "subtitles");
 
-    private string AttachmentCachePath => Path.Join(_appPaths.DataPath, "attachments");
+    private string AttachmentCachePath => Path.Combine(_appPaths.DataPath, "attachments");
 
     /// <inheritdoc />
     public string GetAttachmentPath(string mediaSourceId, string fileName)
     {
-        return Path.Join(GetAttachmentFolderPath(mediaSourceId), fileName);
+        return Path.Combine(GetAttachmentFolderPath(mediaSourceId), fileName);
     }
 
     /// <inheritdoc />
@@ -58,7 +59,7 @@ public class PathManager : IPathManager
     /// <inheritdoc />
     public string GetSubtitlePath(string mediaSourceId, int streamIndex, string extension)
     {
-        return Path.Join(GetSubtitleFolderPath(mediaSourceId), streamIndex.ToString(CultureInfo.InvariantCulture) + extension);
+        return Path.Combine(GetSubtitleFolderPath(mediaSourceId), streamIndex.ToString(CultureInfo.InvariantCulture) + extension);
     }
 
     /// <inheritdoc />
@@ -67,14 +68,14 @@ public class PathManager : IPathManager
         var id = item.Id.ToString("D", CultureInfo.InvariantCulture).AsSpan();
 
         return saveWithMedia
-            ? Path.Join(item.ContainingFolderPath, Path.ChangeExtension(item.Path, ".trickplay"))
+            ? Path.Combine(item.ContainingFolderPath, Path.ChangeExtension(Path.GetFileName(item.Path), ".trickplay"))
             : Path.Join(_config.ApplicationPaths.TrickplayPath, id[..2], id);
     }
 
     /// <inheritdoc/>
     public string GetChapterImageFolderPath(BaseItem item)
     {
-        return Path.Join(item.GetInternalMetadataPath(), "chapters");
+        return Path.Combine(item.GetInternalMetadataPath(), "chapters");
     }
 
     /// <inheritdoc/>
@@ -82,6 +83,19 @@ public class PathManager : IPathManager
     {
         var filename = item.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) + "_" + chapterPositionTicks.ToString(CultureInfo.InvariantCulture) + ".jpg";
 
-        return Path.Join(GetChapterImageFolderPath(item), filename);
+        return Path.Combine(GetChapterImageFolderPath(item), filename);
+    }
+
+    /// <inheritdoc/>
+    public IReadOnlyList<string> GetExtractedDataPaths(BaseItem item)
+    {
+        var mediaSourceId = item.Id.ToString("N", CultureInfo.InvariantCulture);
+        return [
+            GetAttachmentFolderPath(mediaSourceId),
+            GetSubtitleFolderPath(mediaSourceId),
+            GetTrickplayDirectory(item, false),
+            GetTrickplayDirectory(item, true),
+            GetChapterImageFolderPath(item)
+        ];
     }
 }