diff options
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/ItemRefreshService.cs | 74 | ||||
| -rw-r--r-- | MediaBrowser.Api/ItemUpdateService.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Api/LibraryService.cs | 51 | ||||
| -rw-r--r-- | MediaBrowser.Api/MediaBrowser.Api.csproj | 1 |
4 files changed, 80 insertions, 56 deletions
diff --git a/MediaBrowser.Api/ItemRefreshService.cs b/MediaBrowser.Api/ItemRefreshService.cs new file mode 100644 index 0000000000..cad88ece99 --- /dev/null +++ b/MediaBrowser.Api/ItemRefreshService.cs @@ -0,0 +1,74 @@ +using MediaBrowser.Controller.Dto; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using ServiceStack.ServiceHost; +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Api +{ + [Route("/Items/{Id}/Refresh", "POST")] + [Api(Description = "Refreshes metadata for an item")] + public class RefreshItem : IReturnVoid + { + [ApiMember(Name = "Forced", Description = "Indicates if a normal or forced refresh should occur.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")] + public bool Forced { get; set; } + + [ApiMember(Name = "Recursive", Description = "Indicates if the refresh should occur recursively.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")] + public bool Recursive { get; set; } + + [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] + public string Id { get; set; } + } + + public class ItemRefreshService : BaseApiService + { + private readonly ILibraryManager _libraryManager; + private readonly IUserManager _userManager; + + public ItemRefreshService(ILibraryManager libraryManager, IUserManager userManager) + { + _libraryManager = libraryManager; + _userManager = userManager; + } + + /// <summary> + /// Posts the specified request. + /// </summary> + /// <param name="request">The request.</param> + public void Post(RefreshItem request) + { + var task = RefreshItem(request); + + Task.WaitAll(task); + } + + /// <summary> + /// Refreshes the item. + /// </summary> + /// <param name="request">The request.</param> + /// <returns>Task.</returns> + private async Task RefreshItem(RefreshItem request) + { + var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager); + + var folder = item as Folder; + + try + { + await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false); + + if (folder != null) + { + await folder.ValidateChildren(new Progress<double>(), CancellationToken.None, request.Recursive, + request.Forced).ConfigureAwait(false); + } + } + catch (Exception ex) + { + Logger.ErrorException("Error refreshing library", ex); + } + } + } +} diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs index 08c46d3e04..5c3e84cc33 100644 --- a/MediaBrowser.Api/ItemUpdateService.cs +++ b/MediaBrowser.Api/ItemUpdateService.cs @@ -1,14 +1,14 @@ -using System; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using MediaBrowser.Controller.Dto; +using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Dto; using ServiceStack.ServiceHost; +using System; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; namespace MediaBrowser.Api { diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs index 0f76203da0..4042c7c24e 100644 --- a/MediaBrowser.Api/LibraryService.cs +++ b/MediaBrowser.Api/LibraryService.cs @@ -97,20 +97,6 @@ namespace MediaBrowser.Api { } - [Route("/Items/{Id}/Refresh", "POST")] - [Api(Description = "Refreshes metadata for an item")] - public class RefreshItem : IReturnVoid - { - [ApiMember(Name = "Forced", Description = "Indicates if a normal or forced refresh should occur.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")] - public bool Forced { get; set; } - - [ApiMember(Name = "Recursive", Description = "Indicates if the refresh should occur recursively.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")] - public bool Recursive { get; set; } - - [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] - public string Id { get; set; } - } - [Route("/Items/{Id}", "DELETE")] [Api(Description = "Deletes an item from the library and file system")] public class DeleteItem : IReturnVoid @@ -390,42 +376,5 @@ namespace MediaBrowser.Api return ToOptimizedResult(result); } - /// <summary> - /// Posts the specified request. - /// </summary> - /// <param name="request">The request.</param> - public void Post(RefreshItem request) - { - var task = RefreshItem(request); - - Task.WaitAll(task); - } - - /// <summary> - /// Refreshes the item. - /// </summary> - /// <param name="request">The request.</param> - /// <returns>Task.</returns> - private async Task RefreshItem(RefreshItem request) - { - var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager); - - var folder = item as Folder; - - try - { - await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false); - - if (folder != null) - { - await folder.ValidateChildren(new Progress<double>(), CancellationToken.None, request.Recursive, - request.Forced).ConfigureAwait(false); - } - } - catch (Exception ex) - { - Logger.ErrorException("Error refreshing library", ex); - } - } } } diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index 8e2c85f469..60583f4462 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -73,6 +73,7 @@ <Compile Include="Images\ImageRequest.cs" /> <Compile Include="Images\ImageService.cs" /> <Compile Include="Images\ImageWriter.cs" /> + <Compile Include="ItemRefreshService.cs" /> <Compile Include="ItemUpdateService.cs" /> <Compile Include="LibraryService.cs" /> <Compile Include="Library\LibraryHelpers.cs" /> |
