pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes #827 - Alpha filtering incorrectly includes all collections

This commit is contained in:
Luke Pulverenti 2014-06-03 22:53:22 -04:00
parent a6135edf08
commit 71351344d7
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
MediaBrowser.Api/UserLibrary/ItemsService.cs
View File

@ -326,6 +326,8 @@ namespace MediaBrowser.Api.UserLibrary
items = _collectionManager.CollapseItemsWithinBoxSets(items, user); items = _collectionManager.CollapseItemsWithinBoxSets(items, user);
} }
items = ApplyPostCollectionCollapseFilters(request, items, user);
items = ApplySortOrder(request, items, user, _libraryManager); items = ApplySortOrder(request, items, user, _libraryManager);
// This must be the last filter // This must be the last filter
@ -811,20 +813,6 @@ namespace MediaBrowser.Api.UserLibrary
items = items.Where(f => !vals.Contains(f.LocationType.ToString(), StringComparer.OrdinalIgnoreCase)); items = items.Where(f => !vals.Contains(f.LocationType.ToString(), StringComparer.OrdinalIgnoreCase));
} }
if (!string.IsNullOrEmpty(request.NameStartsWithOrGreater))
{
items = items.Where(i => string.Compare(request.NameStartsWithOrGreater, i.SortName, StringComparison.CurrentCultureIgnoreCase) < 1);
}
if (!string.IsNullOrEmpty(request.NameStartsWith))
{
items = items.Where(i => string.Compare(request.NameStartsWith, i.SortName.Substring(0, 1), StringComparison.CurrentCultureIgnoreCase) == 0);
}
if (!string.IsNullOrEmpty(request.NameLessThan))
{
items = items.Where(i => string.Compare(request.NameLessThan, i.SortName, StringComparison.CurrentCultureIgnoreCase) == 1);
}
if (!string.IsNullOrEmpty(request.AlbumArtistStartsWithOrGreater)) if (!string.IsNullOrEmpty(request.AlbumArtistStartsWithOrGreater))
{ {
items = items.OfType<IHasAlbumArtist>() items = items.OfType<IHasAlbumArtist>()
@ -1231,6 +1219,25 @@ namespace MediaBrowser.Api.UserLibrary
return items; return items;
} }
private IEnumerable<BaseItem> ApplyPostCollectionCollapseFilters(GetItems request, IEnumerable<BaseItem> items, User user)
{
if (!string.IsNullOrEmpty(request.NameStartsWithOrGreater))
{
items = items.Where(i => string.Compare(request.NameStartsWithOrGreater, i.SortName, StringComparison.CurrentCultureIgnoreCase) < 1);
}
if (!string.IsNullOrEmpty(request.NameStartsWith))
{
items = items.Where(i => string.Compare(request.NameStartsWith, i.SortName.Substring(0, 1), StringComparison.CurrentCultureIgnoreCase) == 0);
}
if (!string.IsNullOrEmpty(request.NameLessThan))
{
items = items.Where(i => string.Compare(request.NameLessThan, i.SortName, StringComparison.CurrentCultureIgnoreCase) == 1);
}
return items;
}
private bool IsYearMismatched(BaseItem item) private bool IsYearMismatched(BaseItem item)
{ {
if (item.ProductionYear.HasValue) if (item.ProductionYear.HasValue)