aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs18
-rw-r--r--MediaBrowser.Api/Images/ImageService.cs16
-rw-r--r--MediaBrowser.Api/InstantMixService.cs15
-rw-r--r--MediaBrowser.Api/LibraryService.cs18
-rw-r--r--MediaBrowser.Api/SimilarItemsHelper.cs4
-rw-r--r--MediaBrowser.Api/TvShowsService.cs14
-rw-r--r--MediaBrowser.Api/UserLibrary/ArtistsService.cs9
-rw-r--r--MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs12
-rw-r--r--MediaBrowser.Api/UserLibrary/GameGenresService.cs9
-rw-r--r--MediaBrowser.Api/UserLibrary/GenresService.cs9
-rw-r--r--MediaBrowser.Api/UserLibrary/ItemsService.cs2
-rw-r--r--MediaBrowser.Api/UserLibrary/MusicGenresService.cs9
-rw-r--r--MediaBrowser.Api/UserLibrary/PersonsService.cs9
-rw-r--r--MediaBrowser.Api/UserLibrary/StudiosService.cs8
-rw-r--r--MediaBrowser.Api/UserLibrary/UserLibraryService.cs24
-rw-r--r--MediaBrowser.Api/UserLibrary/YearsService.cs9
-rw-r--r--MediaBrowser.Api/UserService.cs17
-rw-r--r--MediaBrowser.Api/VideosService.cs1
18 files changed, 92 insertions, 111 deletions
diff --git a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
index 75dd62371f..ebb583506c 100644
--- a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
+++ b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
@@ -101,12 +101,12 @@ namespace MediaBrowser.Api.DefaultTheme
var eligibleSpotlightItems = itemsWithBackdrops
.Where(i => i is Game || i is Movie || i is Series || i is MusicArtist);
- var spotlightItemTasks = FilterItemsForBackdropDisplay(eligibleSpotlightItems)
+ var dtos = FilterItemsForBackdropDisplay(eligibleSpotlightItems)
.OrderBy(i => Guid.NewGuid())
.Take(50)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user));
- view.SpotlightItems = await Task.WhenAll(spotlightItemTasks).ConfigureAwait(false);
+ view.SpotlightItems = dtos.ToArray();
return view;
}
@@ -132,13 +132,13 @@ namespace MediaBrowser.Api.DefaultTheme
var fields = new List<ItemFields>();
- var spotlightItemTasks = itemsWithBackdrops
+ var dtos = itemsWithBackdrops
.OfType<Game>()
.OrderBy(i => Guid.NewGuid())
.Take(50)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user));
- view.SpotlightItems = await Task.WhenAll(spotlightItemTasks).ConfigureAwait(false);
+ view.SpotlightItems = dtos.ToArray();
return view;
}
@@ -171,12 +171,12 @@ namespace MediaBrowser.Api.DefaultTheme
var fields = new List<ItemFields>();
- var spotlightItemTasks = FilterItemsForBackdropDisplay(seriesWithBackdrops)
+ var dtos = FilterItemsForBackdropDisplay(seriesWithBackdrops)
.OrderBy(i => Guid.NewGuid())
.Take(50)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user));
- view.SpotlightItems = await Task.WhenAll(spotlightItemTasks).ConfigureAwait(false);
+ view.SpotlightItems = dtos.ToArray();
view.ShowsItems = series
.Where(i => i.BackdropImagePaths.Count > 0)
@@ -245,12 +245,12 @@ namespace MediaBrowser.Api.DefaultTheme
var fields = new List<ItemFields>();
- var spotlightItemTasks = FilterItemsForBackdropDisplay(itemsWithBackdrops)
+ var dtos = FilterItemsForBackdropDisplay(itemsWithBackdrops)
.OrderBy(i => Guid.NewGuid())
.Take(50)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user));
- view.SpotlightItems = await Task.WhenAll(spotlightItemTasks).ConfigureAwait(false);
+ view.SpotlightItems = dtos.ToArray();
view.MovieItems = moviesWithBackdrops
.OrderBy(i => Guid.NewGuid())
@@ -350,7 +350,7 @@ namespace MediaBrowser.Api.DefaultTheme
{
var date = Kernel.Instance.ImageManager.GetImageDateModified(item, path);
- var size = Kernel.Instance.ImageManager.GetImageSize(path, date).Result;
+ var size = Kernel.Instance.ImageManager.GetImageSize(path, date);
return size.Width;
}
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 418793df64..fb5cb291ef 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -361,14 +361,14 @@ namespace MediaBrowser.Api.Images
{
var item = _dtoService.GetItemByDtoId(request.Id);
- var result = GetItemImageInfos(item).Result;
+ var result = GetItemImageInfos(item);
return ToOptimizedResult(result);
}
public object Get(GetItemByNameImageInfos request)
{
- var result = GetItemByNameImageInfos(request).Result;
+ var result = GetItemByNameImageInfos(request);
return ToOptimizedResult(result);
}
@@ -378,7 +378,7 @@ namespace MediaBrowser.Api.Images
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{List{ImageInfo}}.</returns>
- public Task<List<ImageInfo>> GetItemByNameImageInfos(GetItemByNameImageInfos request)
+ private List<ImageInfo> GetItemByNameImageInfos(GetItemByNameImageInfos request)
{
var pathInfo = PathInfo.Parse(RequestContext.PathInfo);
var type = pathInfo.GetArgumentValue<string>(0);
@@ -393,7 +393,7 @@ namespace MediaBrowser.Api.Images
/// </summary>
/// <param name="item">The item.</param>
/// <returns>Task{List{ImageInfo}}.</returns>
- public async Task<List<ImageInfo>> GetItemImageInfos(BaseItem item)
+ public List<ImageInfo> GetItemImageInfos(BaseItem item)
{
var list = new List<ImageInfo>();
@@ -405,7 +405,7 @@ namespace MediaBrowser.Api.Images
var dateModified = Kernel.Instance.ImageManager.GetImageDateModified(item, path);
- var size = await Kernel.Instance.ImageManager.GetImageSize(path, dateModified).ConfigureAwait(false);
+ var size = Kernel.Instance.ImageManager.GetImageSize(path, dateModified);
list.Add(new ImageInfo
{
@@ -426,7 +426,7 @@ namespace MediaBrowser.Api.Images
var dateModified = Kernel.Instance.ImageManager.GetImageDateModified(item, image);
- var size = await Kernel.Instance.ImageManager.GetImageSize(image, dateModified).ConfigureAwait(false);
+ var size = Kernel.Instance.ImageManager.GetImageSize(image, dateModified);
list.Add(new ImageInfo
{
@@ -450,7 +450,7 @@ namespace MediaBrowser.Api.Images
var dateModified = Kernel.Instance.ImageManager.GetImageDateModified(item, image);
- var size = await Kernel.Instance.ImageManager.GetImageSize(image, dateModified).ConfigureAwait(false);
+ var size = Kernel.Instance.ImageManager.GetImageSize(image, dateModified);
list.Add(new ImageInfo
{
@@ -482,7 +482,7 @@ namespace MediaBrowser.Api.Images
var dateModified = Kernel.Instance.ImageManager.GetImageDateModified(item, image);
- var size = await Kernel.Instance.ImageManager.GetImageSize(image, dateModified).ConfigureAwait(false);
+ var size = Kernel.Instance.ImageManager.GetImageSize(image, dateModified);
list.Add(new ImageInfo
{
diff --git a/MediaBrowser.Api/InstantMixService.cs b/MediaBrowser.Api/InstantMixService.cs
index 4b407d778f..baea2bc781 100644
--- a/MediaBrowser.Api/InstantMixService.cs
+++ b/MediaBrowser.Api/InstantMixService.cs
@@ -6,7 +6,6 @@ using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading.Tasks;
namespace MediaBrowser.Api
{
@@ -56,7 +55,7 @@ namespace MediaBrowser.Api
{
var item = _dtoService.GetItemByDtoId(request.Id);
- var result = GetInstantMixResult(request, item.Genres).Result;
+ var result = GetInstantMixResult(request, item.Genres);
return ToOptimizedResult(result);
}
@@ -72,7 +71,7 @@ namespace MediaBrowser.Api
.Concat(album.Genres)
.Distinct(StringComparer.OrdinalIgnoreCase);
- var result = GetInstantMixResult(request, genres).Result;
+ var result = GetInstantMixResult(request, genres);
return ToOptimizedResult(result);
}
@@ -81,7 +80,7 @@ namespace MediaBrowser.Api
{
var genre = GetMusicGenre(request.Name, _libraryManager);
- var result = GetInstantMixResult(request, new[] { genre.Name }).Result;
+ var result = GetInstantMixResult(request, new[] { genre.Name });
return ToOptimizedResult(result);
}
@@ -98,12 +97,12 @@ namespace MediaBrowser.Api
.Concat(artist.Genres)
.Distinct(StringComparer.OrdinalIgnoreCase);
- var result = GetInstantMixResult(request, genres).Result;
+ var result = GetInstantMixResult(request, genres);
return ToOptimizedResult(result);
}
- private async Task<ItemsResult> GetInstantMixResult(BaseGetSimilarItems request, IEnumerable<string> genres)
+ private ItemsResult GetInstantMixResult(BaseGetSimilarItems request, IEnumerable<string> genres)
{
var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
@@ -132,10 +131,10 @@ namespace MediaBrowser.Api
TotalRecordCount = items.Length
};
- var tasks = items.Take(request.Limit ?? items.Length)
+ var dtos = items.Take(request.Limit ?? items.Length)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user));
- result.Items = await Task.WhenAll(tasks).ConfigureAwait(false);
+ result.Items = dtos.ToArray();
return result;
}
diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs
index 14b68942c8..96d6d3273d 100644
--- a/MediaBrowser.Api/LibraryService.cs
+++ b/MediaBrowser.Api/LibraryService.cs
@@ -225,7 +225,7 @@ namespace MediaBrowser.Api
/// <returns>System.Object.</returns>
public object Get(GetAncestors request)
{
- var result = GetAncestors(request).Result;
+ var result = GetAncestors(request);
return ToOptimizedResult(result);
}
@@ -235,11 +235,11 @@ namespace MediaBrowser.Api
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{BaseItemDto[]}.</returns>
- public async Task<BaseItemDto[]> GetAncestors(GetAncestors request)
+ public BaseItemDto[] GetAncestors(GetAncestors request)
{
var item = _dtoService.GetItemByDtoId(request.Id);
- var tasks = new List<Task<BaseItemDto>>();
+ var baseItemDtos = new List<BaseItemDto>();
var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
@@ -257,7 +257,7 @@ namespace MediaBrowser.Api
parent = TranslateParentItem(parent, user);
}
- tasks.Add(_dtoService.GetBaseItemDto(parent, fields, user));
+ baseItemDtos.Add(_dtoService.GetBaseItemDto(parent, fields, user));
if (parent is UserRootFolder)
{
@@ -267,7 +267,7 @@ namespace MediaBrowser.Api
parent = parent.Parent;
}
- return await Task.WhenAll(tasks).ConfigureAwait(false);
+ return baseItemDtos.ToArray();
}
private BaseItem TranslateParentItem(BaseItem item, User user)
@@ -512,11 +512,11 @@ namespace MediaBrowser.Api
.Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
.ToList();
- var tasks = item.ThemeSongIds.Select(_itemRepo.RetrieveItem)
+ var dtos = item.ThemeSongIds.Select(_itemRepo.RetrieveItem)
.OrderBy(i => i.SortName)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user, item));
- var items = await Task.WhenAll(tasks).ConfigureAwait(false);
+ var items = dtos.ToArray();
return new ThemeMediaResult
{
@@ -559,11 +559,11 @@ namespace MediaBrowser.Api
.Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
.ToList();
- var tasks = item.ThemeVideoIds.Select(_itemRepo.RetrieveItem)
+ var dtos = item.ThemeVideoIds.Select(_itemRepo.RetrieveItem)
.OrderBy(i => i.SortName)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user, item));
- var items = await Task.WhenAll(tasks).ConfigureAwait(false);
+ var items = dtos.ToArray();
return new ThemeMediaResult
{
diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs
index 9877860454..f884a5f1d7 100644
--- a/MediaBrowser.Api/SimilarItemsHelper.cs
+++ b/MediaBrowser.Api/SimilarItemsHelper.cs
@@ -74,7 +74,7 @@ namespace MediaBrowser.Api
}).Where(i => i.HasValue).Select(i => i.Value);
}
}
-
+
/// <summary>
/// Class SimilarItemsHelper
/// </summary>
@@ -112,7 +112,7 @@ namespace MediaBrowser.Api
var result = new ItemsResult
{
- Items = items.Take(request.Limit ?? items.Length).Select(i => dtoService.GetBaseItemDto(i, fields, user)).Select(t => t.Result).ToArray(),
+ Items = items.Take(request.Limit ?? items.Length).Select(i => dtoService.GetBaseItemDto(i, fields, user)).ToArray(),
TotalRecordCount = items.Length
};
diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs
index 0e0493747d..e7e8e71c3f 100644
--- a/MediaBrowser.Api/TvShowsService.cs
+++ b/MediaBrowser.Api/TvShowsService.cs
@@ -191,7 +191,7 @@ namespace MediaBrowser.Api
var fields = request.GetItemFields().ToList();
- var returnItems = await GetItemDtos(pagedItems, user, fields).ConfigureAwait(false);
+ var returnItems = pagedItems.Select(i => _dtoService.GetBaseItemDto(i, fields, user)).ToArray();
return new ItemsResult
{
@@ -248,18 +248,6 @@ namespace MediaBrowser.Api
}
/// <summary>
- /// Gets the item dtos.
- /// </summary>
- /// <param name="pagedItems">The paged items.</param>
- /// <param name="user">The user.</param>
- /// <param name="fields">The fields.</param>
- /// <returns>Task.</returns>
- private Task<BaseItemDto[]> GetItemDtos(IEnumerable<BaseItem> pagedItems, User user, List<ItemFields> fields)
- {
- return Task.WhenAll(pagedItems.Select(i => _dtoService.GetBaseItemDto(i, fields, user)));
- }
-
- /// <summary>
/// Applies the paging.
/// </summary>
/// <param name="request">The request.</param>
diff --git a/MediaBrowser.Api/UserLibrary/ArtistsService.cs b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
index fae851d3fb..6e73430966 100644
--- a/MediaBrowser.Api/UserLibrary/ArtistsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
@@ -9,7 +9,6 @@ using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading.Tasks;
namespace MediaBrowser.Api.UserLibrary
{
@@ -65,7 +64,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetArtist request)
{
- var result = GetItem(request).Result;
+ var result = GetItem(request);
return ToOptimizedResult(result);
}
@@ -75,7 +74,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{BaseItemDto}.</returns>
- private async Task<BaseItemDto> GetItem(GetArtist request)
+ private BaseItemDto GetItem(GetArtist request)
{
var item = GetArtist(request.Name, LibraryManager);
@@ -86,10 +85,10 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = UserManager.GetUserById(request.UserId.Value);
- return await DtoService.GetBaseItemDto(item, fields.ToList(), user).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList(), user);
}
- return await DtoService.GetBaseItemDto(item, fields.ToList()).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList());
}
/// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
index 5b40b631ce..734278924f 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
@@ -121,11 +121,9 @@ namespace MediaBrowser.Api.UserLibrary
var fields = request.GetItemFields().ToList();
- var tasks = ibnItems.Select(i => GetDto(i, user, fields));
+ var dtos = ibnItems.Select(i => GetDto(i, user, fields));
- var resultItems = await Task.WhenAll(tasks).ConfigureAwait(false);
-
- result.Items = resultItems.Where(i => i != null).ToArray();
+ result.Items = dtos.Where(i => i != null).ToArray();
return result;
}
@@ -253,10 +251,10 @@ namespace MediaBrowser.Api.UserLibrary
/// <param name="user">The user.</param>
/// <param name="fields">The fields.</param>
/// <returns>Task{DtoBaseItem}.</returns>
- private async Task<BaseItemDto> GetDto(TItemType item, User user, List<ItemFields> fields)
+ private BaseItemDto GetDto(TItemType item, User user, List<ItemFields> fields)
{
- var dto = user == null ? await DtoService.GetBaseItemDto(item, fields).ConfigureAwait(false) :
- await DtoService.GetBaseItemDto(item, fields, user).ConfigureAwait(false);
+ var dto = user == null ? DtoService.GetBaseItemDto(item, fields) :
+ DtoService.GetBaseItemDto(item, fields, user);
return dto;
}
diff --git a/MediaBrowser.Api/UserLibrary/GameGenresService.cs b/MediaBrowser.Api/UserLibrary/GameGenresService.cs
index 8762b891f0..a5ab91cbc6 100644
--- a/MediaBrowser.Api/UserLibrary/GameGenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GameGenresService.cs
@@ -9,7 +9,6 @@ using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading.Tasks;
namespace MediaBrowser.Api.UserLibrary
{
@@ -56,7 +55,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetGameGenre request)
{
- var result = GetItem(request).Result;
+ var result = GetItem(request);
return ToOptimizedResult(result);
}
@@ -66,7 +65,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{BaseItemDto}.</returns>
- private async Task<BaseItemDto> GetItem(GetGameGenre request)
+ private BaseItemDto GetItem(GetGameGenre request)
{
var item = GetGameGenre(request.Name, LibraryManager);
@@ -77,10 +76,10 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = UserManager.GetUserById(request.UserId.Value);
- return await DtoService.GetBaseItemDto(item, fields.ToList(), user).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList(), user);
}
- return await DtoService.GetBaseItemDto(item, fields.ToList()).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList());
}
/// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs
index 7faf20e9ae..fc72a5f523 100644
--- a/MediaBrowser.Api/UserLibrary/GenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GenresService.cs
@@ -8,7 +8,6 @@ using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading.Tasks;
namespace MediaBrowser.Api.UserLibrary
{
@@ -60,7 +59,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetGenre request)
{
- var result = GetItem(request).Result;
+ var result = GetItem(request);
return ToOptimizedResult(result);
}
@@ -70,7 +69,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{BaseItemDto}.</returns>
- private async Task<BaseItemDto> GetItem(GetGenre request)
+ private BaseItemDto GetItem(GetGenre request)
{
var item = GetGenre(request.Name, LibraryManager);
@@ -81,10 +80,10 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = UserManager.GetUserById(request.UserId.Value);
- return await DtoService.GetBaseItemDto(item, fields.ToList(), user).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList(), user);
}
- return await DtoService.GetBaseItemDto(item, fields.ToList()).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList());
}
/// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 40ce844054..4079e41efa 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -260,7 +260,7 @@ namespace MediaBrowser.Api.UserLibrary
var fields = request.GetItemFields().ToList();
- var returnItems = await Task.WhenAll(pagedItems.Select(i => _dtoService.GetBaseItemDto(i, fields, user))).ConfigureAwait(false);
+ var returnItems = pagedItems.Select(i => _dtoService.GetBaseItemDto(i, fields, user)).ToArray();
return new ItemsResult
{
diff --git a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
index 35e8d4df14..84a769b562 100644
--- a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
@@ -9,7 +9,6 @@ using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading.Tasks;
namespace MediaBrowser.Api.UserLibrary
{
@@ -56,7 +55,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetMusicGenre request)
{
- var result = GetItem(request).Result;
+ var result = GetItem(request);
return ToOptimizedResult(result);
}
@@ -66,7 +65,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{BaseItemDto}.</returns>
- private async Task<BaseItemDto> GetItem(GetMusicGenre request)
+ private BaseItemDto GetItem(GetMusicGenre request)
{
var item = GetMusicGenre(request.Name, LibraryManager);
@@ -77,10 +76,10 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = UserManager.GetUserById(request.UserId.Value);
- return await DtoService.GetBaseItemDto(item, fields.ToList(), user).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList(), user);
}
- return await DtoService.GetBaseItemDto(item, fields.ToList()).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList());
}
/// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs
index 3010524448..9fe9f7139f 100644
--- a/MediaBrowser.Api/UserLibrary/PersonsService.cs
+++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs
@@ -8,7 +8,6 @@ using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading.Tasks;
namespace MediaBrowser.Api.UserLibrary
{
@@ -72,7 +71,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetPerson request)
{
- var result = GetItem(request).Result;
+ var result = GetItem(request);
return ToOptimizedResult(result);
}
@@ -82,7 +81,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{BaseItemDto}.</returns>
- private async Task<BaseItemDto> GetItem(GetPerson request)
+ private BaseItemDto GetItem(GetPerson request)
{
var item = GetPerson(request.Name, LibraryManager);
@@ -93,10 +92,10 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = UserManager.GetUserById(request.UserId.Value);
- return await DtoService.GetBaseItemDto(item, fields.ToList(), user).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList(), user);
}
- return await DtoService.GetBaseItemDto(item, fields.ToList()).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList());
}
/// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/StudiosService.cs b/MediaBrowser.Api/UserLibrary/StudiosService.cs
index 5780d72709..3dc4dce6c1 100644
--- a/MediaBrowser.Api/UserLibrary/StudiosService.cs
+++ b/MediaBrowser.Api/UserLibrary/StudiosService.cs
@@ -60,7 +60,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetStudio request)
{
- var result = GetItem(request).Result;
+ var result = GetItem(request);
return ToOptimizedResult(result);
}
@@ -70,7 +70,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{BaseItemDto}.</returns>
- private async Task<BaseItemDto> GetItem(GetStudio request)
+ private BaseItemDto GetItem(GetStudio request)
{
var item = GetStudio(request.Name, LibraryManager);
@@ -81,10 +81,10 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = UserManager.GetUserById(request.UserId.Value);
- return await DtoService.GetBaseItemDto(item, fields.ToList(), user).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList(), user);
}
- return await DtoService.GetBaseItemDto(item, fields.ToList()).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList());
}
/// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 4e8ef7d8dc..392fffc794 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -393,12 +393,12 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetSpecialFeatures request)
{
- var result = GetAsync(request).Result;
+ var result = GetAsync(request);
return ToOptimizedResult(result);
}
- private Task<BaseItemDto[]> GetAsync(GetSpecialFeatures request)
+ private BaseItemDto[] GetAsync(GetSpecialFeatures request)
{
var user = _userManager.GetUserById(request.UserId);
@@ -415,12 +415,12 @@ namespace MediaBrowser.Api.UserLibrary
// Avoid implicitly captured closure
var movie1 = movie;
- var tasks = movie.SpecialFeatureIds
+ var dtos = movie.SpecialFeatureIds
.Select(_itemRepo.RetrieveItem)
.OrderBy(i => i.SortName)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user, movie1));
- return Task.WhenAll(tasks);
+ return dtos.ToArray();
}
var series = item as Series;
@@ -428,7 +428,7 @@ namespace MediaBrowser.Api.UserLibrary
// Get them from the child tree
if (series != null)
{
- var tasks = series
+ var dtos = series
.RecursiveChildren
.OfType<Episode>()
.Where(i => i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
@@ -448,7 +448,7 @@ namespace MediaBrowser.Api.UserLibrary
.ThenBy(i => i.SortName)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user));
- return Task.WhenAll(tasks);
+ return dtos.ToArray();
}
throw new ArgumentException("The item does not support special features");
@@ -461,12 +461,12 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetLocalTrailers request)
{
- var result = GetAsync(request).Result;
+ var result = GetAsync(request);
return ToOptimizedResult(result);
}
- private Task<BaseItemDto[]> GetAsync(GetLocalTrailers request)
+ private BaseItemDto[] GetAsync(GetLocalTrailers request)
{
var user = _userManager.GetUserById(request.UserId);
@@ -475,12 +475,12 @@ namespace MediaBrowser.Api.UserLibrary
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
- var tasks = item.LocalTrailerIds
+ var dtos = item.LocalTrailerIds
.Select(_itemRepo.RetrieveItem)
.OrderBy(i => i.SortName)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user, item));
- return Task.WhenAll(tasks);
+ return dtos.ToArray();
}
/// <summary>
@@ -497,7 +497,7 @@ namespace MediaBrowser.Api.UserLibrary
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
- var result = _dtoService.GetBaseItemDto(item, fields, user).Result;
+ var result = _dtoService.GetBaseItemDto(item, fields, user);
return ToOptimizedResult(result);
}
@@ -516,7 +516,7 @@ namespace MediaBrowser.Api.UserLibrary
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
- var result = _dtoService.GetBaseItemDto(item, fields, user).Result;
+ var result = _dtoService.GetBaseItemDto(item, fields, user);
return ToOptimizedResult(result);
}
diff --git a/MediaBrowser.Api/UserLibrary/YearsService.cs b/MediaBrowser.Api/UserLibrary/YearsService.cs
index 4a45185200..aeee212782 100644
--- a/MediaBrowser.Api/UserLibrary/YearsService.cs
+++ b/MediaBrowser.Api/UserLibrary/YearsService.cs
@@ -9,7 +9,6 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
-using System.Threading.Tasks;
namespace MediaBrowser.Api.UserLibrary
{
@@ -66,7 +65,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>System.Object.</returns>
public object Get(GetYear request)
{
- var result = GetItem(request).Result;
+ var result = GetItem(request);
return ToOptimizedResult(result);
}
@@ -76,7 +75,7 @@ namespace MediaBrowser.Api.UserLibrary
/// </summary>
/// <param name="request">The request.</param>
/// <returns>Task{BaseItemDto}.</returns>
- private async Task<BaseItemDto> GetItem(GetYear request)
+ private BaseItemDto GetItem(GetYear request)
{
var item = LibraryManager.GetYear(request.Year);
@@ -87,10 +86,10 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = UserManager.GetUserById(request.UserId.Value);
- return await DtoService.GetBaseItemDto(item, fields.ToList(), user).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList(), user);
}
- return await DtoService.GetBaseItemDto(item, fields.ToList()).ConfigureAwait(false);
+ return DtoService.GetBaseItemDto(item, fields.ToList());
}
/// <summary>
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 5c8d6a868d..ee8b6ff328 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Api
[Api(Description = "Gets a list of users")]
public class GetUsers : IReturn<List<UserDto>>
{
- [ApiMember(Name = "IsHidden", Description="Optional filter by IsHidden=true or false", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+ [ApiMember(Name = "IsHidden", Description = "Optional filter by IsHidden=true or false", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool? IsHidden { get; set; }
[ApiMember(Name = "IsDisabled", Description = "Optional filter by IsDisabled=true or false", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
@@ -32,7 +32,7 @@ namespace MediaBrowser.Api
public class GetPublicUsers : IReturn<List<UserDto>>
{
}
-
+
/// <summary>
/// Class GetUser
/// </summary>
@@ -220,9 +220,12 @@ namespace MediaBrowser.Api
users = users.Where(i => i.Configuration.IsHidden == request.IsHidden.Value);
}
- var tasks = users.OrderBy(u => u.Name).Select(_dtoService.GetUserDto).Select(i => i.Result);
+ var result = users
+ .OrderBy(u => u.Name)
+ .Select(_dtoService.GetUserDto)
+ .ToList();
- return ToOptimizedResult(tasks.ToList());
+ return ToOptimizedResult(result);
}
/// <summary>
@@ -239,7 +242,7 @@ namespace MediaBrowser.Api
throw new ResourceNotFoundException("User not found");
}
- var result = _dtoService.GetUserDto(user).Result;
+ var result = _dtoService.GetUserDto(user);
return ToOptimizedResult(result);
}
@@ -305,7 +308,7 @@ namespace MediaBrowser.Api
var result = new AuthenticationResult
{
- User = await _dtoService.GetUserDto(user).ConfigureAwait(false)
+ User = _dtoService.GetUserDto(user)
};
return result;
@@ -404,7 +407,7 @@ namespace MediaBrowser.Api
newUser.UpdateConfiguration(dtoUser.Configuration, _xmlSerializer);
- var result = _dtoService.GetUserDto(newUser).Result;
+ var result = _dtoService.GetUserDto(newUser);
return ToOptimizedResult(result);
}
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index 9827ac50fe..f51dc23e79 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -65,7 +65,6 @@ namespace MediaBrowser.Api
var items = video.AdditionalPartIds.Select(_itemRepo.RetrieveItem)
.OrderBy(i => i.SortName)
.Select(i => _dtoService.GetBaseItemDto(i, fields, user, video))
- .Select(t => t.Result)
.ToArray();
var result = new ItemsResult
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-05 06:54:57 +0000