Cleanup external item data cleanup (#14072)

28 files changed, 85 insertions, 242 deletions

diff --git a/MediaBrowser.Providers/Books/AudioBookMetadataService.cs b/MediaBrowser.Providers/Books/AudioBookMetadataService.cs
index 79cd33aa0..1b2deaef3 100644
--- a/MediaBrowser.Providers/Books/AudioBookMetadataService.cs
+++ b/MediaBrowser.Providers/Books/AudioBookMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -24,19 +23,15 @@ public class AudioBookMetadataService : MetadataService<AudioBook, SongInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public AudioBookMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<AudioBookMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Books/BookMetadataService.cs b/MediaBrowser.Providers/Books/BookMetadataService.cs
index 6df8feab8..97cd04b45 100644
--- a/MediaBrowser.Providers/Books/BookMetadataService.cs
+++ b/MediaBrowser.Providers/Books/BookMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -24,19 +23,15 @@ public class BookMetadataService : MetadataService<Book, BookInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public BookMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<BookMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
index 83f0f2485..ab3cd9483 100644
--- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
+++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -27,19 +26,15 @@ public class BoxSetMetadataService : MetadataService<BoxSet, BoxSetInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public BoxSetMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<BoxSetMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Channels/ChannelMetadataService.cs b/MediaBrowser.Providers/Channels/ChannelMetadataService.cs
index a1f77e0a8..1285284aa 100644
--- a/MediaBrowser.Providers/Channels/ChannelMetadataService.cs
+++ b/MediaBrowser.Providers/Channels/ChannelMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class ChannelMetadataService : MetadataService<Channel, ItemLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public ChannelMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<ChannelMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs b/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs
index 6407b1a61..372b08090 100644
--- a/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/CollectionFolderMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class CollectionFolderMetadataService : MetadataService<CollectionFolder,
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public CollectionFolderMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<CollectionFolderMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/Folders/FolderMetadataService.cs b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
index 7843f729d..9ffb33abe 100644
--- a/MediaBrowser.Providers/Folders/FolderMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class FolderMetadataService : MetadataService<Folder, ItemLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public FolderMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<FolderMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs
index 834fba458..d0171aa8c 100644
--- a/MediaBrowser.Providers/Folders/UserViewMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/UserViewMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class UserViewMetadataService : MetadataService<UserView, ItemLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public UserViewMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<UserViewMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/Genres/GenreMetadataService.cs b/MediaBrowser.Providers/Genres/GenreMetadataService.cs
index 2a2a0bf50..23aaf4c92 100644
--- a/MediaBrowser.Providers/Genres/GenreMetadataService.cs
+++ b/MediaBrowser.Providers/Genres/GenreMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class GenreMetadataService : MetadataService<Genre, ItemLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public GenreMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<GenreMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/LiveTv/LiveTvMetadataService.cs b/MediaBrowser.Providers/LiveTv/LiveTvMetadataService.cs
index 9e4d91019..c5c46f64c 100644
--- a/MediaBrowser.Providers/LiveTv/LiveTvMetadataService.cs
+++ b/MediaBrowser.Providers/LiveTv/LiveTvMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class LiveTvMetadataService : MetadataService<LiveTvChannel, ItemLookupIn
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public LiveTvMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<LiveTvMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index c4d4e775a..16421c9ae 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -15,7 +14,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
@@ -35,18 +33,14 @@ namespace MediaBrowser.Providers.Manager
             IProviderManager providerManager,
             IFileSystem fileSystem,
             ILibraryManager libraryManager,
-            IPathManager pathManager,
-            IKeyframeManager keyframeManager,
-            IMediaSegmentManager mediaSegmentManager)
+            IExternalDataManager externalDataManager)
         {
             ServerConfigurationManager = serverConfigurationManager;
             Logger = logger;
             ProviderManager = providerManager;
             FileSystem = fileSystem;
             LibraryManager = libraryManager;
-            PathManager = pathManager;
-            KeyframeManager = keyframeManager;
-            MediaSegmentManager = mediaSegmentManager;
+            ExternalDataManager = externalDataManager;
             ImageProvider = new ItemImageProvider(Logger, ProviderManager, FileSystem);
         }
 
@@ -62,11 +56,7 @@ namespace MediaBrowser.Providers.Manager
 
         protected ILibraryManager LibraryManager { get; }
 
-        protected IPathManager PathManager { get; }
-
-        protected IKeyframeManager KeyframeManager { get; }
-
-        protected IMediaSegmentManager MediaSegmentManager { get; }
+        protected IExternalDataManager ExternalDataManager { get; }
 
         protected virtual bool EnableUpdatingPremiereDateFromChildren => false;
 
@@ -344,27 +334,10 @@ namespace MediaBrowser.Providers.Manager
                     if (item is Video video)
                     {
                         var videoType = video.VideoType;
-                        var sizeChanged = size != (video.Size ?? 0);
-                        if (videoType == VideoType.BluRay || video.VideoType == VideoType.Dvd || sizeChanged)
+                        if (videoType == VideoType.BluRay || video.VideoType == VideoType.Dvd)
                         {
-                            if (sizeChanged)
-                            {
-                                item.Size = size;
-                                Logger.LogDebug("File size changed from {Then} to {Now}: {Path}", video.Size, size, itemPath);
-                            }
-
-                            var validPaths = PathManager.GetExtractedDataPaths(video).Where(Directory.Exists).ToList();
-                            if (validPaths.Count > 0)
-                            {
-                                Logger.LogInformation("File changed, pruning extracted data: {Path}", itemPath);
-                                foreach (var path in validPaths)
-                                {
-                                    Directory.Delete(path, true);
-                                }
-                            }
-
-                            KeyframeManager.DeleteKeyframeDataAsync(video.Id, CancellationToken.None).GetAwaiter().GetResult();
-                            MediaSegmentManager.DeleteSegmentsAsync(item.Id).GetAwaiter().GetResult();
+                            Logger.LogInformation("File changed, pruning extracted data: {Path}", item.Path);
+                            ExternalDataManager.DeleteExternalItemDataAsync(video, CancellationToken.None).GetAwaiter().GetResult();
                         }
                     }
 
diff --git a/MediaBrowser.Providers/Movies/MovieMetadataService.cs b/MediaBrowser.Providers/Movies/MovieMetadataService.cs
index 0779e17bd..a6e1f424d 100644
--- a/MediaBrowser.Providers/Movies/MovieMetadataService.cs
+++ b/MediaBrowser.Providers/Movies/MovieMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -24,19 +23,15 @@ public class MovieMetadataService : MetadataService<Movie, MovieInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public MovieMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<MovieMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Movies/TrailerMetadataService.cs b/MediaBrowser.Providers/Movies/TrailerMetadataService.cs
index bf8735ad4..7f38861e3 100644
--- a/MediaBrowser.Providers/Movies/TrailerMetadataService.cs
+++ b/MediaBrowser.Providers/Movies/TrailerMetadataService.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -25,19 +24,15 @@ public class TrailerMetadataService : MetadataService<Trailer, TrailerInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public TrailerMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<TrailerMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Music/AlbumMetadataService.cs b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
index cc6d7953d..2af3667d0 100644
--- a/MediaBrowser.Providers/Music/AlbumMetadataService.cs
+++ b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
@@ -7,7 +7,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -29,19 +28,15 @@ public class AlbumMetadataService : MetadataService<MusicAlbum, AlbumInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public AlbumMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<AlbumMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
index 3764893a6..9bac68627 100644
--- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs
+++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -25,19 +24,15 @@ public class ArtistMetadataService : MetadataService<MusicArtist, ArtistInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public ArtistMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<ArtistMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Music/AudioMetadataService.cs b/MediaBrowser.Providers/Music/AudioMetadataService.cs
index b632f9a51..ccc1c90c0 100644
--- a/MediaBrowser.Providers/Music/AudioMetadataService.cs
+++ b/MediaBrowser.Providers/Music/AudioMetadataService.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -26,19 +25,15 @@ public class AudioMetadataService : MetadataService<Audio, SongInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public AudioMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<AudioMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Music/MusicVideoMetadataService.cs b/MediaBrowser.Providers/Music/MusicVideoMetadataService.cs
index f4df1d78d..cde14539a 100644
--- a/MediaBrowser.Providers/Music/MusicVideoMetadataService.cs
+++ b/MediaBrowser.Providers/Music/MusicVideoMetadataService.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -26,19 +25,15 @@ public class MusicVideoMetadataService : MetadataService<MusicVideo, MusicVideoI
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public MusicVideoMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<MusicVideoMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/MusicGenres/MusicGenreMetadataService.cs b/MediaBrowser.Providers/MusicGenres/MusicGenreMetadataService.cs
index a27698e37..201c0efcf 100644
--- a/MediaBrowser.Providers/MusicGenres/MusicGenreMetadataService.cs
+++ b/MediaBrowser.Providers/MusicGenres/MusicGenreMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class MusicGenreMetadataService : MetadataService<MusicGenre, ItemLookupI
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public MusicGenreMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<MusicGenreMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/People/PersonMetadataService.cs b/MediaBrowser.Providers/People/PersonMetadataService.cs
index 03a396489..d910327a3 100644
--- a/MediaBrowser.Providers/People/PersonMetadataService.cs
+++ b/MediaBrowser.Providers/People/PersonMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class PersonMetadataService : MetadataService<Person, PersonLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public PersonMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<PersonMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/Photos/PhotoAlbumMetadataService.cs b/MediaBrowser.Providers/Photos/PhotoAlbumMetadataService.cs
index dfa981adb..99c2c09c8 100644
--- a/MediaBrowser.Providers/Photos/PhotoAlbumMetadataService.cs
+++ b/MediaBrowser.Providers/Photos/PhotoAlbumMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class PhotoAlbumMetadataService : MetadataService<PhotoAlbum, ItemLookupI
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public PhotoAlbumMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<PhotoAlbumMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/Photos/PhotoMetadataService.cs b/MediaBrowser.Providers/Photos/PhotoMetadataService.cs
index 9043d7b11..f90df8406 100644
--- a/MediaBrowser.Providers/Photos/PhotoMetadataService.cs
+++ b/MediaBrowser.Providers/Photos/PhotoMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class PhotoMetadataService : MetadataService<Photo, ItemLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public PhotoMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<PhotoMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
index 8c9f8bab7..b9318f0c8 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
@@ -27,19 +26,15 @@ public class PlaylistMetadataService : MetadataService<Playlist, ItemLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public PlaylistMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<PlaylistMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Studios/StudioMetadataService.cs b/MediaBrowser.Providers/Studios/StudioMetadataService.cs
index 9d43b50d9..d0000442f 100644
--- a/MediaBrowser.Providers/Studios/StudioMetadataService.cs
+++ b/MediaBrowser.Providers/Studios/StudioMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class StudioMetadataService : MetadataService<Studio, ItemLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public StudioMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<StudioMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }
diff --git a/MediaBrowser.Providers/TV/EpisodeMetadataService.cs b/MediaBrowser.Providers/TV/EpisodeMetadataService.cs
index 3921d6a9a..b2b6cd9ab 100644
--- a/MediaBrowser.Providers/TV/EpisodeMetadataService.cs
+++ b/MediaBrowser.Providers/TV/EpisodeMetadataService.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -25,19 +24,15 @@ public class EpisodeMetadataService : MetadataService<Episode, EpisodeInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public EpisodeMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<EpisodeMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/TV/SeasonMetadataService.cs b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
index 65aa4a963..ea228a658 100644
--- a/MediaBrowser.Providers/TV/SeasonMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
@@ -6,7 +6,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -28,19 +27,15 @@ public class SeasonMetadataService : MetadataService<Season, SeasonInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public SeasonMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<SeasonMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/TV/SeriesMetadataService.cs b/MediaBrowser.Providers/TV/SeriesMetadataService.cs
index f0d21cf1a..0ccb7f80e 100644
--- a/MediaBrowser.Providers/TV/SeriesMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeriesMetadataService.cs
@@ -10,7 +10,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
@@ -36,9 +35,7 @@ public class SeriesMetadataService : MetadataService<Series, SeriesInfo>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
     /// <param name="localizationManager">Instance of the <see cref="ILocalizationManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public SeriesMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<SeriesMetadataService> logger,
@@ -46,10 +43,8 @@ public class SeriesMetadataService : MetadataService<Series, SeriesInfo>
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
         ILocalizationManager localizationManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
         _localizationManager = localizationManager;
     }
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs b/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
index 2c74e5f70..768e4617b 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayProvider.cs
@@ -101,7 +101,7 @@ public class TrickplayProvider : ICustomMetadataProvider<Episode>,
         bool? enableDuringScan = libraryOptions?.ExtractTrickplayImagesDuringLibraryScan;
         bool replace = options.RegenerateTrickplay && options.MetadataRefreshMode > MetadataRefreshMode.Default;
 
-        if (!enableDuringScan.GetValueOrDefault(false))
+        if (libraryOptions is null || !enableDuringScan.GetValueOrDefault(false))
         {
             return ItemUpdateType.None;
         }
diff --git a/MediaBrowser.Providers/Videos/VideoMetadataService.cs b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
index fb7899957..c739bac7d 100644
--- a/MediaBrowser.Providers/Videos/VideoMetadataService.cs
+++ b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class VideoMetadataService : MetadataService<Video, ItemLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public VideoMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<VideoMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 
diff --git a/MediaBrowser.Providers/Years/YearMetadataService.cs b/MediaBrowser.Providers/Years/YearMetadataService.cs
index 4d12fc32f..da5f56277 100644
--- a/MediaBrowser.Providers/Years/YearMetadataService.cs
+++ b/MediaBrowser.Providers/Years/YearMetadataService.cs
@@ -2,7 +2,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaSegments;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Providers.Manager;
@@ -23,19 +22,15 @@ public class YearMetadataService : MetadataService<Year, ItemLookupInfo>
     /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    /// <param name="pathManager">Instance of the <see cref="IPathManager"/> interface.</param>
-    /// <param name="keyframeManager">Instance of the <see cref="IKeyframeManager"/> interface.</param>
-    /// <param name="mediaSegmentManager">Instance of the <see cref="IMediaSegmentManager"/> interface.</param>
+    /// <param name="externalDataManager">Instance of the <see cref="IExternalDataManager"/> interface.</param>
     public YearMetadataService(
         IServerConfigurationManager serverConfigurationManager,
         ILogger<YearMetadataService> logger,
         IProviderManager providerManager,
         IFileSystem fileSystem,
         ILibraryManager libraryManager,
-        IPathManager pathManager,
-        IKeyframeManager keyframeManager,
-        IMediaSegmentManager mediaSegmentManager)
-        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, pathManager, keyframeManager, mediaSegmentManager)
+        IExternalDataManager externalDataManager)
+        : base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager, externalDataManager)
     {
     }
 }