alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-16 15:16:41 +00:00
Code Issues Actions 7 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

9
MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Querying;
using System;
@@ -16,6 +17,12 @@ namespace MediaBrowser.Server.Implementations.Sorting
/// <value>The user.</value>
public User User { get; set; }
/// <summary>
/// Gets or sets the user manager.
/// </summary>
/// <value>The user manager.</value>
public IUserManager UserManager { get; set; }
/// <summary>
/// Compares the specified x.
/// </summary>
@@ -34,7 +41,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
/// <returns>DateTime.</returns>
private DateTime GetDate(BaseItem x)
{
var userdata = x.GetUserData(User, false);
var userdata = UserManager.GetUserData(User.Id, x.UserDataId).Result;
if (userdata != null && userdata.LastPlayedDate.HasValue)
{

9
MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Querying;
@@ -33,7 +34,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
/// <returns>DateTime.</returns>
private int GetValue(BaseItem x)
{
var userdata = x.GetUserData(User, false);
var userdata = UserManager.GetUserData(User.Id, x.UserDataId).Result;
return userdata == null ? 0 : userdata.PlayCount;
}
@@ -46,5 +47,11 @@ namespace MediaBrowser.Server.Implementations.Sorting
{
get { return ItemSortBy.PlayCount; }
}
/// <summary>
/// Gets or sets the user manager.
/// </summary>
/// <value>The user manager.</value>
public IUserManager UserManager { get; set; }
}
}