lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring back sorting when needed to fix PlayTo

Browse Source 
This is partial revert of https://github.com/jellyfin/jellyfin/pull/1011
This commit is contained in:
Vasily 2020-02-27 20:11:40 +03:00
parent 6c6b5d7f28
commit e125db4fe3
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,9 +809,17 @@ namespace MediaBrowser.Controller.Entities
public QueryResult<BaseItem> GetItems(InternalItemsQuery query) public QueryResult<BaseItem> GetItems(InternalItemsQuery query)
{ {
if (query.ItemIds.Length > 0) if (query.ItemIds.Length > 1)
{ {
return LibraryManager.GetItemsResult(query); var result = LibraryManager.GetItemsResult(query);
if (query.OrderBy.Count == 0)
{
var ids = query.ItemIds.ToList();
// Try to preserve order, "Play To" relies on it
result.Items = result.Items.OrderBy(i => ids.IndexOf(i.Id)).ToArray();
}
return result;
} }
return GetItemsInternal(query); return GetItemsInternal(query);
@ -821,9 +829,17 @@ namespace MediaBrowser.Controller.Entities
{ {
query.EnableTotalRecordCount = false; query.EnableTotalRecordCount = false;
if (query.ItemIds.Length > 0) if (query.ItemIds.Length > 1)
{ {
return LibraryManager.GetItemList(query); var result = LibraryManager.GetItemList(query);
if (query.OrderBy.Count == 0)
{
var ids = query.ItemIds.ToList();
// Try to preserve order, "Play To" relies on it
return result.OrderBy(i => ids.IndexOf(i.Id)).ToArray();
}
return result.ToArray();
} }
return GetItemsInternal(query).Items; return GetItemsInternal(query).Items;