aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/Images/ImageService.cs9
-rw-r--r--MediaBrowser.Api/Images/RemoteImageService.cs22
-rw-r--r--MediaBrowser.Api/ItemRefreshService.cs49
3 files changed, 60 insertions, 20 deletions
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index d7b59c920e..c4981a7faa 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Api.Images
[ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
public string Id { get; set; }
}
-
+
/// <summary>
/// Class UpdateItemImageIndex
/// </summary>
@@ -799,7 +799,12 @@ namespace MediaBrowser.Api.Images
await _providerManager.SaveImage(entity, memoryStream, mimeType, imageType, null, null, CancellationToken.None).ConfigureAwait(false);
- await entity.RefreshMetadata(CancellationToken.None, forceRefresh: true, forceSave: true, allowSlowProviders: false).ConfigureAwait(false);
+ await entity.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ImageRefreshMode = MetadataRefreshMode.None,
+ ForceSave = true
+
+ }, CancellationToken.None).ConfigureAwait(false);
}
}
}
diff --git a/MediaBrowser.Api/Images/RemoteImageService.cs b/MediaBrowser.Api/Images/RemoteImageService.cs
index c18954e500..b84a8f4f74 100644
--- a/MediaBrowser.Api/Images/RemoteImageService.cs
+++ b/MediaBrowser.Api/Images/RemoteImageService.cs
@@ -9,13 +9,13 @@ using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Providers;
using ServiceStack;
+using ServiceStack.Text.Controller;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using ServiceStack.Text.Controller;
namespace MediaBrowser.Api.Images
{
@@ -193,12 +193,7 @@ namespace MediaBrowser.Api.Images
private List<ImageProviderInfo> GetImageProviders(BaseItem item)
{
- return _providerManager.GetImageProviders(item).Select(i => new ImageProviderInfo
- {
- Name = i.Name,
- Priority = i.Priority
-
- }).ToList();
+ return _providerManager.GetImageProviderInfo(item).ToList();
}
public object Get(GetRemoteImages request)
@@ -229,7 +224,9 @@ namespace MediaBrowser.Api.Images
var result = new RemoteImageResult
{
TotalRecordCount = imagesList.Count,
- Providers = _providerManager.GetImageProviders(item).Select(i => i.Name).ToList()
+ Providers = images.Select(i => i.ProviderName)
+ .Distinct(StringComparer.OrdinalIgnoreCase)
+ .ToList()
};
if (request.StartIndex.HasValue)
@@ -284,8 +281,13 @@ namespace MediaBrowser.Api.Images
{
await _providerManager.SaveImage(item, request.ImageUrl, null, request.Type, null, CancellationToken.None).ConfigureAwait(false);
- await item.RefreshMetadata(CancellationToken.None, forceSave: true, allowSlowProviders: false)
- .ConfigureAwait(false);
+ await item.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ForceSave = true,
+ ImageRefreshMode = MetadataRefreshMode.None,
+ MetadataRefreshMode = MetadataRefreshMode.None
+
+ }, CancellationToken.None).ConfigureAwait(false);
}
/// <summary>
diff --git a/MediaBrowser.Api/ItemRefreshService.cs b/MediaBrowser.Api/ItemRefreshService.cs
index 1b8b49f98a..a0055f4e6b 100644
--- a/MediaBrowser.Api/ItemRefreshService.cs
+++ b/MediaBrowser.Api/ItemRefreshService.cs
@@ -2,6 +2,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Providers;
using ServiceStack;
using System;
using System.Linq;
@@ -131,7 +132,11 @@ namespace MediaBrowser.Api
try
{
- await item.RefreshMetadata(cancellationToken, forceRefresh: request.Forced).ConfigureAwait(false);
+ await item.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ReplaceAllMetadata = request.Forced,
+
+ }, CancellationToken.None).ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -152,7 +157,11 @@ namespace MediaBrowser.Api
try
{
- await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+ await item.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ReplaceAllMetadata = request.Forced,
+
+ }, CancellationToken.None).ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -173,7 +182,11 @@ namespace MediaBrowser.Api
try
{
- await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+ await item.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ReplaceAllMetadata = request.Forced,
+
+ }, CancellationToken.None).ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -194,7 +207,11 @@ namespace MediaBrowser.Api
try
{
- await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+ await item.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ReplaceAllMetadata = request.Forced,
+
+ }, CancellationToken.None).ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -215,7 +232,11 @@ namespace MediaBrowser.Api
try
{
- await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+ await item.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ReplaceAllMetadata = request.Forced,
+
+ }, CancellationToken.None).ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -236,7 +257,11 @@ namespace MediaBrowser.Api
try
{
- await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+ await item.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ReplaceAllMetadata = request.Forced,
+
+ }, CancellationToken.None).ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -266,7 +291,11 @@ namespace MediaBrowser.Api
try
{
- await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+ await item.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ReplaceAllMetadata = request.Forced,
+
+ }, CancellationToken.None).ConfigureAwait(false);
if (item.IsFolder)
{
@@ -301,7 +330,11 @@ namespace MediaBrowser.Api
{
foreach (var child in collectionFolder.Children.ToList())
{
- await child.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+ await child.RefreshMetadata(new MetadataRefreshOptions
+ {
+ ReplaceAllMetadata = request.Forced,
+
+ }, CancellationToken.None).ConfigureAwait(false);
if (child.IsFolder)
{