alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-07 19:02:11 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix DeviceDiscovery

Browse Source
This commit is contained in:
Luke Pulverenti
2016-05-10 12:18:05 -04:00
parent 9edda5782b
commit 673746621f
6 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Server.Implementations/Library/UserDataManager.cs
View File

@@ -10,6 +10,7 @@ using MediaBrowser.Model.Logging;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
@@ -199,22 +200,22 @@ namespace MediaBrowser.Server.Implementations.Library
public UserItemData GetUserData(IHasUserData user, IHasUserData item)
{
return GetUserData(user.Id, item.GetUserDataKey());
return GetUserData(user.Id, item.GetUserDataKeys().First());
}
public UserItemData GetUserData(string userId, IHasUserData item)
{
return GetUserData(userId, item.GetUserDataKey());
return GetUserData(userId, item.GetUserDataKeys().First());
}
public UserItemData GetUserData(Guid userId, IHasUserData item)
{
return GetUserData(userId, item.GetUserDataKey());
return GetUserData(userId, item.GetUserDataKeys().First());
}
public UserItemDataDto GetUserDataDto(IHasUserData item, User user)
{
var userData = GetUserData(user.Id, item.GetUserDataKey());
var userData = GetUserData(user.Id, item.GetUserDataKeys().First());
var dto = GetUserItemDataDto(userData);
item.FillUserDataDtoValues(dto, userData, user);

3
MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
View File

@@ -345,7 +345,8 @@ namespace MediaBrowser.Server.Implementations.Sync
if (!folder.IsPreSorted)
{
items = items.OrderBy(i => i.SortName).ToArray();
items = _libraryManager.Sort(items, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending)
.ToArray();
}
return items;