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

added more direct querying to folder

Browse Source
This commit is contained in:
Luke Pulverenti
2013-09-27 08:24:28 -04:00
parent bdc90f02f2
commit c643dd072e
25 changed files with 143 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/UserLibrary/ArtistsService.cs
View File

@@ -98,7 +98,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetArtists request)
{
var result = GetResult(request).Result;
var result = GetResult(request);
return ToOptimizedResult(result);
}

21
MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
View File

@@ -53,7 +53,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{ItemsResult}.</returns>
protected async Task<ItemsResult> GetResult(GetItemsByName request)
protected ItemsResult GetResult(GetItemsByName request)
{
User user = null;
BaseItem item;
@@ -80,7 +80,7 @@ namespace MediaBrowser.Api.UserLibrary
}
else
{
items = request.Recursive ? folder.RecursiveChildren : folder.Children;
items = request.Recursive ? folder.GetRecursiveChildren() : folder.Children;
}
}
else
@@ -258,23 +258,6 @@ namespace MediaBrowser.Api.UserLibrary
return dto;
}
/// <summary>
/// Gets the items.
/// </summary>
/// <param name="userId">The user id.</param>
/// <returns>IEnumerable{BaseItem}.</returns>
protected IEnumerable<BaseItem> GetItems(Guid? userId)
{
if (userId.HasValue)
{
var user = UserManager.GetUserById(userId.Value);
return UserManager.GetUserById(userId.Value).RootFolder.GetRecursiveChildren(user);
}
return LibraryManager.RootFolder.RecursiveChildren;
}
}
/// <summary>

2
MediaBrowser.Api/UserLibrary/GameGenresService.cs
View File

@@ -89,7 +89,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetGameGenres request)
{
var result = GetResult(request).Result;
var result = GetResult(request);
return ToOptimizedResult(result);
}

2
MediaBrowser.Api/UserLibrary/GenresService.cs
View File

@@ -93,7 +93,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetGenres request)
{
var result = GetResult(request).Result;
var result = GetResult(request);
return ToOptimizedResult(result);
}

2
MediaBrowser.Api/UserLibrary/MusicGenresService.cs
View File

@@ -89,7 +89,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetMusicGenres request)
{
var result = GetResult(request).Result;
var result = GetResult(request);
return ToOptimizedResult(result);
}

2
MediaBrowser.Api/UserLibrary/PersonsService.cs
View File

@@ -105,7 +105,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetPersons request)
{
var result = GetResult(request).Result;
var result = GetResult(request);
return ToOptimizedResult(result);
}

2
MediaBrowser.Api/UserLibrary/StudiosService.cs
View File

@@ -94,7 +94,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetStudios request)
{
var result = GetResult(request).Result;
var result = GetResult(request);
return ToOptimizedResult(result);
}

4
MediaBrowser.Api/UserLibrary/UserLibraryService.cs
View File

@@ -451,9 +451,7 @@ namespace MediaBrowser.Api.UserLibrary
if (series != null)
{
var dtos = series
.RecursiveChildren
.OfType<Episode>()
.Where(i => i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
.GetRecursiveChildren(i => i is Episode && i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
.OrderBy(i =>
{
if (i.PremiereDate.HasValue)

2
MediaBrowser.Api/UserLibrary/YearsService.cs
View File

@@ -99,7 +99,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetYears request)
{
var result = GetResult(request).Result;
var result = GetResult(request);
return ToOptimizedResult(result);
}