Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-04 22:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change BaseItemEntity ChannelId to nullable Guid

Browse Source
This commit is contained in:
Cody Robibero 2025-02-13 20:17:25 -07:00
parent b2a2fd6fcc
commit debc499711
6 changed files with 1624 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Data/Entities/BaseItemEntity.cs
View File

@ -22,7 +22,7 @@ public class BaseItemEntity
public DateTime? EndDate { get; set; } public DateTime? EndDate { get; set; }
public string? ChannelId { get; set; } public Guid? ChannelId { get; set; }
public bool IsMovie { get; set; } public bool IsMovie { get; set; }

7
Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
View File

@ -553,7 +553,7 @@ public sealed class BaseItemRepository
dto.Genres = entity.Genres?.Split('|') ?? []; dto.Genres = entity.Genres?.Split('|') ?? [];
dto.DateCreated = entity.DateCreated.GetValueOrDefault(); dto.DateCreated = entity.DateCreated.GetValueOrDefault();
dto.DateModified = entity.DateModified.GetValueOrDefault(); dto.DateModified = entity.DateModified.GetValueOrDefault();
dto.ChannelId = string.IsNullOrWhiteSpace(entity.ChannelId) ? Guid.Empty : (Guid.TryParse(entity.ChannelId, out var channelId) ? channelId : Guid.Empty); dto.ChannelId = entity.ChannelId ?? Guid.Empty;
dto.DateLastRefreshed = entity.DateLastRefreshed.GetValueOrDefault(); dto.DateLastRefreshed = entity.DateLastRefreshed.GetValueOrDefault();
dto.DateLastSaved = entity.DateLastSaved.GetValueOrDefault(); dto.DateLastSaved = entity.DateLastSaved.GetValueOrDefault();
dto.OwnerId = string.IsNullOrWhiteSpace(entity.OwnerId) ? Guid.Empty : (Guid.TryParse(entity.OwnerId, out var ownerId) ? ownerId : Guid.Empty); dto.OwnerId = string.IsNullOrWhiteSpace(entity.OwnerId) ? Guid.Empty : (Guid.TryParse(entity.OwnerId, out var ownerId) ? ownerId : Guid.Empty);
@ -716,7 +716,7 @@ public sealed class BaseItemRepository
entity.Genres = string.Join('|', dto.Genres); entity.Genres = string.Join('|', dto.Genres);
entity.DateCreated = dto.DateCreated; entity.DateCreated = dto.DateCreated;
entity.DateModified = dto.DateModified; entity.DateModified = dto.DateModified;
entity.ChannelId = dto.ChannelId.ToString(); entity.ChannelId = dto.ChannelId;
entity.DateLastRefreshed = dto.DateLastRefreshed; entity.DateLastRefreshed = dto.DateLastRefreshed;
entity.DateLastSaved = dto.DateLastSaved; entity.DateLastSaved = dto.DateLastSaved;
entity.OwnerId = dto.OwnerId.ToString(); entity.OwnerId = dto.OwnerId.ToString();
@ -1451,8 +1451,7 @@ public sealed class BaseItemRepository
if (filter.ChannelIds.Count > 0) if (filter.ChannelIds.Count > 0)
{ {
var channelIds = filter.ChannelIds.Select(e => e.ToString("N", CultureInfo.InvariantCulture)).ToArray(); baseQuery = baseQuery.Where(e => e.ChannelId != null && filter.ChannelIds.Contains(e.ChannelId.Value));
baseQuery = baseQuery.Where(e => channelIds.Contains(e.ChannelId));
} }
if (!filter.ParentId.IsEmpty()) if (!filter.ParentId.IsEmpty())

1595
Jellyfin.Server.Implementations/Migrations/20250214031148_ChannelIdGuid.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

22
Jellyfin.Server.Implementations/Migrations/20250214031148_ChannelIdGuid.cs Normal file
View File

@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Jellyfin.Server.Implementations.Migrations
{
/// <inheritdoc />
public partial class ChannelIdGuid : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
// NOOP, Guids and strings are stored the same in SQLite.
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
// NOOP, Guids and strings are stored the same in SQLite.
}
}
}

4
Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
View File

@ -15,7 +15,7 @@ namespace Jellyfin.Server.Implementations.Migrations
protected override void BuildModel(ModelBuilder modelBuilder) protected override void BuildModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "9.0.1"); modelBuilder.HasAnnotation("ProductVersion", "9.0.2");
modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b => modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
{ {
@ -152,7 +152,7 @@ namespace Jellyfin.Server.Implementations.Migrations
b.Property<int?>("Audio") b.Property<int?>("Audio")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
b.Property<string>("ChannelId") b.Property<Guid?>("ChannelId")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<string>("CleanName") b.Property<string>("CleanName")

2
Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
View File

@ -678,7 +678,7 @@ public class MigrateLibraryDb : IMigrationRoutine
entity.EndDate = endDate; entity.EndDate = endDate;
} }
if (reader.TryGetString(index++, out var guid)) if (reader.TryGetGuid(index++, out var guid))
{ {
entity.ChannelId = guid; entity.ChannelId = guid;
} }