Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 15:20:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix notifications query

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-25 12:55:57 -04:00
parent 916bda6f32
commit 93a05271c2
6 changed files with 3 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Api/Reports/ReportsService.cs
View file

@ -275,8 +275,6 @@ namespace MediaBrowser.Api.Reports
case ItemFilter.IsPlayed: case ItemFilter.IsPlayed:
query.IsPlayed = true; query.IsPlayed = true;
break; break;
case ItemFilter.IsRecentlyAdded:
break;
case ItemFilter.IsResumable: case ItemFilter.IsResumable:
query.IsResumable = true; query.IsResumable = true;
break; break;

2
MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
View file

@ -164,8 +164,6 @@ namespace MediaBrowser.Api.UserLibrary
case ItemFilter.IsPlayed: case ItemFilter.IsPlayed:
query.IsPlayed = true; query.IsPlayed = true;
break; break;
case ItemFilter.IsRecentlyAdded:
break;
case ItemFilter.IsResumable: case ItemFilter.IsResumable:
query.IsResumable = true; query.IsResumable = true;
break; break;

20
MediaBrowser.Api/UserLibrary/ItemsService.cs
View file

@ -149,24 +149,6 @@ namespace MediaBrowser.Api.UserLibrary
item = user == null ? _libraryManager.RootFolder : user.RootFolder; item = user == null ? _libraryManager.RootFolder : user.RootFolder;
} }
if (!string.IsNullOrEmpty(request.Ids))
{
var query = GetItemsQuery(request, user);
var specificItems = _libraryManager.GetItemList(query).ToArray();
if (query.SortBy.Length == 0)
{
var ids = query.ItemIds.ToList();
// Try to preserve order
specificItems = specificItems.OrderBy(i => ids.IndexOf(i.Id.ToString("N"))).ToArray();
}
return new QueryResult<BaseItem>
{
Items = specificItems.ToArray(),
TotalRecordCount = specificItems.Length
};
}
// Default list type = children // Default list type = children
var folder = item as Folder; var folder = item as Folder;
@ -289,8 +271,6 @@ namespace MediaBrowser.Api.UserLibrary
case ItemFilter.IsPlayed: case ItemFilter.IsPlayed:
query.IsPlayed = true; query.IsPlayed = true;
break; break;
case ItemFilter.IsRecentlyAdded:
break;
case ItemFilter.IsResumable: case ItemFilter.IsResumable:
query.IsResumable = true; query.IsResumable = true;
break; break;

6
MediaBrowser.Controller/Entities/Folder.cs
View file

@ -891,16 +891,16 @@ namespace MediaBrowser.Controller.Entities
{ {
if (query.ItemIds.Length > 0) if (query.ItemIds.Length > 0)
{ {
var specificItems = query.ItemIds.Select(LibraryManager.GetItemById).Where(i => i != null).ToList(); var result = LibraryManager.GetItemsResult(query);
if (query.SortBy.Length == 0) if (query.SortBy.Length == 0)
{ {
var ids = query.ItemIds.ToList(); var ids = query.ItemIds.ToList();
// Try to preserve order // Try to preserve order
specificItems = specificItems.OrderBy(i => ids.IndexOf(i.Id.ToString("N"))).ToList(); result.Items = result.Items.OrderBy(i => ids.IndexOf(i.Id.ToString("N"))).ToArray();
} }
return Task.FromResult(PostFilterAndSort(specificItems, query, true, true)); return Task.FromResult(result);
} }
return GetItemsInternal(query); return GetItemsInternal(query);

4
MediaBrowser.Model/Querying/ItemFilter.cs
View file

@ -27,10 +27,6 @@ namespace MediaBrowser.Model.Querying
/// </summary> /// </summary>
IsFavorite = 5, IsFavorite = 5,
/// <summary> /// <summary>
/// The is recently added
/// </summary>
IsRecentlyAdded = 6,
/// <summary>
/// The item is resumable /// The item is resumable
/// </summary> /// </summary>
IsResumable = 7, IsResumable = 7,

6
MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
View file

@ -203,12 +203,6 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
/// <returns>Video.</returns> /// <returns>Video.</returns>
protected override Video Resolve(ItemResolveArgs args) protected override Video Resolve(ItemResolveArgs args)
{ {
if (args.Path != null && args.Path.IndexOf("disney", StringComparison.OrdinalIgnoreCase) != -1)
{
var b = true;
var a = b;
}
var collectionType = args.GetCollectionType(); var collectionType = args.GetCollectionType();
if (IsInvalid(args.Parent, collectionType)) if (IsInvalid(args.Parent, collectionType))