alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-31 12:58:28 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

i have too much time.

Browse Source 
Refactored BaseItem and UserData relation
This commit is contained in:
JPVenson
2024-10-20 10:11:24 +00:00
parent cd2e043472
commit 10a2a316a4
8 changed files with 88 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Emby.Server.Implementations/Library/UserDataManager.cs
View File

@@ -16,6 +16,7 @@ using MediaBrowser.Model.Entities;
using Microsoft.EntityFrameworkCore;
using AudioBook = MediaBrowser.Controller.Entities.AudioBook;
using Book = MediaBrowser.Controller.Entities.Book;
#pragma warning disable RS0030 // Do not use banned APIs
namespace Emby.Server.Implementations.Library
{
@@ -134,7 +135,9 @@ namespace Emby.Server.Implementations.Library
{
return new UserData()
{
Key = dto.Key,
ItemId = Guid.Parse(dto.Key),
Item = null!,
User = null!,
AudioStreamIndex = dto.AudioStreamIndex,
IsFavorite = dto.IsFavorite,
LastPlayedDate = dto.LastPlayedDate,
@@ -152,7 +155,7 @@ namespace Emby.Server.Implementations.Library
{
return new UserItemData()
{
Key = dto.Key,
Key = dto.ItemId.ToString("D"),
AudioStreamIndex = dto.AudioStreamIndex,
IsFavorite = dto.IsFavorite,
LastPlayedDate = dto.LastPlayedDate,
@@ -182,12 +185,12 @@ namespace Emby.Server.Implementations.Library
{
using var context = _repository.CreateDbContext();
var key = keys.FirstOrDefault();
if (key is null)
if (key is null || Guid.TryParse(key, out var itemId))
{
return null;
}
var userData = context.UserData.AsNoTracking().FirstOrDefault(e => e.Key == key && e.UserId.Equals(userId));
var userData = context.UserData.AsNoTracking().FirstOrDefault(e => e.ItemId == itemId && e.UserId.Equals(userId));
if (userData is not null)
{