aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Images/RemoteImageService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api/Images/RemoteImageService.cs')
-rw-r--r--MediaBrowser.Api/Images/RemoteImageService.cs24
1 files changed, 5 insertions, 19 deletions
diff --git a/MediaBrowser.Api/Images/RemoteImageService.cs b/MediaBrowser.Api/Images/RemoteImageService.cs
index c76506357..06b99e175 100644
--- a/MediaBrowser.Api/Images/RemoteImageService.cs
+++ b/MediaBrowser.Api/Images/RemoteImageService.cs
@@ -203,9 +203,7 @@ namespace MediaBrowser.Api.Images
{
var item = _libraryManager.GetItemById(request.Id);
- var result = GetRemoteImageResult(item, request);
-
- return ToOptimizedSerializedResultUsingCache(result);
+ return GetRemoteImageResult(item, request);
}
public object Get(GetItemByNameRemoteImages request)
@@ -218,16 +216,16 @@ namespace MediaBrowser.Api.Images
return GetRemoteImageResult(item, request);
}
- private RemoteImageResult GetRemoteImageResult(BaseItem item, BaseRemoteImageRequest request)
+ private async Task<RemoteImageResult> GetRemoteImageResult(BaseItem item, BaseRemoteImageRequest request)
{
- var images = _providerManager.GetAvailableRemoteImages(item, new RemoteImageQuery
+ var images = await _providerManager.GetAvailableRemoteImages(item, new RemoteImageQuery
{
ProviderName = request.ProviderName,
IncludeAllLanguages = request.IncludeAllLanguages,
IncludeDisabledProviders = true,
ImageType = request.Type
- }, CancellationToken.None).Result;
+ }, CancellationToken.None).ConfigureAwait(false);
var imagesList = images.ToList();
@@ -306,19 +304,7 @@ namespace MediaBrowser.Api.Images
/// </summary>
/// <param name="request">The request.</param>
/// <returns>System.Object.</returns>
- public object Get(GetRemoteImage request)
- {
- var task = GetRemoteImage(request);
-
- return task.Result;
- }
-
- /// <summary>
- /// Gets the remote image.
- /// </summary>
- /// <param name="request">The request.</param>
- /// <returns>Task{System.Object}.</returns>
- private async Task<object> GetRemoteImage(GetRemoteImage request)
+ public async Task<object> Get(GetRemoteImage request)
{
var urlHash = request.ImageUrl.GetMD5();
var pointerCachePath = GetFullCachePath(urlHash.ToString());