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

better async'ing with the api

This commit is contained in:
Luke Pulverenti 2013-08-22 17:33:39 -04:00
parent 54326c0a22
commit 87a41bba76
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary> /// </summary>
[Route("/Users/{UserId}/FavoriteItems/{Id}", "POST")] [Route("/Users/{UserId}/FavoriteItems/{Id}", "POST")]
[Api(Description = "Marks an item as a favorite")] [Api(Description = "Marks an item as a favorite")]
public class MarkFavoriteItem : IReturnVoid public class MarkFavoriteItem : IReturn<UserItemDataDto>
{ {
/// <summary> /// <summary>
/// Gets or sets the user id. /// Gets or sets the user id.
@ -101,7 +101,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary> /// </summary>
[Route("/Users/{UserId}/FavoriteItems/{Id}", "DELETE")] [Route("/Users/{UserId}/FavoriteItems/{Id}", "DELETE")]
[Api(Description = "Unmarks an item as a favorite")] [Api(Description = "Unmarks an item as a favorite")]
public class UnmarkFavoriteItem : IReturnVoid public class UnmarkFavoriteItem : IReturn<UserItemDataDto>
{ {
/// <summary> /// <summary>
/// Gets or sets the user id. /// Gets or sets the user id.
@ -123,7 +123,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary> /// </summary>
[Route("/Users/{UserId}/Items/{Id}/Rating", "DELETE")] [Route("/Users/{UserId}/Items/{Id}/Rating", "DELETE")]
[Api(Description = "Deletes a user's saved personal rating for an item")] [Api(Description = "Deletes a user's saved personal rating for an item")]
public class DeleteUserItemRating : IReturnVoid public class DeleteUserItemRating : IReturn<UserItemDataDto>
{ {
/// <summary> /// <summary>
/// Gets or sets the user id. /// Gets or sets the user id.
@ -145,7 +145,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary> /// </summary>
[Route("/Users/{UserId}/Items/{Id}/Rating", "POST")] [Route("/Users/{UserId}/Items/{Id}/Rating", "POST")]
[Api(Description = "Updates a user's rating for an item")] [Api(Description = "Updates a user's rating for an item")]
public class UpdateUserItemRating : IReturnVoid public class UpdateUserItemRating : IReturn<UserItemDataDto>
{ {
/// <summary> /// <summary>
/// Gets or sets the user id. /// Gets or sets the user id.
@ -174,7 +174,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary> /// </summary>
[Route("/Users/{UserId}/PlayedItems/{Id}", "POST")] [Route("/Users/{UserId}/PlayedItems/{Id}", "POST")]
[Api(Description = "Marks an item as played")] [Api(Description = "Marks an item as played")]
public class MarkPlayedItem : IReturnVoid public class MarkPlayedItem : IReturn<UserItemDataDto>
{ {
/// <summary> /// <summary>
/// Gets or sets the user id. /// Gets or sets the user id.
@ -196,7 +196,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary> /// </summary>
[Route("/Users/{UserId}/PlayedItems/{Id}", "DELETE")] [Route("/Users/{UserId}/PlayedItems/{Id}", "DELETE")]
[Api(Description = "Marks an item as unplayed")] [Api(Description = "Marks an item as unplayed")]
public class MarkUnplayedItem : IReturnVoid public class MarkUnplayedItem : IReturn<UserItemDataDto>
{ {
/// <summary> /// <summary>
/// Gets or sets the user id. /// Gets or sets the user id.
@ -372,7 +372,6 @@ namespace MediaBrowser.Api.UserLibrary
/// <param name="itemRepo">The item repo.</param> /// <param name="itemRepo">The item repo.</param>
/// <exception cref="System.ArgumentNullException">jsonSerializer</exception> /// <exception cref="System.ArgumentNullException">jsonSerializer</exception>
public UserLibraryService(IUserManager userManager, ILibraryManager libraryManager, IUserDataRepository userDataRepository, IItemRepository itemRepo, ISessionManager sessionManager) public UserLibraryService(IUserManager userManager, ILibraryManager libraryManager, IUserDataRepository userDataRepository, IItemRepository itemRepo, ISessionManager sessionManager)
: base()
{ {
_userManager = userManager; _userManager = userManager;
_libraryManager = libraryManager; _libraryManager = libraryManager;
@ -387,6 +386,13 @@ namespace MediaBrowser.Api.UserLibrary
/// <param name="request">The request.</param> /// <param name="request">The request.</param>
/// <returns>System.Object.</returns> /// <returns>System.Object.</returns>
public object Get(GetSpecialFeatures request) public object Get(GetSpecialFeatures request)
{
var result = GetAsync(request);
return ToOptimizedResult(result);
}
private Task<BaseItemDto[]> GetAsync(GetSpecialFeatures request)
{ {
var user = _userManager.GetUserById(request.UserId); var user = _userManager.GetUserById(request.UserId);
@ -399,14 +405,12 @@ namespace MediaBrowser.Api.UserLibrary
var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userDataRepository, _itemRepo); var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userDataRepository, _itemRepo);
var items = movie.SpecialFeatureIds var tasks = movie.SpecialFeatureIds
.Select(_itemRepo.RetrieveItem) .Select(_itemRepo.RetrieveItem)
.OrderBy(i => i.SortName) .OrderBy(i => i.SortName)
.Select(i => dtoBuilder.GetBaseItemDto(i, fields, user, movie)) .Select(i => dtoBuilder.GetBaseItemDto(i, fields, user, movie));
.Select(t => t.Result)
.ToList();
return ToOptimizedResult(items); return Task.WhenAll(tasks);
} }
/// <summary> /// <summary>
@ -415,6 +419,13 @@ namespace MediaBrowser.Api.UserLibrary
/// <param name="request">The request.</param> /// <param name="request">The request.</param>
/// <returns>System.Object.</returns> /// <returns>System.Object.</returns>
public object Get(GetLocalTrailers request) public object Get(GetLocalTrailers request)
{
var result = GetAsync(request);
return ToOptimizedResult(result);
}
private Task<BaseItemDto[]> GetAsync(GetLocalTrailers request)
{ {
var user = _userManager.GetUserById(request.UserId); var user = _userManager.GetUserById(request.UserId);
@ -425,14 +436,12 @@ namespace MediaBrowser.Api.UserLibrary
var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userDataRepository, _itemRepo); var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userDataRepository, _itemRepo);
var items = item.LocalTrailerIds var tasks = item.LocalTrailerIds
.Select(_itemRepo.RetrieveItem) .Select(_itemRepo.RetrieveItem)
.OrderBy(i => i.SortName) .OrderBy(i => i.SortName)
.Select(i => dtoBuilder.GetBaseItemDto(i, fields, user, item)) .Select(i => dtoBuilder.GetBaseItemDto(i, fields, user, item));
.Select(t => t.Result)
.ToList();
return ToOptimizedResult(items); return Task.WhenAll(tasks);
} }
/// <summary> /// <summary>