2 files changed, 15 insertions, 8 deletions
diff --git a/MediaBrowser.Controller/IO/IExternalDataManager.cs b/MediaBrowser.Controller/IO/IExternalDataManager.cs
index f69f4586c6..b2eb8fc3f1 100644
--- a/MediaBrowser.Controller/IO/IExternalDataManager.cs
+++ b/MediaBrowser.Controller/IO/IExternalDataManager.cs
@@ -16,4 +16,11 @@ public interface IExternalDataManager
     /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns>Task.</returns>
     Task DeleteExternalItemDataAsync(BaseItem item, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Deletes only the filesystem-side external item data (attachments, subtitles, trickplay, chapter images).
+    /// Use this when DB-side cleanup is already handled by another code path (e.g. <c>IItemPersistenceService.DeleteItem</c>).
+    /// </summary>
+    /// <param name="item">The item.</param>
+    void DeleteExternalItemFiles(BaseItem item);
 }
diff --git a/MediaBrowser.Controller/IO/IPathManager.cs b/MediaBrowser.Controller/IO/IPathManager.cs
index eb67437545..30961c7610 100644
--- a/MediaBrowser.Controller/IO/IPathManager.cs
+++ b/MediaBrowser.Controller/IO/IPathManager.cs
@@ -22,30 +22,30 @@ public interface IPathManager
     /// <param name="mediaSourceId">The media source id.</param>
     /// <param name="streamIndex">The stream index.</param>
     /// <param name="extension">The subtitle file extension.</param>
-    /// <returns>The absolute path.</returns>
-    public string GetSubtitlePath(string mediaSourceId, int streamIndex, string extension);
+    /// <returns>The absolute path, or <c>null</c> if <paramref name="mediaSourceId"/> is not a valid GUID.</returns>
+    public string? GetSubtitlePath(string mediaSourceId, int streamIndex, string extension);
 
     /// <summary>
     /// Gets the path to the subtitle file.
     /// </summary>
     /// <param name="mediaSourceId">The media source id.</param>
-    /// <returns>The absolute path.</returns>
-    public string GetSubtitleFolderPath(string mediaSourceId);
+    /// <returns>The absolute path, or <c>null</c> if <paramref name="mediaSourceId"/> is not a valid GUID.</returns>
+    public string? GetSubtitleFolderPath(string mediaSourceId);
 
     /// <summary>
     /// Gets the path to the attachment file.
     /// </summary>
     /// <param name="mediaSourceId">The media source id.</param>
     /// <param name="fileName">The attachmentFileName index.</param>
-    /// <returns>The absolute path.</returns>
-    public string GetAttachmentPath(string mediaSourceId, string fileName);
+    /// <returns>The absolute path, or <c>null</c> if <paramref name="mediaSourceId"/> is not a valid GUID.</returns>
+    public string? GetAttachmentPath(string mediaSourceId, string fileName);
 
     /// <summary>
     /// Gets the path to the attachment folder.
     /// </summary>
     /// <param name="mediaSourceId">The media source id.</param>
-    /// <returns>The absolute path.</returns>
-    public string GetAttachmentFolderPath(string mediaSourceId);
+    /// <returns>The absolute path, or <c>null</c> if <paramref name="mediaSourceId"/> is not a valid GUID.</returns>
+    public string? GetAttachmentFolderPath(string mediaSourceId);
 
     /// <summary>
     /// Gets the chapter images data path.