Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-03 05:34:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed userdata lookup

Browse Source
This commit is contained in:
JPVenson 2024-11-12 16:14:17 +00:00
parent 85b8b2573b
commit d3174b5171
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@ namespace Emby.Server.Implementations.Library
private UserItemData? GetUserData(User user, Guid itemId, List<string> keys) private UserItemData? GetUserData(User user, Guid itemId, List<string> keys)
{ {
var cacheKey = GetCacheKey(user.InternalId, itemId); var cacheKey = GetCacheKey(user.InternalId, itemId);
var data = GetUserDataInternal(user.Id, keys); var data = GetUserDataInternal(user.Id, itemId, keys);
if (data is null) if (data is null)
{ {
@ -194,27 +194,31 @@ namespace Emby.Server.Implementations.Library
return _userData.GetOrAdd(cacheKey, data); return _userData.GetOrAdd(cacheKey, data);
} }
private UserItemData? GetUserDataInternal(Guid userId, List<string> keys) private UserItemData? GetUserDataInternal(Guid userId, Guid itemId, List<string> keys)
{ {
var key = keys.FirstOrDefault(); if (keys.Count == 0)
{
return null;
}
using var context = _repository.CreateDbContext(); using var context = _repository.CreateDbContext();
var userData = context.UserData.AsNoTracking().FirstOrDefault(e => e.CustomDataKey == key && e.UserId.Equals(userId)); var userData = context.UserData.AsNoTracking().Where(e => e.ItemId == itemId && keys.Contains(e.CustomDataKey) && e.UserId.Equals(userId)).ToArray();
if (userData is not null) if (userData.Length > 0)
{ {
return Map(userData); var directDataReference = userData.FirstOrDefault(e => e.CustomDataKey == itemId.ToString("N"));
} if (directDataReference is not null)
if (keys.Count > 0)
{
return new UserItemData
{ {
Key = keys[0] return Map(directDataReference);
}; }
return Map(userData.First());
} }
throw new UnreachableException(); return new UserItemData
{
Key = keys.Last()!
};
} }
/// <summary> /// <summary>