alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-04 06:48:35 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Moved userdata to user manager to resolve concurrency issues. must delete userdata and displaypreferences db files.

Browse Source
This commit is contained in:
Luke Pulverenti
2013-04-02 15:25:16 -04:00
parent b4dd8a2106
commit e2562879d8
13 changed files with 208 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -796,109 +796,6 @@ namespace MediaBrowser.Controller.Entities
get { return null; }
}
/// <summary>
/// The _user data
/// </summary>
private IEnumerable<UserItemData> _userData;
/// <summary>
/// The _user data initialized
/// </summary>
private bool _userDataInitialized;
/// <summary>
/// The _user data sync lock
/// </summary>
private object _userDataSyncLock = new object();
/// <summary>
/// Gets the user data.
/// </summary>
/// <value>The user data.</value>
[IgnoreDataMember]
public IEnumerable<UserItemData> UserData
{
get
{
// Call ToList to exhaust the stream because we'll be iterating over this multiple times
LazyInitializer.EnsureInitialized(ref _userData, ref _userDataInitialized, ref _userDataSyncLock, () => Kernel.Instance.UserDataRepository.RetrieveUserData(this).ToList());
return _userData;
}
private set
{
_userData = value;
if (value == null)
{
_userDataInitialized = false;
}
}
}
/// <summary>
/// Gets the user data.
/// </summary>
/// <param name="user">The user.</param>
/// <param name="createIfNull">if set to <c>true</c> [create if null].</param>
/// <returns>UserItemData.</returns>
/// <exception cref="System.ArgumentNullException"></exception>
public UserItemData GetUserData(User user, bool createIfNull)
{
if (user == null)
{
throw new ArgumentNullException();
}
if (UserData == null)
{
if (!createIfNull)
{
return null;
}
AddOrUpdateUserData(user, new UserItemData { UserId = user.Id });
}
var data = UserData.FirstOrDefault(u => u.UserId == user.Id);
if (data == null && createIfNull)
{
data = new UserItemData { UserId = user.Id };
AddOrUpdateUserData(user, data);
}
return data;
}
/// <summary>
/// Adds the or update user data.
/// </summary>
/// <param name="user">The user.</param>
/// <param name="data">The data.</param>
/// <exception cref="System.ArgumentNullException"></exception>
public void AddOrUpdateUserData(User user, UserItemData data)
{
if (user == null)
{
throw new ArgumentNullException();
}
if (data == null)
{
throw new ArgumentNullException();
}
data.UserId = user.Id;
if (UserData == null)
{
UserData = new[] { data };
}
else
{
var list = UserData.Where(u => u.UserId != user.Id).ToList();
list.Add(data);
UserData = list;
}
}
/// <summary>
/// The _user data id
/// </summary>
@@ -1205,16 +1102,17 @@ namespace MediaBrowser.Controller.Entities
/// </summary>
/// <param name="user">The user.</param>
/// <param name="wasPlayed">if set to <c>true</c> [was played].</param>
/// <param name="userManager">The user manager.</param>
/// <returns>Task.</returns>
/// <exception cref="System.ArgumentNullException"></exception>
public virtual Task SetPlayedStatus(User user, bool wasPlayed, IUserManager userManager)
public virtual async Task SetPlayedStatus(User user, bool wasPlayed, IUserManager userManager)
{
if (user == null)
{
throw new ArgumentNullException();
}
var data = GetUserData(user, true);
var data = await userManager.GetUserData(user.Id, UserDataId).ConfigureAwait(false);
if (wasPlayed)
{
@@ -1237,7 +1135,7 @@ namespace MediaBrowser.Controller.Entities
data.Played = wasPlayed;
return userManager.SaveUserDataForItem(user, this, data);
await userManager.SaveUserData(user.Id, UserDataId, data, CancellationToken.None).ConfigureAwait(false);
}
/// <summary>

1
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -799,6 +799,7 @@ namespace MediaBrowser.Controller.Entities
/// </summary>
/// <param name="user">The user.</param>
/// <param name="wasPlayed">if set to <c>true</c> [was played].</param>
/// <param name="userManager">The user manager.</param>
/// <returns>Task.</returns>
public override async Task SetPlayedStatus(User user, bool wasPlayed, IUserManager userManager)
{

15
MediaBrowser.Controller/Library/DtoBuilder.cs
View File

@@ -167,12 +167,9 @@ namespace MediaBrowser.Controller.Library
{
if (fields.Contains(ItemFields.UserData))
{
var userData = item.GetUserData(user, false);
var userData = await _userManager.GetUserData(user.Id, item.UserDataId).ConfigureAwait(false);
if (userData != null)
{
dto.UserData = GetUserItemDataDto(userData);
}
dto.UserData = GetUserItemDataDto(userData);
}
if (item.IsFolder && fields.Contains(ItemFields.DisplayPreferences))
@@ -191,7 +188,7 @@ namespace MediaBrowser.Controller.Library
// Skip sorting since all we want is a count
dto.ChildCount = folder.GetChildren(user).Count();
SetSpecialCounts(folder, user, dto);
await SetSpecialCounts(folder, user, dto, _userManager).ConfigureAwait(false);
}
}
}
@@ -488,7 +485,9 @@ namespace MediaBrowser.Controller.Library
/// <param name="folder">The folder.</param>
/// <param name="user">The user.</param>
/// <param name="dto">The dto.</param>
private static void SetSpecialCounts(Folder folder, User user, BaseItemDto dto)
/// <param name="userManager">The user manager.</param>
/// <returns>Task.</returns>
private static async Task SetSpecialCounts(Folder folder, User user, BaseItemDto dto, IUserManager userManager)
{
var rcentlyAddedItemCount = 0;
var recursiveItemCount = 0;
@@ -498,7 +497,7 @@ namespace MediaBrowser.Controller.Library
// Loop through each recursive child
foreach (var child in folder.GetRecursiveChildren(user).Where(i => !i.IsFolder))
{
var userdata = child.GetUserData(user, false);
var userdata = await userManager.GetUserData(user.Id, child.UserDataId).ConfigureAwait(false);
recursiveItemCount++;

29
MediaBrowser.Controller/Library/IUserManager.cs
View File

@@ -1,11 +1,11 @@
using MediaBrowser.Common.Events;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Connectivity;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.Library
{
@@ -157,14 +157,6 @@ namespace MediaBrowser.Controller.Library
/// <exception cref="System.ArgumentNullException"></exception>
Task OnPlaybackStopped(User user, BaseItem item, long? positionTicks, string clientType, string deviceId, string deviceName);
/// <summary>
/// Saves user data for an item
/// </summary>
/// <param name="user">The user.</param>
/// <param name="item">The item.</param>
/// <param name="data">The data.</param>
Task SaveUserDataForItem(User user, BaseItem item, UserItemData data);
/// <summary>
/// Resets the password.
/// </summary>
@@ -180,6 +172,25 @@ namespace MediaBrowser.Controller.Library
/// <returns>Task.</returns>
Task ChangePassword(User user, string newPassword);
/// <summary>
/// Saves display preferences for an item
/// </summary>
/// <param name="userId">The user id.</param>
/// <param name="userDataId">The user data id.</param>
/// <param name="userData">The user data.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task SaveUserData(Guid userId, Guid userDataId, UserItemData userData,
CancellationToken cancellationToken);
/// <summary>
/// Gets the display preferences.
/// </summary>
/// <param name="userId">The user id.</param>
/// <param name="userDataId">The user data id.</param>
/// <returns>Task{DisplayPreferences}.</returns>
Task<UserItemData> GetUserData(Guid userId, Guid userDataId);
/// <summary>
/// Gets the display preferences.
/// </summary>

20
MediaBrowser.Controller/Persistence/IUserDataRepository.cs
View File

@@ -1,5 +1,5 @@
using MediaBrowser.Controller.Entities;
using System.Collections.Generic;
using System;
using System.Threading;
using System.Threading.Tasks;
@@ -11,18 +11,22 @@ namespace MediaBrowser.Controller.Persistence
public interface IUserDataRepository : IRepository
{
/// <summary>
/// Saves user data for an item
/// Saves the user data.
/// </summary>
/// <param name="item">The item.</param>
/// <param name="userId">The user id.</param>
/// <param name="userDataId">The user data id.</param>
/// <param name="userData">The user data.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task SaveUserData(BaseItem item, CancellationToken cancellationToken);
Task SaveUserData(Guid userId, Guid userDataId, UserItemData userData,
CancellationToken cancellationToken);
/// <summary>
/// Gets user data for an item
/// Gets the user data.
/// </summary>
/// <param name="item">The item.</param>
/// <returns>IEnumerable{UserItemData}.</returns>
IEnumerable<UserItemData> RetrieveUserData(BaseItem item);
/// <param name="userId">The user id.</param>
/// <param name="userDataId">The user data id.</param>
/// <returns>Task{UserItemData}.</returns>
Task<UserItemData> GetUserData(Guid userId, Guid userDataId);
}
}

7
MediaBrowser.Controller/Sorting/IUserBaseItemComparer.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
namespace MediaBrowser.Controller.Sorting
{
@@ -12,5 +13,11 @@ namespace MediaBrowser.Controller.Sorting
/// </summary>
/// <value>The user.</value>
User User { get; set; }
/// <summary>
/// Gets or sets the user manager.
/// </summary>
/// <value>The user manager.</value>
IUserManager UserManager { get; set; }
}
}