Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix GetItems IndexOutOfRangeException when IDs do not exist #8189

Merged
merged 4 commits into from
Aug 18, 2022
Merged

Fix GetItems IndexOutOfRangeException when IDs do not exist #8189

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bd2cc9
Resolve a System.IndexOutOfRangeException when requesting IDs that do…
lukefor Jul 29, 2022
749b263
Merge remote-tracking branch 'upstream/release-10.8.z' into getitems-…
lukefor Aug 17, 2022
8f28d52
Code review - simplify SortItemsByRequest to a single roughly-equival…
lukefor Aug 17, 2022
b59daab
Tab -> space
lukefor Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions MediaBrowser.Controller/Entities/Folder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,29 +892,7 @@ private bool RequiresPostFiltering(InternalItemsQuery query)

private static BaseItem[] SortItemsByRequest(InternalItemsQuery query, IReadOnlyList<BaseItem> items)
{
var ids = query.ItemIds;
int size = items.Count;

// ids can potentially contain non-unique guids, but query result cannot,
// so we include only first occurrence of each guid
var positions = new Dictionary<Guid, int>(size);
int index = 0;
for (int i = 0; i < ids.Length; i++)
{
if (positions.TryAdd(ids[i], index))
{
index++;
}
}

var newItems = new BaseItem[size];
for (int i = 0; i < size; i++)
{
var item = items[i];
newItems[positions[item.Id]] = item;
}

return newItems;
return items.OrderBy(i => Array.IndexOf(query.ItemIds, i.Id)).ToArray();
}

public QueryResult<BaseItem> GetItems(InternalItemsQuery query)
Expand Down