The Free Software Media System - Server Backend & API
Remove ExtraIds column and use OwnerId relationship for extras
Shadowghostc350fd0f40d9
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.csindex 9e7af1d059..110b6b5faf 100644--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs@@ -881,7 +881,6 @@ public sealed class BaseItemRepositorydto.Audio = (ProgramAudio)entity.Audio;}- dto.ExtraIds = string.IsNullOrWhiteSpace(entity.ExtraIds) ? [] : entity.ExtraIds.Split('|').Select(e => Guid.Parse(e)).ToArray();dto.ProductionLocations = entity.ProductionLocations?.Split('|', StringSplitOptions.RemoveEmptyEntries) ?? [];dto.Studios = entity.Studios?.Split('|') ?? [];dto.Tags = string.IsNullOrWhiteSpace(entity.Tags) ? [] : entity.Tags.Split('|');@@ -1043,7 +1042,6 @@ public sealed class BaseItemRepositoryentity.ExtraType = (BaseItemExtraType)dto.ExtraType;}- entity.ExtraIds = dto.ExtraIds is not null ? string.Join('|', dto.ExtraIds) : null;entity.ProductionLocations = dto.ProductionLocations is not null ? string.Join('|', dto.ProductionLocations.Where(p => !string.IsNullOrWhiteSpace(p))) : null;entity.Studios = dto.Studios is not null ? string.Join('|', dto.Studios) : null;entity.Tags = dto.Tags is not null ? string.Join('|', dto.Tags) : null;@@ -2310,6 +2308,17 @@ public sealed class BaseItemRepository}}+ if (filter.OwnerIds.Length > 0)+ {+ baseQuery = baseQuery.Where(e => e.OwnerId != null && filter.OwnerIds.Contains(e.OwnerId.Value));+ }++ if (filter.ExtraTypes.Length > 0)+ {+ var extraTypeValues = filter.ExtraTypes.Cast<BaseItemExtraType?>().ToArray();+ baseQuery = baseQuery.Where(e => e.ExtraType != null && extraTypeValues.Contains(e.ExtraType));+ }+if (!string.IsNullOrWhiteSpace(filter.HasNoAudioTrackWithLanguage)){baseQuery = baseQuery@@ -2585,12 +2594,12 @@ public sealed class BaseItemRepositoryif (filter.HasSpecialFeature.Value){baseQuery = baseQuery- .Where(e => e.ExtraIds != null);+ .Where(e => e.Extras != null && e.Extras.Count > 0);}else{baseQuery = baseQuery- .Where(e => e.ExtraIds == null);+ .Where(e => e.Extras == null || e.Extras.Count == 0);}}@@ -2599,12 +2608,12 @@ public sealed class BaseItemRepositoryif (filter.HasTrailer.GetValueOrDefault() || filter.HasThemeSong.GetValueOrDefault() || filter.HasThemeVideo.GetValueOrDefault()){baseQuery = baseQuery- .Where(e => e.ExtraIds != null);+ .Where(e => e.Extras != null && e.Extras.Count > 0);}else{baseQuery = baseQuery- .Where(e => e.ExtraIds == null);+ .Where(e => e.Extras == null || e.Extras.Count == 0);}}diff --git a/Jellyfin.Server/Migrations/Routines/CleanupOrphanedExtras.cs b/Jellyfin.Server/Migrations/Routines/CleanupOrphanedExtras.csnew file mode 100644index 0000000000..ffde30f0ca--- /dev/null+++ b/Jellyfin.Server/Migrations/Routines/CleanupOrphanedExtras.cs@@ -0,0 +1,119 @@+using System;+using System.Linq;+using System.Threading;+using System.Threading.Tasks;+using Jellyfin.Database.Implementations;+using Jellyfin.Server.Migrations.Stages;+using Jellyfin.Server.ServerSetupApp;+using MediaBrowser.Controller.Channels;+using MediaBrowser.Controller.Configuration;+using MediaBrowser.Controller.Entities;+using MediaBrowser.Controller.Library;+using MediaBrowser.Controller.LiveTv;+using MediaBrowser.Controller.MediaSegments;+using MediaBrowser.Controller.Persistence;+using Microsoft.EntityFrameworkCore;+using Microsoft.Extensions.Logging;++namespace Jellyfin.Server.Migrations.Routines;++/// <summary>+/// Removes orphaned extras (items with OwnerId pointing to non-existent items).+/// Must run before EF migrations that add FK constraints on OwnerId.+/// </summary>+[JellyfinMigration("2026-01-13T23:00:00", nameof(CleanupOrphanedExtras), Stage = JellyfinMigrationStageTypes.CoreInitialisation)]+[JellyfinMigrationBackup(JellyfinDb = true)]+public class CleanupOrphanedExtras : IAsyncMigrationRoutine+{+ private readonly IStartupLogger<CleanupOrphanedExtras> _logger;+ private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;+ private readonly ILibraryManager _libraryManager;++ /// <summary>+ /// Initializes a new instance of the <see cref="CleanupOrphanedExtras"/> class.+ /// </summary>+ /// <param name="logger">The startup logger.</param>+ /// <param name="dbContextFactory">The database context factory.</param>+ /// <param name="libraryManager">The library manager.</param>+ /// <param name="itemRepository">The item repository.</param>+ /// <param name="channelManager">The channel manager.</param>+ /// <param name="recordingsManager">The recordings manager.</param>+ /// <param name="mediaSourceManager">The media source manager.</param>+ /// <param name="mediaSegmentManager">The media segments manager.</param>+ /// <param name="configurationManager">The configuration manager.</param>+ public CleanupOrphanedExtras(+ IStartupLogger<CleanupOrphanedExtras> logger,+ IDbContextFactory<JellyfinDbContext> dbContextFactory,+ ILibraryManager libraryManager,+ IItemRepository itemRepository,+ IChannelManager channelManager,+ IRecordingsManager recordingsManager,+ IMediaSourceManager mediaSourceManager,+ IMediaSegmentManager mediaSegmentManager,+ IServerConfigurationManager configurationManager)+ {+ _logger = logger;+ _dbContextFactory = dbContextFactory;+ _libraryManager = libraryManager;+ BaseItem.LibraryManager ??= libraryManager;+ BaseItem.ItemRepository ??= itemRepository;+ BaseItem.ChannelManager ??= channelManager;+ BaseItem.MediaSourceManager ??= mediaSourceManager;+ BaseItem.MediaSegmentManager ??= mediaSegmentManager;+ BaseItem.ConfigurationManager ??= configurationManager;+ Video.RecordingsManager ??= recordingsManager;+ }++ /// <inheritdoc/>+ public async Task PerformAsync(CancellationToken cancellationToken)+ {+ var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);+ await using (context.ConfigureAwait(false))+ {+ var orphanedItemIds = await context.BaseItems+ .Where(b => b.OwnerId.HasValue && !b.OwnerId.Value.Equals(Guid.Empty))+ .Where(b => !context.BaseItems.Any(parent => parent.Id.Equals(b.OwnerId!.Value)))+ .Select(b => b.Id)+ .ToListAsync(cancellationToken)+ .ConfigureAwait(false);++ if (orphanedItemIds.Count == 0)+ {+ _logger.LogInformation("No orphaned extras found, skipping migration.");+ return;+ }++ _logger.LogInformation("Found {Count} orphaned extras to remove", orphanedItemIds.Count);++ var deleteOptions = new DeleteOptions+ {+ DeleteFileLocation = false // Extras don't have their own media files+ };++ var deletedCount = 0;+ foreach (var itemId in orphanedItemIds)+ {+ cancellationToken.ThrowIfCancellationRequested();++ var item = _libraryManager.GetItemById(itemId);+ if (item is null)+ {+ _logger.LogDebug("Item {ItemId} not found in library, may have been already deleted", itemId);+ continue;+ }++ try+ {+ _libraryManager.DeleteItem(item, deleteOptions, notifyParentItem: false);+ deletedCount++;+ }+ catch (Exception ex)+ {+ _logger.LogWarning(ex, "Failed to delete orphaned item {ItemId} ({ItemName})", item.Id, item.Name);+ }+ }++ _logger.LogInformation("Successfully removed {Count} orphaned extras", deletedCount);+ }+ }+}diff --git a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.csindex 3150f70baa..2c96f00761 100644--- a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs+++ b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs@@ -1176,10 +1176,8 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutineentity.ProductionLocations = productionLocations;}- if (reader.TryGetString(index++, out var extraIds))- {- entity.ExtraIds = extraIds;- }+ // Skip ExtraIds column (removed - extras are now tracked via OwnerId relationship)+ index++;if (reader.TryGetInt32(index++, out var totalBitrate)){diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.csindex 498b7d19e4..eb7daeb532 100644--- a/MediaBrowser.Controller/Entities/BaseItem.cs+++ b/MediaBrowser.Controller/Entities/BaseItem.cs@@ -107,7 +107,6 @@ namespace MediaBrowser.Controller.EntitiesImageInfos = Array.Empty<ItemImageInfo>();ProductionLocations = Array.Empty<string>();RemoteTrailers = Array.Empty<MediaUrl>();- ExtraIds = Array.Empty<Guid>();UserData = [];}@@ -398,8 +397,6 @@ namespace MediaBrowser.Controller.Entitiespublic int Height { get; set; }- public Guid[] ExtraIds { get; set; }-/// <summary>/// Gets the primary image path./// </summary>@@ -1396,7 +1393,13 @@ namespace MediaBrowser.Controller.Entities{var extras = LibraryManager.FindExtras(item, fileSystemChildren, options.DirectoryService).ToArray();var newExtraIds = Array.ConvertAll(extras, x => x.Id);- var extrasChanged = !item.ExtraIds.SequenceEqual(newExtraIds);++ var currentExtraIds = LibraryManager.GetItemList(new InternalItemsQuery()+ {+ OwnerIds = [item.Id]+ }).Select(e => e.Id).ToArray();++ var extrasChanged = !currentExtraIds.OrderBy(x => x).SequenceEqual(newExtraIds.OrderBy(x => x));if (!extrasChanged && !options.ReplaceAllMetadata && options.MetadataRefreshMode != MetadataRefreshMode.FullRefresh){@@ -1418,8 +1421,7 @@ namespace MediaBrowser.Controller.Entitiesreturn RefreshMetadataForOwnedItem(i, true, subOptions, cancellationToken);});- // Cleanup removed extras- var removedExtraIds = item.ExtraIds.Where(e => !newExtraIds.Contains(e)).ToArray();+ var removedExtraIds = currentExtraIds.Where(e => !newExtraIds.Contains(e)).ToArray();if (removedExtraIds.Length > 0){var removedExtras = LibraryManager.GetItemList(new InternalItemsQuery()@@ -1437,8 +1439,6 @@ namespace MediaBrowser.Controller.Entitiesawait Task.WhenAll(tasks).ConfigureAwait(false);- item.ExtraIds = newExtraIds;-return true;}@@ -2668,10 +2668,11 @@ namespace MediaBrowser.Controller.Entities/// <returns>An enumerable containing the items.</returns>public IEnumerable<BaseItem> GetExtras(){- return ExtraIds- .Select(LibraryManager.GetItemById)- .Where(i => i is not null)- .OrderBy(i => i.SortName);+ return LibraryManager.GetItemList(new InternalItemsQuery()+ {+ OwnerIds = [Id],+ OrderBy = [(ItemSortBy.SortName, SortOrder.Ascending)]+ });}/// <summary>@@ -2681,11 +2682,12 @@ namespace MediaBrowser.Controller.Entities/// <returns>An enumerable containing the extras.</returns>public IEnumerable<BaseItem> GetExtras(IReadOnlyCollection<ExtraType> extraTypes){- return ExtraIds- .Select(LibraryManager.GetItemById)- .Where(i => i is not null)- .Where(i => i.ExtraType.HasValue && extraTypes.Contains(i.ExtraType.Value))- .OrderBy(i => i.SortName);+ return LibraryManager.GetItemList(new InternalItemsQuery()+ {+ OwnerIds = [Id],+ ExtraTypes = extraTypes.ToArray(),+ OrderBy = [(ItemSortBy.SortName, SortOrder.Ascending)]+ });}public virtual long GetRunTimeTicksForPlayState()diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.csindex 076a592922..24fe3bb32d 100644--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs@@ -39,6 +39,8 @@ namespace MediaBrowser.Controller.EntitiesImageTypes = Array.Empty<ImageType>();IncludeItemTypes = Array.Empty<BaseItemKind>();ItemIds = Array.Empty<Guid>();+ OwnerIds = Array.Empty<Guid>();+ ExtraTypes = Array.Empty<ExtraType>();MediaTypes = Array.Empty<MediaType>();OfficialRatings = Array.Empty<string>();OrderBy = Array.Empty<(ItemSortBy, SortOrder)>();@@ -133,6 +135,10 @@ namespace MediaBrowser.Controller.Entitiespublic Guid[] ItemIds { get; set; }+ public Guid[] OwnerIds { get; set; }++ public ExtraType[] ExtraTypes { get; set; }+public Guid[] ExcludeItemIds { get; set; }public Guid? AdjacentTo { get; set; }diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemEntity.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemEntity.csindex c51f331366..ff25765363 100644--- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemEntity.cs+++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/Entities/BaseItemEntity.cs@@ -118,8 +118,6 @@ public class BaseItemEntitypublic string? ProductionLocations { get; set; }- public string? ExtraIds { get; set; }-public int? TotalBitrate { get; set; }public BaseItemExtraType? ExtraType { get; set; }diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20260113233500_DropExtraIdsColumn.Designer.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20260113233500_DropExtraIdsColumn.Designer.csnew file mode 100644index 0000000000..92ed0cf6bf--- /dev/null+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20260113233500_DropExtraIdsColumn.Designer.cs@@ -0,0 +1,1793 @@+// <auto-generated />+using System;+using Jellyfin.Database.Implementations;+using Microsoft.EntityFrameworkCore;+using Microsoft.EntityFrameworkCore.Infrastructure;+using Microsoft.EntityFrameworkCore.Migrations;+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;++#nullable disable++namespace Jellyfin.Database.Providers.Sqlite.Migrations+{+ [DbContext(typeof(JellyfinDbContext))]+ [Migration("20260113233500_DropExtraIdsColumn")]+ partial class DropExtraIdsColumn+ {+ /// <inheritdoc />+ protected override void BuildTargetModel(ModelBuilder modelBuilder)+ {+#pragma warning disable 612, 618+ modelBuilder.HasAnnotation("ProductVersion", "10.0.2");++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.AccessSchedule", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<int>("DayOfWeek")+ .HasColumnType("INTEGER");++ b.Property<double>("EndHour")+ .HasColumnType("REAL");++ b.Property<double>("StartHour")+ .HasColumnType("REAL");++ b.Property<Guid>("UserId")+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("UserId");++ b.ToTable("AccessSchedules");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.ActivityLog", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<DateTime>("DateCreated")+ .HasColumnType("TEXT");++ b.Property<string>("ItemId")+ .HasMaxLength(256)+ .HasColumnType("TEXT");++ b.Property<int>("LogSeverity")+ .HasColumnType("INTEGER");++ b.Property<string>("Name")+ .IsRequired()+ .HasMaxLength(512)+ .HasColumnType("TEXT");++ b.Property<string>("Overview")+ .HasMaxLength(512)+ .HasColumnType("TEXT");++ b.Property<uint>("RowVersion")+ .IsConcurrencyToken()+ .HasColumnType("INTEGER");++ b.Property<string>("ShortOverview")+ .HasMaxLength(512)+ .HasColumnType("TEXT");++ b.Property<string>("Type")+ .IsRequired()+ .HasMaxLength(256)+ .HasColumnType("TEXT");++ b.Property<Guid>("UserId")+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("DateCreated");++ b.ToTable("ActivityLogs");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.AncestorId", b =>+ {+ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<Guid>("ParentItemId")+ .HasColumnType("TEXT");++ b.HasKey("ItemId", "ParentItemId");++ b.HasIndex("ParentItemId");++ b.ToTable("AncestorIds");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.AttachmentStreamInfo", b =>+ {+ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<int>("Index")+ .HasColumnType("INTEGER");++ b.Property<string>("Codec")+ .HasColumnType("TEXT");++ b.Property<string>("CodecTag")+ .HasColumnType("TEXT");++ b.Property<string>("Comment")+ .HasColumnType("TEXT");++ b.Property<string>("Filename")+ .HasColumnType("TEXT");++ b.Property<string>("MimeType")+ .HasColumnType("TEXT");++ b.HasKey("ItemId", "Index");++ b.ToTable("AttachmentStreamInfos");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemEntity", b =>+ {+ b.Property<Guid>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("TEXT");++ b.Property<string>("Album")+ .HasColumnType("TEXT");++ b.Property<string>("AlbumArtists")+ .HasColumnType("TEXT");++ b.Property<string>("Artists")+ .HasColumnType("TEXT");++ b.Property<int?>("Audio")+ .HasColumnType("INTEGER");++ b.Property<Guid?>("ChannelId")+ .HasColumnType("TEXT");++ b.Property<string>("CleanName")+ .HasColumnType("TEXT");++ b.Property<float?>("CommunityRating")+ .HasColumnType("REAL");++ b.Property<float?>("CriticRating")+ .HasColumnType("REAL");++ b.Property<string>("CustomRating")+ .HasColumnType("TEXT");++ b.Property<string>("Data")+ .HasColumnType("TEXT");++ b.Property<DateTime?>("DateCreated")+ .HasColumnType("TEXT");++ b.Property<DateTime?>("DateLastMediaAdded")+ .HasColumnType("TEXT");++ b.Property<DateTime?>("DateLastRefreshed")+ .HasColumnType("TEXT");++ b.Property<DateTime?>("DateLastSaved")+ .HasColumnType("TEXT");++ b.Property<DateTime?>("DateModified")+ .HasColumnType("TEXT");++ b.Property<DateTime?>("EndDate")+ .HasColumnType("TEXT");++ b.Property<string>("EpisodeTitle")+ .HasColumnType("TEXT");++ b.Property<string>("ExternalId")+ .HasColumnType("TEXT");++ b.Property<string>("ExternalSeriesId")+ .HasColumnType("TEXT");++ b.Property<string>("ExternalServiceId")+ .HasColumnType("TEXT");++ b.Property<int?>("ExtraType")+ .HasColumnType("INTEGER");++ b.Property<string>("ForcedSortName")+ .HasColumnType("TEXT");++ b.Property<string>("Genres")+ .HasColumnType("TEXT");++ b.Property<int?>("Height")+ .HasColumnType("INTEGER");++ b.Property<int?>("IndexNumber")+ .HasColumnType("INTEGER");++ b.Property<int?>("InheritedParentalRatingSubValue")+ .HasColumnType("INTEGER");++ b.Property<int?>("InheritedParentalRatingValue")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsFolder")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsInMixedFolder")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsLocked")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsMovie")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsRepeat")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsSeries")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsVirtualItem")+ .HasColumnType("INTEGER");++ b.Property<float?>("LUFS")+ .HasColumnType("REAL");++ b.Property<string>("MediaType")+ .HasColumnType("TEXT");++ b.Property<string>("Name")+ .HasColumnType("TEXT");++ b.Property<float?>("NormalizationGain")+ .HasColumnType("REAL");++ b.Property<string>("OfficialRating")+ .HasColumnType("TEXT");++ b.Property<string>("OriginalTitle")+ .HasColumnType("TEXT");++ b.Property<string>("Overview")+ .HasColumnType("TEXT");++ b.Property<Guid?>("OwnerId")+ .HasColumnType("TEXT");++ b.Property<Guid?>("ParentId")+ .HasColumnType("TEXT");++ b.Property<int?>("ParentIndexNumber")+ .HasColumnType("INTEGER");++ b.Property<string>("Path")+ .HasColumnType("TEXT");++ b.Property<string>("PreferredMetadataCountryCode")+ .HasColumnType("TEXT");++ b.Property<string>("PreferredMetadataLanguage")+ .HasColumnType("TEXT");++ b.Property<DateTime?>("PremiereDate")+ .HasColumnType("TEXT");++ b.Property<string>("PresentationUniqueKey")+ .HasColumnType("TEXT");++ b.Property<string>("PrimaryVersionId")+ .HasColumnType("TEXT");++ b.Property<string>("ProductionLocations")+ .HasColumnType("TEXT");++ b.Property<int?>("ProductionYear")+ .HasColumnType("INTEGER");++ b.Property<long?>("RunTimeTicks")+ .HasColumnType("INTEGER");++ b.Property<Guid?>("SeasonId")+ .HasColumnType("TEXT");++ b.Property<string>("SeasonName")+ .HasColumnType("TEXT");++ b.Property<Guid?>("SeriesId")+ .HasColumnType("TEXT");++ b.Property<string>("SeriesName")+ .HasColumnType("TEXT");++ b.Property<string>("SeriesPresentationUniqueKey")+ .HasColumnType("TEXT");++ b.Property<string>("ShowId")+ .HasColumnType("TEXT");++ b.Property<long?>("Size")+ .HasColumnType("INTEGER");++ b.Property<string>("SortName")+ .HasColumnType("TEXT");++ b.Property<DateTime?>("StartDate")+ .HasColumnType("TEXT");++ b.Property<string>("Studios")+ .HasColumnType("TEXT");++ b.Property<string>("Tagline")+ .HasColumnType("TEXT");++ b.Property<string>("Tags")+ .HasColumnType("TEXT");++ b.Property<Guid?>("TopParentId")+ .HasColumnType("TEXT");++ b.Property<int?>("TotalBitrate")+ .HasColumnType("INTEGER");++ b.Property<string>("Type")+ .IsRequired()+ .HasColumnType("TEXT");++ b.Property<string>("UnratedType")+ .HasColumnType("TEXT");++ b.Property<int?>("Width")+ .HasColumnType("INTEGER");++ b.HasKey("Id");++ b.HasIndex("ExtraType");++ b.HasIndex("OwnerId");++ b.HasIndex("ParentId");++ b.HasIndex("Path");++ b.HasIndex("PresentationUniqueKey");++ b.HasIndex("ExtraType", "OwnerId");++ b.HasIndex("TopParentId", "Id");++ b.HasIndex("Type", "TopParentId", "Id");++ b.HasIndex("Type", "TopParentId", "PresentationUniqueKey");++ b.HasIndex("Type", "TopParentId", "StartDate");++ b.HasIndex("Id", "Type", "IsFolder", "IsVirtualItem");++ b.HasIndex("MediaType", "TopParentId", "IsVirtualItem", "PresentationUniqueKey");++ b.HasIndex("TopParentId", "IsFolder", "IsVirtualItem", "DateCreated");++ b.HasIndex("TopParentId", "MediaType", "IsVirtualItem", "DateCreated");++ b.HasIndex("TopParentId", "Type", "IsVirtualItem", "DateCreated");++ b.HasIndex("Type", "SeriesPresentationUniqueKey", "IsFolder", "IsVirtualItem");++ b.HasIndex("Type", "SeriesPresentationUniqueKey", "PresentationUniqueKey", "SortName");++ b.HasIndex("IsFolder", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");++ b.HasIndex("Type", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");++ b.ToTable("BaseItems");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);++ b.HasData(+ new+ {+ Id = new Guid("00000000-0000-0000-0000-000000000001"),+ IsFolder = false,+ IsInMixedFolder = false,+ IsLocked = false,+ IsMovie = false,+ IsRepeat = false,+ IsSeries = false,+ IsVirtualItem = false,+ Name = "This is a placeholder item for UserData that has been detached from its original item",+ Type = "PLACEHOLDER"+ });+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemImageInfo", b =>+ {+ b.Property<Guid>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("TEXT");++ b.Property<byte[]>("Blurhash")+ .HasColumnType("BLOB");++ b.Property<DateTime?>("DateModified")+ .HasColumnType("TEXT");++ b.Property<int>("Height")+ .HasColumnType("INTEGER");++ b.Property<int>("ImageType")+ .HasColumnType("INTEGER");++ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<string>("Path")+ .IsRequired()+ .HasColumnType("TEXT");++ b.Property<int>("Width")+ .HasColumnType("INTEGER");++ b.HasKey("Id");++ b.HasIndex("ItemId");++ b.ToTable("BaseItemImageInfos");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemMetadataField", b =>+ {+ b.Property<int>("Id")+ .HasColumnType("INTEGER");++ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.HasKey("Id", "ItemId");++ b.HasIndex("ItemId");++ b.ToTable("BaseItemMetadataFields");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemProvider", b =>+ {+ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<string>("ProviderId")+ .HasColumnType("TEXT");++ b.Property<string>("ProviderValue")+ .IsRequired()+ .HasColumnType("TEXT");++ b.HasKey("ItemId", "ProviderId");++ b.HasIndex("ProviderId", "ProviderValue", "ItemId");++ b.ToTable("BaseItemProviders");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemTrailerType", b =>+ {+ b.Property<int>("Id")+ .HasColumnType("INTEGER");++ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.HasKey("Id", "ItemId");++ b.HasIndex("ItemId");++ b.ToTable("BaseItemTrailerTypes");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Chapter", b =>+ {+ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<int>("ChapterIndex")+ .HasColumnType("INTEGER");++ b.Property<DateTime?>("ImageDateModified")+ .HasColumnType("TEXT");++ b.Property<string>("ImagePath")+ .HasColumnType("TEXT");++ b.Property<string>("Name")+ .HasColumnType("TEXT");++ b.Property<long>("StartPositionTicks")+ .HasColumnType("INTEGER");++ b.HasKey("ItemId", "ChapterIndex");++ b.ToTable("Chapters");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.CustomItemDisplayPreferences", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<string>("Client")+ .IsRequired()+ .HasMaxLength(32)+ .HasColumnType("TEXT");++ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<string>("Key")+ .IsRequired()+ .HasColumnType("TEXT");++ b.Property<Guid>("UserId")+ .HasColumnType("TEXT");++ b.Property<string>("Value")+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("UserId", "ItemId", "Client", "Key")+ .IsUnique();++ b.ToTable("CustomItemDisplayPreferences");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.DisplayPreferences", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<int>("ChromecastVersion")+ .HasColumnType("INTEGER");++ b.Property<string>("Client")+ .IsRequired()+ .HasMaxLength(32)+ .HasColumnType("TEXT");++ b.Property<string>("DashboardTheme")+ .HasMaxLength(32)+ .HasColumnType("TEXT");++ b.Property<bool>("EnableNextVideoInfoOverlay")+ .HasColumnType("INTEGER");++ b.Property<int?>("IndexBy")+ .HasColumnType("INTEGER");++ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<int>("ScrollDirection")+ .HasColumnType("INTEGER");++ b.Property<bool>("ShowBackdrop")+ .HasColumnType("INTEGER");++ b.Property<bool>("ShowSidebar")+ .HasColumnType("INTEGER");++ b.Property<int>("SkipBackwardLength")+ .HasColumnType("INTEGER");++ b.Property<int>("SkipForwardLength")+ .HasColumnType("INTEGER");++ b.Property<string>("TvHome")+ .HasMaxLength(32)+ .HasColumnType("TEXT");++ b.Property<Guid>("UserId")+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("UserId", "ItemId", "Client")+ .IsUnique();++ b.ToTable("DisplayPreferences");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.HomeSection", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<int>("DisplayPreferencesId")+ .HasColumnType("INTEGER");++ b.Property<int>("Order")+ .HasColumnType("INTEGER");++ b.Property<int>("Type")+ .HasColumnType("INTEGER");++ b.HasKey("Id");++ b.HasIndex("DisplayPreferencesId");++ b.ToTable("HomeSection");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.ImageInfo", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<DateTime>("LastModified")+ .HasColumnType("TEXT");++ b.Property<string>("Path")+ .IsRequired()+ .HasMaxLength(512)+ .HasColumnType("TEXT");++ b.Property<Guid?>("UserId")+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("UserId")+ .IsUnique();++ b.ToTable("ImageInfos");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.ItemDisplayPreferences", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<string>("Client")+ .IsRequired()+ .HasMaxLength(32)+ .HasColumnType("TEXT");++ b.Property<int?>("IndexBy")+ .HasColumnType("INTEGER");++ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<bool>("RememberIndexing")+ .HasColumnType("INTEGER");++ b.Property<bool>("RememberSorting")+ .HasColumnType("INTEGER");++ b.Property<string>("SortBy")+ .IsRequired()+ .HasMaxLength(64)+ .HasColumnType("TEXT");++ b.Property<int>("SortOrder")+ .HasColumnType("INTEGER");++ b.Property<Guid>("UserId")+ .HasColumnType("TEXT");++ b.Property<int>("ViewType")+ .HasColumnType("INTEGER");++ b.HasKey("Id");++ b.HasIndex("UserId");++ b.ToTable("ItemDisplayPreferences");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.ItemValue", b =>+ {+ b.Property<Guid>("ItemValueId")+ .ValueGeneratedOnAdd()+ .HasColumnType("TEXT");++ b.Property<string>("CleanValue")+ .IsRequired()+ .HasColumnType("TEXT");++ b.Property<int>("Type")+ .HasColumnType("INTEGER");++ b.Property<string>("Value")+ .IsRequired()+ .HasColumnType("TEXT");++ b.HasKey("ItemValueId");++ b.HasIndex("Type", "CleanValue");++ b.HasIndex("Type", "Value")+ .IsUnique();++ b.ToTable("ItemValues");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.ItemValueMap", b =>+ {+ b.Property<Guid>("ItemValueId")+ .HasColumnType("TEXT");++ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.HasKey("ItemValueId", "ItemId");++ b.HasIndex("ItemId");++ b.ToTable("ItemValuesMap");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.KeyframeData", b =>+ {+ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.PrimitiveCollection<string>("KeyframeTicks")+ .HasColumnType("TEXT");++ b.Property<long>("TotalDuration")+ .HasColumnType("INTEGER");++ b.HasKey("ItemId");++ b.ToTable("KeyframeData");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.LinkedChildEntity", b =>+ {+ b.Property<Guid>("ParentId")+ .HasColumnType("TEXT");++ b.Property<Guid>("ChildId")+ .HasColumnType("TEXT");++ b.Property<int>("ChildType")+ .HasColumnType("INTEGER");++ b.Property<int?>("SortOrder")+ .HasColumnType("INTEGER");++ b.HasKey("ParentId", "ChildId");++ b.HasIndex("ChildId");++ b.HasIndex("ParentId");++ b.HasIndex("ChildId", "ChildType");++ b.HasIndex("ParentId", "ChildType");++ b.HasIndex("ParentId", "SortOrder");++ b.ToTable("LinkedChildren", (string)null);++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.MediaSegment", b =>+ {+ b.Property<Guid>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("TEXT");++ b.Property<long>("EndTicks")+ .HasColumnType("INTEGER");++ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<string>("SegmentProviderId")+ .IsRequired()+ .HasColumnType("TEXT");++ b.Property<long>("StartTicks")+ .HasColumnType("INTEGER");++ b.Property<int>("Type")+ .HasColumnType("INTEGER");++ b.HasKey("Id");++ b.ToTable("MediaSegments");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.MediaStreamInfo", b =>+ {+ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<int>("StreamIndex")+ .HasColumnType("INTEGER");++ b.Property<string>("AspectRatio")+ .HasColumnType("TEXT");++ b.Property<float?>("AverageFrameRate")+ .HasColumnType("REAL");++ b.Property<int?>("BitDepth")+ .HasColumnType("INTEGER");++ b.Property<int?>("BitRate")+ .HasColumnType("INTEGER");++ b.Property<int?>("BlPresentFlag")+ .HasColumnType("INTEGER");++ b.Property<string>("ChannelLayout")+ .HasColumnType("TEXT");++ b.Property<int?>("Channels")+ .HasColumnType("INTEGER");++ b.Property<string>("Codec")+ .HasColumnType("TEXT");++ b.Property<string>("CodecTag")+ .HasColumnType("TEXT");++ b.Property<string>("CodecTimeBase")+ .HasColumnType("TEXT");++ b.Property<string>("ColorPrimaries")+ .HasColumnType("TEXT");++ b.Property<string>("ColorSpace")+ .HasColumnType("TEXT");++ b.Property<string>("ColorTransfer")+ .HasColumnType("TEXT");++ b.Property<string>("Comment")+ .HasColumnType("TEXT");++ b.Property<int?>("DvBlSignalCompatibilityId")+ .HasColumnType("INTEGER");++ b.Property<int?>("DvLevel")+ .HasColumnType("INTEGER");++ b.Property<int?>("DvProfile")+ .HasColumnType("INTEGER");++ b.Property<int?>("DvVersionMajor")+ .HasColumnType("INTEGER");++ b.Property<int?>("DvVersionMinor")+ .HasColumnType("INTEGER");++ b.Property<int?>("ElPresentFlag")+ .HasColumnType("INTEGER");++ b.Property<bool?>("Hdr10PlusPresentFlag")+ .HasColumnType("INTEGER");++ b.Property<int?>("Height")+ .HasColumnType("INTEGER");++ b.Property<bool?>("IsAnamorphic")+ .HasColumnType("INTEGER");++ b.Property<bool?>("IsAvc")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsDefault")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsExternal")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsForced")+ .HasColumnType("INTEGER");++ b.Property<bool?>("IsHearingImpaired")+ .HasColumnType("INTEGER");++ b.Property<bool?>("IsInterlaced")+ .HasColumnType("INTEGER");++ b.Property<string>("KeyFrames")+ .HasColumnType("TEXT");++ b.Property<string>("Language")+ .HasColumnType("TEXT");++ b.Property<float?>("Level")+ .HasColumnType("REAL");++ b.Property<string>("NalLengthSize")+ .HasColumnType("TEXT");++ b.Property<string>("Path")+ .HasColumnType("TEXT");++ b.Property<string>("PixelFormat")+ .HasColumnType("TEXT");++ b.Property<string>("Profile")+ .HasColumnType("TEXT");++ b.Property<float?>("RealFrameRate")+ .HasColumnType("REAL");++ b.Property<int?>("RefFrames")+ .HasColumnType("INTEGER");++ b.Property<int?>("Rotation")+ .HasColumnType("INTEGER");++ b.Property<int?>("RpuPresentFlag")+ .HasColumnType("INTEGER");++ b.Property<int?>("SampleRate")+ .HasColumnType("INTEGER");++ b.Property<int>("StreamType")+ .HasColumnType("INTEGER");++ b.Property<string>("TimeBase")+ .HasColumnType("TEXT");++ b.Property<string>("Title")+ .HasColumnType("TEXT");++ b.Property<int?>("Width")+ .HasColumnType("INTEGER");++ b.HasKey("ItemId", "StreamIndex");++ b.HasIndex("StreamIndex");++ b.HasIndex("StreamType");++ b.HasIndex("StreamIndex", "StreamType");++ b.HasIndex("StreamIndex", "StreamType", "Language");++ b.ToTable("MediaStreamInfos");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.People", b =>+ {+ b.Property<Guid>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("TEXT");++ b.Property<string>("Name")+ .IsRequired()+ .HasColumnType("TEXT");++ b.Property<string>("PersonType")+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("Name");++ b.ToTable("Peoples");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.PeopleBaseItemMap", b =>+ {+ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<Guid>("PeopleId")+ .HasColumnType("TEXT");++ b.Property<string>("Role")+ .HasColumnType("TEXT");++ b.Property<int?>("ListOrder")+ .HasColumnType("INTEGER");++ b.Property<int?>("SortOrder")+ .HasColumnType("INTEGER");++ b.HasKey("ItemId", "PeopleId", "Role");++ b.HasIndex("PeopleId");++ b.HasIndex("ItemId", "ListOrder");++ b.HasIndex("ItemId", "SortOrder");++ b.ToTable("PeopleBaseItemMap");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Permission", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<int>("Kind")+ .HasColumnType("INTEGER");++ b.Property<Guid?>("Permission_Permissions_Guid")+ .HasColumnType("TEXT");++ b.Property<uint>("RowVersion")+ .IsConcurrencyToken()+ .HasColumnType("INTEGER");++ b.Property<Guid?>("UserId")+ .HasColumnType("TEXT");++ b.Property<bool>("Value")+ .HasColumnType("INTEGER");++ b.HasKey("Id");++ b.HasIndex("UserId", "Kind")+ .IsUnique()+ .HasFilter("[UserId] IS NOT NULL");++ b.ToTable("Permissions");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Preference", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<int>("Kind")+ .HasColumnType("INTEGER");++ b.Property<Guid?>("Preference_Preferences_Guid")+ .HasColumnType("TEXT");++ b.Property<uint>("RowVersion")+ .IsConcurrencyToken()+ .HasColumnType("INTEGER");++ b.Property<Guid?>("UserId")+ .HasColumnType("TEXT");++ b.Property<string>("Value")+ .IsRequired()+ .HasMaxLength(65535)+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("UserId", "Kind")+ .IsUnique()+ .HasFilter("[UserId] IS NOT NULL");++ b.ToTable("Preferences");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Security.ApiKey", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<string>("AccessToken")+ .IsRequired()+ .HasColumnType("TEXT");++ b.Property<DateTime>("DateCreated")+ .HasColumnType("TEXT");++ b.Property<DateTime>("DateLastActivity")+ .HasColumnType("TEXT");++ b.Property<string>("Name")+ .IsRequired()+ .HasMaxLength(64)+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("AccessToken")+ .IsUnique();++ b.ToTable("ApiKeys");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Security.Device", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<string>("AccessToken")+ .IsRequired()+ .HasColumnType("TEXT");++ b.Property<string>("AppName")+ .IsRequired()+ .HasMaxLength(64)+ .HasColumnType("TEXT");++ b.Property<string>("AppVersion")+ .IsRequired()+ .HasMaxLength(32)+ .HasColumnType("TEXT");++ b.Property<DateTime>("DateCreated")+ .HasColumnType("TEXT");++ b.Property<DateTime>("DateLastActivity")+ .HasColumnType("TEXT");++ b.Property<DateTime>("DateModified")+ .HasColumnType("TEXT");++ b.Property<string>("DeviceId")+ .IsRequired()+ .HasMaxLength(256)+ .HasColumnType("TEXT");++ b.Property<string>("DeviceName")+ .IsRequired()+ .HasMaxLength(64)+ .HasColumnType("TEXT");++ b.Property<bool>("IsActive")+ .HasColumnType("INTEGER");++ b.Property<Guid>("UserId")+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("DeviceId");++ b.HasIndex("AccessToken", "DateLastActivity");++ b.HasIndex("DeviceId", "DateLastActivity");++ b.HasIndex("UserId", "DeviceId");++ b.ToTable("Devices");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Security.DeviceOptions", b =>+ {+ b.Property<int>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("INTEGER");++ b.Property<string>("CustomName")+ .HasColumnType("TEXT");++ b.Property<string>("DeviceId")+ .IsRequired()+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("DeviceId")+ .IsUnique();++ b.ToTable("DeviceOptions");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.TrickplayInfo", b =>+ {+ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<int>("Width")+ .HasColumnType("INTEGER");++ b.Property<int>("Bandwidth")+ .HasColumnType("INTEGER");++ b.Property<int>("Height")+ .HasColumnType("INTEGER");++ b.Property<int>("Interval")+ .HasColumnType("INTEGER");++ b.Property<int>("ThumbnailCount")+ .HasColumnType("INTEGER");++ b.Property<int>("TileHeight")+ .HasColumnType("INTEGER");++ b.Property<int>("TileWidth")+ .HasColumnType("INTEGER");++ b.HasKey("ItemId", "Width");++ b.ToTable("TrickplayInfos");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.User", b =>+ {+ b.Property<Guid>("Id")+ .ValueGeneratedOnAdd()+ .HasColumnType("TEXT");++ b.Property<string>("AudioLanguagePreference")+ .HasMaxLength(255)+ .HasColumnType("TEXT");++ b.Property<string>("AuthenticationProviderId")+ .IsRequired()+ .HasMaxLength(255)+ .HasColumnType("TEXT");++ b.Property<string>("CastReceiverId")+ .HasMaxLength(32)+ .HasColumnType("TEXT");++ b.Property<bool>("DisplayCollectionsView")+ .HasColumnType("INTEGER");++ b.Property<bool>("DisplayMissingEpisodes")+ .HasColumnType("INTEGER");++ b.Property<bool>("EnableAutoLogin")+ .HasColumnType("INTEGER");++ b.Property<bool>("EnableLocalPassword")+ .HasColumnType("INTEGER");++ b.Property<bool>("EnableNextEpisodeAutoPlay")+ .HasColumnType("INTEGER");++ b.Property<bool>("EnableUserPreferenceAccess")+ .HasColumnType("INTEGER");++ b.Property<bool>("HidePlayedInLatest")+ .HasColumnType("INTEGER");++ b.Property<long>("InternalId")+ .HasColumnType("INTEGER");++ b.Property<int>("InvalidLoginAttemptCount")+ .HasColumnType("INTEGER");++ b.Property<DateTime?>("LastActivityDate")+ .HasColumnType("TEXT");++ b.Property<DateTime?>("LastLoginDate")+ .HasColumnType("TEXT");++ b.Property<int?>("LoginAttemptsBeforeLockout")+ .HasColumnType("INTEGER");++ b.Property<int>("MaxActiveSessions")+ .HasColumnType("INTEGER");++ b.Property<int?>("MaxParentalRatingScore")+ .HasColumnType("INTEGER");++ b.Property<int?>("MaxParentalRatingSubScore")+ .HasColumnType("INTEGER");++ b.Property<bool>("MustUpdatePassword")+ .HasColumnType("INTEGER");++ b.Property<string>("Password")+ .HasMaxLength(65535)+ .HasColumnType("TEXT");++ b.Property<string>("PasswordResetProviderId")+ .IsRequired()+ .HasMaxLength(255)+ .HasColumnType("TEXT");++ b.Property<bool>("PlayDefaultAudioTrack")+ .HasColumnType("INTEGER");++ b.Property<bool>("RememberAudioSelections")+ .HasColumnType("INTEGER");++ b.Property<bool>("RememberSubtitleSelections")+ .HasColumnType("INTEGER");++ b.Property<int?>("RemoteClientBitrateLimit")+ .HasColumnType("INTEGER");++ b.Property<uint>("RowVersion")+ .IsConcurrencyToken()+ .HasColumnType("INTEGER");++ b.Property<string>("SubtitleLanguagePreference")+ .HasMaxLength(255)+ .HasColumnType("TEXT");++ b.Property<int>("SubtitleMode")+ .HasColumnType("INTEGER");++ b.Property<int>("SyncPlayAccess")+ .HasColumnType("INTEGER");++ b.Property<string>("Username")+ .IsRequired()+ .HasMaxLength(255)+ .HasColumnType("TEXT");++ b.HasKey("Id");++ b.HasIndex("Username")+ .IsUnique();++ b.ToTable("Users");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.UserData", b =>+ {+ b.Property<Guid>("ItemId")+ .HasColumnType("TEXT");++ b.Property<Guid>("UserId")+ .HasColumnType("TEXT");++ b.Property<string>("CustomDataKey")+ .HasColumnType("TEXT");++ b.Property<int?>("AudioStreamIndex")+ .HasColumnType("INTEGER");++ b.Property<bool>("IsFavorite")+ .HasColumnType("INTEGER");++ b.Property<DateTime?>("LastPlayedDate")+ .HasColumnType("TEXT");++ b.Property<bool?>("Likes")+ .HasColumnType("INTEGER");++ b.Property<int>("PlayCount")+ .HasColumnType("INTEGER");++ b.Property<long>("PlaybackPositionTicks")+ .HasColumnType("INTEGER");++ b.Property<bool>("Played")+ .HasColumnType("INTEGER");++ b.Property<double?>("Rating")+ .HasColumnType("REAL");++ b.Property<DateTime?>("RetentionDate")+ .HasColumnType("TEXT");++ b.Property<int?>("SubtitleStreamIndex")+ .HasColumnType("INTEGER");++ b.HasKey("ItemId", "UserId", "CustomDataKey");++ b.HasIndex("UserId");++ b.HasIndex("ItemId", "UserId", "IsFavorite");++ b.HasIndex("ItemId", "UserId", "LastPlayedDate");++ b.HasIndex("ItemId", "UserId", "PlaybackPositionTicks");++ b.HasIndex("ItemId", "UserId", "Played");++ b.ToTable("UserData");++ b.HasAnnotation("Sqlite:UseSqlReturningClause", false);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.AccessSchedule", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.User", null)+ .WithMany("AccessSchedules")+ .HasForeignKey("UserId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.AncestorId", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("Parents")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "ParentItem")+ .WithMany("Children")+ .HasForeignKey("ParentItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");++ b.Navigation("ParentItem");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.AttachmentStreamInfo", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany()+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemEntity", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Owner")+ .WithMany("Extras")+ .HasForeignKey("OwnerId")+ .OnDelete(DeleteBehavior.NoAction);++ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "DirectParent")+ .WithMany("DirectChildren")+ .HasForeignKey("ParentId")+ .OnDelete(DeleteBehavior.Cascade);++ b.Navigation("DirectParent");++ b.Navigation("Owner");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemImageInfo", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("Images")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemMetadataField", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("LockedFields")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemProvider", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("Provider")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemTrailerType", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("TrailerTypes")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Chapter", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("Chapters")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.DisplayPreferences", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.User", null)+ .WithMany("DisplayPreferences")+ .HasForeignKey("UserId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.HomeSection", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.DisplayPreferences", null)+ .WithMany("HomeSections")+ .HasForeignKey("DisplayPreferencesId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.ImageInfo", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.User", null)+ .WithOne("ProfileImage")+ .HasForeignKey("Jellyfin.Database.Implementations.Entities.ImageInfo", "UserId")+ .OnDelete(DeleteBehavior.Cascade);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.ItemDisplayPreferences", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.User", null)+ .WithMany("ItemDisplayPreferences")+ .HasForeignKey("UserId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.ItemValueMap", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("ItemValues")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.HasOne("Jellyfin.Database.Implementations.Entities.ItemValue", "ItemValue")+ .WithMany("BaseItemsMap")+ .HasForeignKey("ItemValueId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");++ b.Navigation("ItemValue");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.KeyframeData", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany()+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.LinkedChildEntity", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Child")+ .WithMany("LinkedChildOfEntities")+ .HasForeignKey("ChildId")+ .OnDelete(DeleteBehavior.NoAction)+ .IsRequired();++ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Parent")+ .WithMany("LinkedChildEntities")+ .HasForeignKey("ParentId")+ .OnDelete(DeleteBehavior.NoAction)+ .IsRequired();++ b.Navigation("Child");++ b.Navigation("Parent");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.MediaStreamInfo", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("MediaStreams")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.PeopleBaseItemMap", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("Peoples")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.HasOne("Jellyfin.Database.Implementations.Entities.People", "People")+ .WithMany("BaseItems")+ .HasForeignKey("PeopleId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");++ b.Navigation("People");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Permission", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.User", null)+ .WithMany("Permissions")+ .HasForeignKey("UserId")+ .OnDelete(DeleteBehavior.Cascade);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Preference", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.User", null)+ .WithMany("Preferences")+ .HasForeignKey("UserId")+ .OnDelete(DeleteBehavior.Cascade);+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.Security.Device", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.User", "User")+ .WithMany()+ .HasForeignKey("UserId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("User");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.UserData", b =>+ {+ b.HasOne("Jellyfin.Database.Implementations.Entities.BaseItemEntity", "Item")+ .WithMany("UserData")+ .HasForeignKey("ItemId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.HasOne("Jellyfin.Database.Implementations.Entities.User", "User")+ .WithMany()+ .HasForeignKey("UserId")+ .OnDelete(DeleteBehavior.Cascade)+ .IsRequired();++ b.Navigation("Item");++ b.Navigation("User");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.BaseItemEntity", b =>+ {+ b.Navigation("Chapters");++ b.Navigation("Children");++ b.Navigation("DirectChildren");++ b.Navigation("Extras");++ b.Navigation("Images");++ b.Navigation("ItemValues");++ b.Navigation("LinkedChildEntities");++ b.Navigation("LinkedChildOfEntities");++ b.Navigation("LockedFields");++ b.Navigation("MediaStreams");++ b.Navigation("Parents");++ b.Navigation("Peoples");++ b.Navigation("Provider");++ b.Navigation("TrailerTypes");++ b.Navigation("UserData");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.DisplayPreferences", b =>+ {+ b.Navigation("HomeSections");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.ItemValue", b =>+ {+ b.Navigation("BaseItemsMap");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.People", b =>+ {+ b.Navigation("BaseItems");+ });++ modelBuilder.Entity("Jellyfin.Database.Implementations.Entities.User", b =>+ {+ b.Navigation("AccessSchedules");++ b.Navigation("DisplayPreferences");++ b.Navigation("ItemDisplayPreferences");++ b.Navigation("Permissions");++ b.Navigation("Preferences");++ b.Navigation("ProfileImage");+ });+#pragma warning restore 612, 618+ }+ }+}diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20260113233500_DropExtraIdsColumn.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20260113233500_DropExtraIdsColumn.csnew file mode 100644index 0000000000..5387d3351d--- /dev/null+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/20260113233500_DropExtraIdsColumn.cs@@ -0,0 +1,36 @@+using System;+using Microsoft.EntityFrameworkCore.Migrations;++#nullable disable++namespace Jellyfin.Database.Providers.Sqlite.Migrations+{+ /// <inheritdoc />+ public partial class DropExtraIdsColumn : Migration+ {+ /// <inheritdoc />+ protected override void Up(MigrationBuilder migrationBuilder)+ {+ migrationBuilder.DropColumn(+ name: "ExtraIds",+ table: "BaseItems");+ }++ /// <inheritdoc />+ protected override void Down(MigrationBuilder migrationBuilder)+ {+ migrationBuilder.AddColumn<string>(+ name: "ExtraIds",+ table: "BaseItems",+ type: "TEXT",+ nullable: true);++ migrationBuilder.UpdateData(+ table: "BaseItems",+ keyColumn: "Id",+ keyValue: new Guid("00000000-0000-0000-0000-000000000001"),+ column: "ExtraIds",+ value: null);+ }+ }+}diff --git a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.csindex 5a8a39a785..fd16395aa5 100644--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs@@ -207,9 +207,6 @@ namespace Jellyfin.Server.Implementations.Migrationsb.Property<string>("ExternalServiceId").HasColumnType("TEXT");- b.Property<string>("ExtraIds")- .HasColumnType("TEXT");-b.Property<int?>("ExtraType").HasColumnType("INTEGER");