From eb601e944cd392a8007b540ab5627977a37368c6 Mon Sep 17 00:00:00 2001 From: JPVenson Date: Wed, 9 Oct 2024 23:01:54 +0000 Subject: Expanded BaseItem aggregate types --- Jellyfin.Data/Entities/ProgramAudioEntity.cs | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Jellyfin.Data/Entities/ProgramAudioEntity.cs (limited to 'Jellyfin.Data/Entities/ProgramAudioEntity.cs') diff --git a/Jellyfin.Data/Entities/ProgramAudioEntity.cs b/Jellyfin.Data/Entities/ProgramAudioEntity.cs new file mode 100644 index 000000000..fafccb13c --- /dev/null +++ b/Jellyfin.Data/Entities/ProgramAudioEntity.cs @@ -0,0 +1,37 @@ +namespace Jellyfin.Data.Entities; + +/// +/// Lists types of Audio. +/// +public enum ProgramAudioEntity +{ + /// + /// Mono. + /// + Mono, + + /// + /// Sterio. + /// + Stereo, + + /// + /// Dolby. + /// + Dolby, + + /// + /// DolbyDigital. + /// + DolbyDigital, + + /// + /// Thx. + /// + Thx, + + /// + /// Atmos. + /// + Atmos +} -- cgit v1.2.3 From 441b99518988212a84070dffe1ef51d6faa4e0af Mon Sep 17 00:00:00 2001 From: JPVenson Date: Thu, 10 Oct 2024 15:27:13 +0000 Subject: Applied Review Suggestions --- Emby.Server.Implementations/Data/ItemTypeLookup.cs | 3 ++- Jellyfin.Data/Entities/BaseItemMetadataField.cs | 2 -- Jellyfin.Data/Entities/BaseItemTrailerType.cs | 3 +-- Jellyfin.Data/Entities/EnumLikeTable.cs | 14 -------------- Jellyfin.Data/Entities/MediaStreamTypeEntity.cs | 12 ++++++------ Jellyfin.Data/Entities/ProgramAudioEntity.cs | 12 ++++++------ 6 files changed, 15 insertions(+), 31 deletions(-) delete mode 100644 Jellyfin.Data/Entities/EnumLikeTable.cs (limited to 'Jellyfin.Data/Entities/ProgramAudioEntity.cs') diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs index b66e7f5d9..df0f4ea20 100644 --- a/Emby.Server.Implementations/Data/ItemTypeLookup.cs +++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Frozen; using System.Collections.Generic; using System.Threading.Channels; using Emby.Server.Implementations.Playlists; @@ -116,5 +117,5 @@ public class ItemTypeLookup : IItemTypeLookup { BaseItemKind.UserView, typeof(UserView).FullName }, { BaseItemKind.Video, typeof(Video).FullName }, { BaseItemKind.Year, typeof(Year).FullName } - }.AsReadOnly(); + }.ToFrozenDictionary(); } diff --git a/Jellyfin.Data/Entities/BaseItemMetadataField.cs b/Jellyfin.Data/Entities/BaseItemMetadataField.cs index 2f8e910f2..c9d44c046 100644 --- a/Jellyfin.Data/Entities/BaseItemMetadataField.cs +++ b/Jellyfin.Data/Entities/BaseItemMetadataField.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; namespace Jellyfin.Data.Entities; -#pragma warning disable CA2227 /// /// Enum MetadataFields. diff --git a/Jellyfin.Data/Entities/BaseItemTrailerType.cs b/Jellyfin.Data/Entities/BaseItemTrailerType.cs index 7dee20c87..fb31fc8a4 100644 --- a/Jellyfin.Data/Entities/BaseItemTrailerType.cs +++ b/Jellyfin.Data/Entities/BaseItemTrailerType.cs @@ -1,8 +1,7 @@ using System; -using System.Collections.Generic; namespace Jellyfin.Data.Entities; -#pragma warning disable CA2227 + /// /// Enum TrailerTypes. /// diff --git a/Jellyfin.Data/Entities/EnumLikeTable.cs b/Jellyfin.Data/Entities/EnumLikeTable.cs deleted file mode 100644 index 11e1d0aa9..000000000 --- a/Jellyfin.Data/Entities/EnumLikeTable.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; - -namespace Jellyfin.Data.Entities; - -/// -/// Defines an Entity that is modeled after an Enum. -/// -public abstract class EnumLikeTable -{ - /// - /// Gets or Sets Numerical ID of this enumeratable. - /// - public required int Id { get; set; } -} diff --git a/Jellyfin.Data/Entities/MediaStreamTypeEntity.cs b/Jellyfin.Data/Entities/MediaStreamTypeEntity.cs index d1f6f1b18..f57672a2c 100644 --- a/Jellyfin.Data/Entities/MediaStreamTypeEntity.cs +++ b/Jellyfin.Data/Entities/MediaStreamTypeEntity.cs @@ -8,30 +8,30 @@ public enum MediaStreamTypeEntity /// /// The audio. /// - Audio, + Audio = 0, /// /// The video. /// - Video, + Video = 1, /// /// The subtitle. /// - Subtitle, + Subtitle = 2, /// /// The embedded image. /// - EmbeddedImage, + EmbeddedImage = 3, /// /// The data. /// - Data, + Data = 4, /// /// The lyric. /// - Lyric + Lyric = 5 } diff --git a/Jellyfin.Data/Entities/ProgramAudioEntity.cs b/Jellyfin.Data/Entities/ProgramAudioEntity.cs index fafccb13c..5b225a002 100644 --- a/Jellyfin.Data/Entities/ProgramAudioEntity.cs +++ b/Jellyfin.Data/Entities/ProgramAudioEntity.cs @@ -8,30 +8,30 @@ public enum ProgramAudioEntity /// /// Mono. /// - Mono, + Mono = 0, /// /// Sterio. /// - Stereo, + Stereo = 1, /// /// Dolby. /// - Dolby, + Dolby = 2, /// /// DolbyDigital. /// - DolbyDigital, + DolbyDigital = 3, /// /// Thx. /// - Thx, + Thx = 4, /// /// Atmos. /// - Atmos + Atmos = 5 } -- cgit v1.2.3 From c877ffa5ad0e07d355fee15c2192a89b507a6577 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sat, 25 Jan 2025 21:04:37 -0500 Subject: Fix various typos Found via `codespell -q 3 -S "./Emby.Server.Implementations/Localization" -L inh,som` --- Jellyfin.Data/Entities/AncestorId.cs | 2 +- Jellyfin.Data/Entities/AttachmentStreamInfo.cs | 4 ++-- Jellyfin.Data/Entities/ProgramAudioEntity.cs | 2 +- Jellyfin.Data/Entities/TrickplayInfo.cs | 2 +- Jellyfin.Server.Implementations/Item/BaseItemRepository.cs | 8 ++++---- .../MediaSegments/MediaSegmentManager.cs | 2 +- Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs | 2 +- Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'Jellyfin.Data/Entities/ProgramAudioEntity.cs') diff --git a/Jellyfin.Data/Entities/AncestorId.cs b/Jellyfin.Data/Entities/AncestorId.cs index ef0fe0ba7..954416dfe 100644 --- a/Jellyfin.Data/Entities/AncestorId.cs +++ b/Jellyfin.Data/Entities/AncestorId.cs @@ -3,7 +3,7 @@ using System; namespace Jellyfin.Data.Entities; /// -/// Represents the relational informations for an . +/// Represents the relational information for an . /// public class AncestorId { diff --git a/Jellyfin.Data/Entities/AttachmentStreamInfo.cs b/Jellyfin.Data/Entities/AttachmentStreamInfo.cs index 77b627f37..19265a011 100644 --- a/Jellyfin.Data/Entities/AttachmentStreamInfo.cs +++ b/Jellyfin.Data/Entities/AttachmentStreamInfo.cs @@ -3,7 +3,7 @@ using System; namespace Jellyfin.Data.Entities; /// -/// Provides informations about an Attachment to an . +/// Provides information about an Attachment to an . /// public class AttachmentStreamInfo { @@ -18,7 +18,7 @@ public class AttachmentStreamInfo public required BaseItemEntity Item { get; set; } /// - /// Gets or Sets The index within the source file. + /// Gets or Sets the index within the source file. /// public required int Index { get; set; } diff --git a/Jellyfin.Data/Entities/ProgramAudioEntity.cs b/Jellyfin.Data/Entities/ProgramAudioEntity.cs index 5b225a002..9d79e5ddb 100644 --- a/Jellyfin.Data/Entities/ProgramAudioEntity.cs +++ b/Jellyfin.Data/Entities/ProgramAudioEntity.cs @@ -11,7 +11,7 @@ public enum ProgramAudioEntity Mono = 0, /// - /// Sterio. + /// Stereo. /// Stereo = 1, diff --git a/Jellyfin.Data/Entities/TrickplayInfo.cs b/Jellyfin.Data/Entities/TrickplayInfo.cs index 64e7da1b5..ff9a68bef 100644 --- a/Jellyfin.Data/Entities/TrickplayInfo.cs +++ b/Jellyfin.Data/Entities/TrickplayInfo.cs @@ -66,7 +66,7 @@ public class TrickplayInfo public int Interval { get; set; } /// - /// Gets or sets peak bandwith usage in bits per second. + /// Gets or sets peak bandwidth usage in bits per second. /// /// /// Required. diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs index 8516301a8..848f3c822 100644 --- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs +++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs @@ -258,7 +258,7 @@ public sealed class BaseItemRepository private IQueryable ApplyGroupingFilter(IQueryable dbQuery, InternalItemsQuery filter) { // This whole block is needed to filter duplicate entries on request - // for the time beeing it cannot be used because it would destroy the ordering + // for the time being it cannot be used because it would destroy the ordering // this results in "duplicate" responses for queries that try to lookup individual series or multiple versions but // for that case the invoker has to run a DistinctBy(e => e.PresentationUniqueKey) on their own @@ -889,7 +889,7 @@ public sealed class BaseItemRepository /// Will be thrown if an invalid serialisation is requested. public static BaseItemDto DeserialiseBaseItem(BaseItemEntity baseItemEntity, ILogger logger, IServerApplicationHost? appHost, bool skipDeserialization = false) { - var type = GetType(baseItemEntity.Type) ?? throw new InvalidOperationException("Cannot deserialise unkown type."); + var type = GetType(baseItemEntity.Type) ?? throw new InvalidOperationException("Cannot deserialise unknown type."); BaseItemDto? dto = null; if (TypeRequiresDeserialization(type) && baseItemEntity.Data is not null && !skipDeserialization) { @@ -905,7 +905,7 @@ public sealed class BaseItemRepository if (dto is null) { - dto = Activator.CreateInstance(type) as BaseItemDto ?? throw new InvalidOperationException("Cannot deserialise unkown type."); + dto = Activator.CreateInstance(type) as BaseItemDto ?? throw new InvalidOperationException("Cannot deserialise unknown type."); } return Map(baseItemEntity, dto, appHost); @@ -2065,7 +2065,7 @@ public sealed class BaseItemRepository if (filter.IncludeInheritedTags.Length > 0) { // Episodes do not store inherit tags from their parents in the database, and the tag may be still required by the client. - // In addtion to the tags for the episodes themselves, we need to manually query its parent (the season)'s tags as well. + // In addition to the tags for the episodes themselves, we need to manually query its parent (the season)'s tags as well. if (includeTypes.Length == 1 && includeTypes.FirstOrDefault() is BaseItemKind.Episode) { baseQuery = baseQuery diff --git a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs index 2d3a25357..59ec418ce 100644 --- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs +++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs @@ -22,7 +22,7 @@ using Microsoft.Extensions.Logging; namespace Jellyfin.Server.Implementations.MediaSegments; /// -/// Manages media segments retrival and storage. +/// Manages media segments retrieval and storage. /// public class MediaSegmentManager : IMediaSegmentManager { diff --git a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs index cd73d67c3..dfc63b63f 100644 --- a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs +++ b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs @@ -46,7 +46,7 @@ public class TrickplayManager : ITrickplayManager /// /// The logger. /// The media encoder. - /// The file systen. + /// The file system. /// The encoding helper. /// The library manager. /// The server configuration manager. diff --git a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs index d0360a56d..632ff9307 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs @@ -321,7 +321,7 @@ public class MigrateLibraryDb : IMigrationRoutine if (dbContext.Database.IsSqlite()) { - _logger.LogInformation("Vaccum and Optimise jellyfin.db now."); + _logger.LogInformation("Vacuum and Optimise jellyfin.db now."); dbContext.Database.ExecuteSqlRaw("PRAGMA optimize"); dbContext.Database.ExecuteSqlRaw("VACUUM"); _logger.LogInformation("jellyfin.db optimized successfully!"); -- cgit v1.2.3