From 086fbd49cfba3dcdb27ba8b37ff25722e9b37fb4 Mon Sep 17 00:00:00 2001 From: Tim Eisele Date: Tue, 1 Apr 2025 01:46:21 +0200 Subject: [PATCH] Cleanup ItemFields (#13818) * Cleanup ItemFields * Update MediaBrowser.Model/Querying/ItemFields.cs --- Emby.Server.Implementations/Dto/DtoService.cs | 21 +++-- .../Session/SessionManager.cs | 1 - MediaBrowser.Controller/Dto/DtoOptions.cs | 2 +- MediaBrowser.Model/Querying/ItemFields.cs | 80 ++++++++++++------- 4 files changed, 63 insertions(+), 41 deletions(-) diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs index 0ce967e6a9..5b0fc9ef3b 100644 --- a/Emby.Server.Implementations/Dto/DtoService.cs +++ b/Emby.Server.Implementations/Dto/DtoService.cs @@ -41,7 +41,6 @@ namespace Emby.Server.Implementations.Dto private readonly ILogger _logger; private readonly ILibraryManager _libraryManager; private readonly IUserDataManager _userDataRepository; - private readonly IItemRepository _itemRepo; private readonly IImageProcessor _imageProcessor; private readonly IProviderManager _providerManager; @@ -58,7 +57,6 @@ namespace Emby.Server.Implementations.Dto ILogger logger, ILibraryManager libraryManager, IUserDataManager userDataRepository, - IItemRepository itemRepo, IImageProcessor imageProcessor, IProviderManager providerManager, IRecordingsManager recordingsManager, @@ -71,7 +69,6 @@ namespace Emby.Server.Implementations.Dto _logger = logger; _libraryManager = libraryManager; _userDataRepository = userDataRepository; - _itemRepo = itemRepo; _imageProcessor = imageProcessor; _providerManager = providerManager; _recordingsManager = recordingsManager; @@ -99,11 +96,11 @@ namespace Emby.Server.Implementations.Dto if (item is LiveTvChannel tvChannel) { - (channelTuples ??= new()).Add((dto, tvChannel)); + (channelTuples ??= []).Add((dto, tvChannel)); } else if (item is LiveTvProgram) { - (programTuples ??= new()).Add((item, dto)); + (programTuples ??= []).Add((item, dto)); } if (item is IItemByName byName) @@ -590,12 +587,12 @@ namespace Emby.Server.Implementations.Dto if (dto.ImageBlurHashes is not null) { // Only add BlurHash for the person's image. - baseItemPerson.ImageBlurHashes = new Dictionary>(); + baseItemPerson.ImageBlurHashes = []; foreach (var (imageType, blurHash) in dto.ImageBlurHashes) { if (blurHash is not null) { - baseItemPerson.ImageBlurHashes[imageType] = new Dictionary(); + baseItemPerson.ImageBlurHashes[imageType] = []; foreach (var (imageId, blurHashValue) in blurHash) { if (string.Equals(baseItemPerson.PrimaryImageTag, imageId, StringComparison.OrdinalIgnoreCase)) @@ -674,11 +671,11 @@ namespace Emby.Server.Implementations.Dto if (!string.IsNullOrEmpty(image.BlurHash)) { - dto.ImageBlurHashes ??= new Dictionary>(); + dto.ImageBlurHashes ??= []; if (!dto.ImageBlurHashes.TryGetValue(image.Type, out var value)) { - value = new Dictionary(); + value = []; dto.ImageBlurHashes[image.Type] = value; } @@ -709,7 +706,7 @@ namespace Emby.Server.Implementations.Dto if (hashes.Count > 0) { - dto.ImageBlurHashes ??= new Dictionary>(); + dto.ImageBlurHashes ??= []; dto.ImageBlurHashes[imageType] = hashes; } @@ -756,7 +753,7 @@ namespace Emby.Server.Implementations.Dto dto.AspectRatio = hasAspectRatio.AspectRatio; } - dto.ImageBlurHashes = new Dictionary>(); + dto.ImageBlurHashes = []; var backdropLimit = options.GetImageLimit(ImageType.Backdrop); if (backdropLimit > 0) @@ -772,7 +769,7 @@ namespace Emby.Server.Implementations.Dto if (options.EnableImages) { - dto.ImageTags = new Dictionary(); + dto.ImageTags = []; // Prevent implicitly captured closure var currentItem = item; diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index ac3e105940..924f502860 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -1808,7 +1808,6 @@ namespace Emby.Server.Implementations.Session fields.Remove(ItemFields.DateLastSaved); fields.Remove(ItemFields.DisplayPreferencesId); fields.Remove(ItemFields.Etag); - fields.Remove(ItemFields.InheritedParentalRatingValue); fields.Remove(ItemFields.ItemCounts); fields.Remove(ItemFields.MediaSourceCount); fields.Remove(ItemFields.MediaStreams); diff --git a/MediaBrowser.Controller/Dto/DtoOptions.cs b/MediaBrowser.Controller/Dto/DtoOptions.cs index cb638cf90b..a71cdbd62c 100644 --- a/MediaBrowser.Controller/Dto/DtoOptions.cs +++ b/MediaBrowser.Controller/Dto/DtoOptions.cs @@ -34,7 +34,7 @@ namespace MediaBrowser.Controller.Dto EnableUserData = true; AddCurrentProgram = true; - Fields = allFields ? AllItemFields : Array.Empty(); + Fields = allFields ? AllItemFields : []; ImageTypes = AllImageTypes; } diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index 6605064ad6..ffecd392f2 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -1,7 +1,3 @@ -#pragma warning disable CS1591 - -using System; - namespace MediaBrowser.Model.Querying { /// @@ -39,6 +35,9 @@ namespace MediaBrowser.Model.Querying /// Trickplay, + /// + /// The child count. + /// ChildCount, /// @@ -81,11 +80,6 @@ namespace MediaBrowser.Model.Querying /// Genres, - /// - /// The home page URL. - /// - HomePageUrl, - /// /// The item counts. /// @@ -101,6 +95,9 @@ namespace MediaBrowser.Model.Querying /// MediaSources, + /// + /// The original title. + /// OriginalTitle, /// @@ -123,6 +120,9 @@ namespace MediaBrowser.Model.Querying /// People, + /// + /// Value indicating whether playback access is granted. + /// PlayAccess, /// @@ -140,6 +140,9 @@ namespace MediaBrowser.Model.Querying /// PrimaryImageAspectRatio, + /// + /// The recursive item count. + /// RecursiveItemCount, /// @@ -147,14 +150,6 @@ namespace MediaBrowser.Model.Querying /// Settings, - /// - /// The screenshot image tags. - /// - [Obsolete("Screenshot image type is no longer used.")] - ScreenshotImageTags, - - SeriesPrimaryImage, - /// /// The series studio. /// @@ -201,27 +196,58 @@ namespace MediaBrowser.Model.Querying SeasonUserData, /// - /// The service name. + /// The last time metadata was refreshed. /// - ServiceName, - ThemeSongIds, - ThemeVideoIds, - ExternalEtag, - PresentationUniqueKey, - InheritedParentalRatingValue, - InheritedParentalRatingSubValue, - ExternalSeriesId, - SeriesPresentationUniqueKey, DateLastRefreshed, + + /// + /// The last time metadata was saved. + /// DateLastSaved, + + /// + /// The refresh state. + /// RefreshState, + + /// + /// The channel image. + /// ChannelImage, + + /// + /// Value indicating whether media source display is enabled. + /// EnableMediaSourceDisplay, + + /// + /// The width. + /// Width, + + /// + /// The height. + /// Height, + + /// + /// The external Ids. + /// ExtraIds, + + /// + /// The local trailer count. + /// LocalTrailerCount, + + /// + /// Value indicating whether the item is HD. + /// IsHD, + + /// + /// The special feature count. + /// SpecialFeatureCount } }