From be48cdd9e90ed147c5526ef3fed0624bcbad7741 Mon Sep 17 00:00:00 2001 From: JPVenson <6794763+JPVenson@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:53:39 +0000 Subject: Naming refactoring and WIP porting of new interface repositories --- .../Persistence/IPeopleRepository.cs | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 MediaBrowser.Controller/Persistence/IPeopleRepository.cs (limited to 'MediaBrowser.Controller/Persistence/IPeopleRepository.cs') diff --git a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs new file mode 100644 index 000000000..43a24703e --- /dev/null +++ b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs @@ -0,0 +1,33 @@ +#nullable disable + +#pragma warning disable CS1591 + +using System; +using System.Collections.Generic; +using MediaBrowser.Controller.Entities; + +namespace MediaBrowser.Controller.Persistence; + +public interface IPeopleRepository +{ + /// + /// Gets the people. + /// + /// The query. + /// List<PersonInfo>. + IReadOnlyList GetPeople(InternalPeopleQuery filter); + + /// + /// Updates the people. + /// + /// The item identifier. + /// The people. + void UpdatePeople(Guid itemId, IReadOnlyList people); + + /// + /// Gets the people names. + /// + /// The query. + /// List<System.String>. + IReadOnlyList GetPeopleNames(InternalPeopleQuery filter); +} -- cgit v1.2.3 From 473628ba3a9f68479e0051e76594dc47f7fa08f3 Mon Sep 17 00:00:00 2001 From: JPVenson Date: Wed, 9 Oct 2024 21:03:57 +0200 Subject: Apply suggestions from code review Co-authored-by: Cody Robibero --- Emby.Server.Implementations/Data/ItemTypeLookup.cs | 2 +- Jellyfin.Api/Controllers/MoviesController.cs | 2 +- Jellyfin.Data/Entities/BaseItemProvider.cs | 2 +- Jellyfin.Data/Entities/MediaStreamInfo.cs | 4 ---- Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs | 2 +- MediaBrowser.Controller/Persistence/IItemTypeLookup.cs | 2 +- MediaBrowser.Controller/Persistence/IPeopleRepository.cs | 4 ++-- 7 files changed, 7 insertions(+), 11 deletions(-) (limited to 'MediaBrowser.Controller/Persistence/IPeopleRepository.cs') diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs index 14dc68a32..1f73755f5 100644 --- a/Emby.Server.Implementations/Data/ItemTypeLookup.cs +++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs @@ -12,7 +12,7 @@ using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Playlists; using MediaBrowser.Model.Querying; -namespace Jellyfin.Server.Implementations.Item; +namespace Emby.Server.Implementations.Data; /// /// Provides static topic based lookups for the BaseItemKind. diff --git a/Jellyfin.Api/Controllers/MoviesController.cs b/Jellyfin.Api/Controllers/MoviesController.cs index 11559419c..f537ffa11 100644 --- a/Jellyfin.Api/Controllers/MoviesController.cs +++ b/Jellyfin.Api/Controllers/MoviesController.cs @@ -97,7 +97,7 @@ public class MoviesController : BaseJellyfinApiController DtoOptions = dtoOptions }; - var recentlyPlayedMovies = _libraryManager.GetItemList(query)!; + var recentlyPlayedMovies = _libraryManager.GetItemList(query); var itemTypes = new List { BaseItemKind.Movie }; if (_serverConfigurationManager.Configuration.EnableExternalContentInSuggestions) diff --git a/Jellyfin.Data/Entities/BaseItemProvider.cs b/Jellyfin.Data/Entities/BaseItemProvider.cs index 1fc721d6a..9a1565728 100644 --- a/Jellyfin.Data/Entities/BaseItemProvider.cs +++ b/Jellyfin.Data/Entities/BaseItemProvider.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace Jellyfin.Data.Entities; /// -/// Represents an Key-Value relaten of an BaseItem's provider. +/// Represents a Key-Value relation of an BaseItem's provider. /// public class BaseItemProvider { diff --git a/Jellyfin.Data/Entities/MediaStreamInfo.cs b/Jellyfin.Data/Entities/MediaStreamInfo.cs index a46d3f195..1198026e7 100644 --- a/Jellyfin.Data/Entities/MediaStreamInfo.cs +++ b/Jellyfin.Data/Entities/MediaStreamInfo.cs @@ -6,10 +6,6 @@ namespace Jellyfin.Data.Entities; #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member public class MediaStreamInfo { - public MediaStreamInfo() - { - } - public required Guid ItemId { get; set; } public required BaseItemEntity Item { get; set; } diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs index f44ead6e0..df434fdb3 100644 --- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs +++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs @@ -37,7 +37,7 @@ public class MediaStreamRepository(IDbContextFactory dbProvid public IReadOnlyList GetMediaStreams(MediaStreamQuery filter) { using var context = dbProvider.CreateDbContext(); - return TranslateQuery(context.MediaStreamInfos, filter).ToList().Select(Map).ToImmutableArray(); + return TranslateQuery(context.MediaStreamInfos, filter).AsEnumerable().Select(Map).ToImmutableArray(); } private string? GetPathToSave(string? path) diff --git a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs index 1b2ca2acb..6ad8380d7 100644 --- a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs +++ b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs @@ -51,7 +51,7 @@ public interface IItemTypeLookup public IReadOnlyList ArtistsTypes { get; } /// - /// Gets mapping for all BaseItemKinds and their expected serialisaition target. + /// Gets mapping for all BaseItemKinds and their expected serialization target. /// public IDictionary BaseItemKindNames { get; } } diff --git a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs index 43a24703e..418289cb4 100644 --- a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs +++ b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs @@ -14,7 +14,7 @@ public interface IPeopleRepository /// Gets the people. /// /// The query. - /// List<PersonInfo>. + /// The list of people matching the filter. IReadOnlyList GetPeople(InternalPeopleQuery filter); /// @@ -28,6 +28,6 @@ public interface IPeopleRepository /// Gets the people names. /// /// The query. - /// List<System.String>. + /// The list of people names matching the filter. IReadOnlyList GetPeopleNames(InternalPeopleQuery filter); } -- cgit v1.2.3