From 9145be6bfc2f2d40e768cf774761ac1bd4581201 Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Wed, 22 May 2024 07:38:53 +0200 Subject: [PATCH] Remove local metadata stop logic --- MediaBrowser.Controller/Entities/BaseItem.cs | 3 --- .../Entities/Movies/Movie.cs | 3 --- MediaBrowser.Controller/Entities/TV/Series.cs | 3 --- MediaBrowser.Controller/Entities/Trailer.cs | 3 --- .../Manager/MetadataService.cs | 13 +----------- .../Movies/MovieMetadataService.cs | 16 -------------- .../Movies/TrailerMetadataService.cs | 16 -------------- .../Music/AlbumMetadataService.cs | 21 ------------------- .../Music/AudioMetadataService.cs | 21 ------------------- .../TV/EpisodeMetadataService.cs | 16 -------------- .../TV/SeasonMetadataService.cs | 16 -------------- .../TV/SeriesMetadataService.cs | 16 -------------- 12 files changed, 1 insertion(+), 146 deletions(-) diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 22793206e9..184bb4d688 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -751,9 +751,6 @@ namespace MediaBrowser.Controller.Entities [JsonIgnore] public virtual bool SupportsAncestors => true; - [JsonIgnore] - public virtual bool StopRefreshIfLocalMetadataFound => true; - [JsonIgnore] protected virtual bool SupportsOwnedItems => !ParentId.IsEmpty() && IsFileProtocol; diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs index 81f6248fac..ede544eecb 100644 --- a/MediaBrowser.Controller/Entities/Movies/Movie.cs +++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs @@ -45,9 +45,6 @@ namespace MediaBrowser.Controller.Entities.Movies set => TmdbCollectionName = value; } - [JsonIgnore] - public override bool StopRefreshIfLocalMetadataFound => false; - public override double GetDefaultPrimaryImageAspectRatio() { // hack for tv plugins diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs index d200721b28..267c4a4d05 100644 --- a/MediaBrowser.Controller/Entities/TV/Series.cs +++ b/MediaBrowser.Controller/Entities/TV/Series.cs @@ -72,9 +72,6 @@ namespace MediaBrowser.Controller.Entities.TV /// The status. public SeriesStatus? Status { get; set; } - [JsonIgnore] - public override bool StopRefreshIfLocalMetadataFound => false; - public override double GetDefaultPrimaryImageAspectRatio() { double value = 2; diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs index 1c558d4196..81d50bbc11 100644 --- a/MediaBrowser.Controller/Entities/Trailer.cs +++ b/MediaBrowser.Controller/Entities/Trailer.cs @@ -23,9 +23,6 @@ namespace MediaBrowser.Controller.Entities TrailerTypes = Array.Empty(); } - [JsonIgnore] - public override bool StopRefreshIfLocalMetadataFound => false; - public TrailerType[] TrailerTypes { get; set; } public override double GetDefaultPrimaryImageAspectRatio() diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs index 1a045714c1..663e982013 100644 --- a/MediaBrowser.Providers/Manager/MetadataService.cs +++ b/MediaBrowser.Providers/Manager/MetadataService.cs @@ -730,9 +730,8 @@ namespace MediaBrowser.Providers.Manager } } - var hasLocalBaseMetadata = HasBaseMetadata(temp.Item); var isLocalLocked = temp.Item.IsLocked; - if (!isLocalLocked && !(hasLocalBaseMetadata && item.StopRefreshIfLocalMetadataFound) && (options.ReplaceAllMetadata || options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh)) + if (!isLocalLocked && (options.ReplaceAllMetadata || options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh)) { var remoteResult = await ExecuteRemoteProviders(temp, logName, false, id, providers.OfType>(), cancellationToken) .ConfigureAwait(false); @@ -773,16 +772,6 @@ namespace MediaBrowser.Providers.Manager return refreshResult; } - protected virtual bool HasBaseMetadata(TItemType item) - { - if (string.IsNullOrWhiteSpace(item.Name)) - { - return false; - } - - return true; - } - private async Task RunCustomProvider(ICustomMetadataProvider provider, TItemType item, string logName, MetadataRefreshOptions options, RefreshResult refreshResult, CancellationToken cancellationToken) { Logger.LogDebug("Running {Provider} for {Item}", provider.GetType().Name, logName); diff --git a/MediaBrowser.Providers/Movies/MovieMetadataService.cs b/MediaBrowser.Providers/Movies/MovieMetadataService.cs index a73d98e163..8997ddc644 100644 --- a/MediaBrowser.Providers/Movies/MovieMetadataService.cs +++ b/MediaBrowser.Providers/Movies/MovieMetadataService.cs @@ -23,22 +23,6 @@ namespace MediaBrowser.Providers.Movies { } - /// - protected override bool HasBaseMetadata(Movie item) - { - if (string.IsNullOrWhiteSpace(item.Overview)) - { - return false; - } - - if (!item.ProductionYear.HasValue) - { - return false; - } - - return base.HasBaseMetadata(item); - } - /// protected override void MergeData(MetadataResult source, MetadataResult target, MetadataField[] lockedFields, bool replaceData, bool mergeMetadataSettings) { diff --git a/MediaBrowser.Providers/Movies/TrailerMetadataService.cs b/MediaBrowser.Providers/Movies/TrailerMetadataService.cs index 8d9019e75f..e77d2fa8a3 100644 --- a/MediaBrowser.Providers/Movies/TrailerMetadataService.cs +++ b/MediaBrowser.Providers/Movies/TrailerMetadataService.cs @@ -24,22 +24,6 @@ namespace MediaBrowser.Providers.Movies { } - /// - protected override bool HasBaseMetadata(Trailer item) - { - if (string.IsNullOrWhiteSpace(item.Overview)) - { - return false; - } - - if (!item.ProductionYear.HasValue) - { - return false; - } - - return base.HasBaseMetadata(item); - } - /// protected override void MergeData(MetadataResult source, MetadataResult target, MetadataField[] lockedFields, bool replaceData, bool mergeMetadataSettings) { diff --git a/MediaBrowser.Providers/Music/AlbumMetadataService.cs b/MediaBrowser.Providers/Music/AlbumMetadataService.cs index 07fc2363ba..a39bd16cea 100644 --- a/MediaBrowser.Providers/Music/AlbumMetadataService.cs +++ b/MediaBrowser.Providers/Music/AlbumMetadataService.cs @@ -208,27 +208,6 @@ namespace MediaBrowser.Providers.Music return updateType; } - /// - protected override bool HasBaseMetadata(MusicAlbum item) - { - if (string.IsNullOrWhiteSpace(item.Album)) - { - return false; - } - - if (item.AlbumArtists.Count == 0 && item.Artists.Count == 0) - { - return false; - } - - if (!item.ProductionYear.HasValue) - { - return false; - } - - return base.HasBaseMetadata(item); - } - /// protected override void MergeData( MetadataResult source, diff --git a/MediaBrowser.Providers/Music/AudioMetadataService.cs b/MediaBrowser.Providers/Music/AudioMetadataService.cs index f25b848a92..7b25bc0e49 100644 --- a/MediaBrowser.Providers/Music/AudioMetadataService.cs +++ b/MediaBrowser.Providers/Music/AudioMetadataService.cs @@ -49,27 +49,6 @@ namespace MediaBrowser.Providers.Music } } - /// - protected override bool HasBaseMetadata(Audio item) - { - if (item.IndexNumber is null) - { - return false; - } - - if (string.IsNullOrEmpty(item.Album)) - { - return false; - } - - if (item.AlbumArtists.Count == 0 && item.Artists.Count == 0) - { - return false; - } - - return base.HasBaseMetadata(item); - } - /// protected override void MergeData(MetadataResult