Bladeren bron

added refresh metadata button to the edit page

Luke Pulverenti 12 jaren geleden
bovenliggende
commit
458126a922

+ 74 - 39
MediaBrowser.Api/LibraryService.cs

@@ -106,7 +106,7 @@ namespace MediaBrowser.Api
 
         [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; }
     }
@@ -173,7 +173,8 @@ namespace MediaBrowser.Api
         /// <param name="itemRepo">The item repo.</param>
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="userManager">The user manager.</param>
-        public LibraryService(IItemRepository itemRepo, ILibraryManager libraryManager, IUserManager userManager, IUserDataRepository userDataRepository)
+        public LibraryService(IItemRepository itemRepo, ILibraryManager libraryManager, IUserManager userManager,
+                              IUserDataRepository userDataRepository)
         {
             _itemRepo = itemRepo;
             _libraryManager = libraryManager;
@@ -203,15 +204,15 @@ namespace MediaBrowser.Api
             var items = GetItems(request.UserId).ToList();
 
             var counts = new ItemCounts
-            {
-                AlbumCount = items.OfType<MusicAlbum>().Count(),
-                EpisodeCount = items.OfType<Episode>().Count(),
-                GameCount = items.OfType<BaseGame>().Count(),
-                MovieCount = items.OfType<Movie>().Count(),
-                SeriesCount = items.OfType<Series>().Count(),
-                SongCount = items.OfType<Audio>().Count(),
-                TrailerCount = items.OfType<Trailer>().Count()
-            };
+                {
+                    AlbumCount = items.OfType<MusicAlbum>().Count(),
+                    EpisodeCount = items.OfType<Episode>().Count(),
+                    GameCount = items.OfType<BaseGame>().Count(),
+                    MovieCount = items.OfType<Movie>().Count(),
+                    SeriesCount = items.OfType<Series>().Count(),
+                    SongCount = items.OfType<Audio>().Count(),
+                    TrailerCount = items.OfType<Trailer>().Count()
+                };
 
             return ToOptimizedResult(counts);
         }
@@ -236,7 +237,9 @@ namespace MediaBrowser.Api
         {
             try
             {
-                await _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None).ConfigureAwait(false);
+                await
+                    _libraryManager.ValidateMediaLibrary(new Progress<double>(), CancellationToken.None)
+                                   .ConfigureAwait(false);
             }
             catch (Exception ex)
             {
@@ -269,7 +272,9 @@ namespace MediaBrowser.Api
                 {
                     try
                     {
-                        await parent.ValidateChildren(new Progress<double>(), CancellationToken.None).ConfigureAwait(false);
+                        await
+                            parent.ValidateChildren(new Progress<double>(), CancellationToken.None)
+                                  .ConfigureAwait(false);
                     }
                     catch (Exception ex)
                     {
@@ -306,9 +311,9 @@ namespace MediaBrowser.Api
             var reviewsArray = reviews.ToArray();
 
             var result = new ItemReviewsResult
-            {
-                TotalRecordCount = reviewsArray.Length
-            };
+                {
+                    TotalRecordCount = reviewsArray.Length
+                };
 
             if (request.StartIndex.HasValue)
             {
@@ -333,23 +338,33 @@ namespace MediaBrowser.Api
         {
             var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
 
-            var item = string.IsNullOrEmpty(request.Id) ?
-                (request.UserId.HasValue ? user.RootFolder :
-                (Folder)_libraryManager.RootFolder) : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
+            var item = string.IsNullOrEmpty(request.Id)
+                           ? (request.UserId.HasValue
+                                  ? user.RootFolder
+                                  : (Folder)_libraryManager.RootFolder)
+                           : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
 
             // Get everything
-            var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
+            var fields =
+                Enum.GetNames(typeof(ItemFields))
+                    .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+                    .ToList();
 
             var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userDataRepository);
 
-            var items = _itemRepo.GetItems(item.ThemeSongIds).OrderBy(i => i.SortName).Select(i => dtoBuilder.GetBaseItemDto(i, fields, user)).Select(t => t.Result).ToArray();
+            var items =
+                _itemRepo.GetItems(item.ThemeSongIds)
+                         .OrderBy(i => i.SortName)
+                         .Select(i => dtoBuilder.GetBaseItemDto(i, fields, user))
+                         .Select(t => t.Result)
+                         .ToArray();
 
             var result = new ThemeSongsResult
-            {
-                Items = items,
-                TotalRecordCount = items.Length,
-                OwnerId = DtoBuilder.GetClientItemId(item)
-            };
+                {
+                    Items = items,
+                    TotalRecordCount = items.Length,
+                    OwnerId = DtoBuilder.GetClientItemId(item)
+                };
 
             return ToOptimizedResult(result);
         }
@@ -363,23 +378,33 @@ namespace MediaBrowser.Api
         {
             var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
 
-            var item = string.IsNullOrEmpty(request.Id) ?
-                (request.UserId.HasValue ? user.RootFolder :
-                (Folder)_libraryManager.RootFolder) : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
+            var item = string.IsNullOrEmpty(request.Id)
+                           ? (request.UserId.HasValue
+                                  ? user.RootFolder
+                                  : (Folder)_libraryManager.RootFolder)
+                           : DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager, request.UserId);
 
             // Get everything
-            var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
+            var fields =
+                Enum.GetNames(typeof(ItemFields))
+                    .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+                    .ToList();
 
             var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userDataRepository);
 
-            var items = _itemRepo.GetItems(item.ThemeVideoIds).OrderBy(i => i.SortName).Select(i => dtoBuilder.GetBaseItemDto(i, fields, user)).Select(t => t.Result).ToArray();
+            var items =
+                _itemRepo.GetItems(item.ThemeVideoIds)
+                         .OrderBy(i => i.SortName)
+                         .Select(i => dtoBuilder.GetBaseItemDto(i, fields, user))
+                         .Select(t => t.Result)
+                         .ToArray();
 
             var result = new ThemeVideosResult
-            {
-                Items = items,
-                TotalRecordCount = items.Length,
-                OwnerId = DtoBuilder.GetClientItemId(item)
-            };
+                {
+                    Items = items,
+                    TotalRecordCount = items.Length,
+                    OwnerId = DtoBuilder.GetClientItemId(item)
+                };
 
             return ToOptimizedResult(result);
         }
@@ -388,7 +413,14 @@ namespace MediaBrowser.Api
         /// Posts the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
-        public async void Post(RefreshItem request)
+        public void Post(RefreshItem request)
+        {
+            var task = RefreshItem(request);
+
+            Task.WaitAll(task);
+        }
+
+        private async Task RefreshItem(RefreshItem request)
         {
             var item = DtoBuilder.GetItemByClientId(request.Id, _userManager, _libraryManager);
 
@@ -398,11 +430,14 @@ namespace MediaBrowser.Api
             {
                 if (folder != null)
                 {
-                    await folder.ValidateChildren(new Progress<double>(), CancellationToken.None, request.Recursive, request.Forced).ConfigureAwait(false);
+                    await
+                        folder.ValidateChildren(new Progress<double>(), CancellationToken.None, request.Recursive,
+                                                request.Forced).ConfigureAwait(false);
                 }
                 else
                 {
-                    await item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
+                    await
+                        item.RefreshMetadata(CancellationToken.None, forceRefresh: request.Forced).ConfigureAwait(false);
                 }
             }
             catch (Exception ex)

+ 0 - 2
MediaBrowser.Server.Implementations/Providers/ProviderManager.cs

@@ -114,8 +114,6 @@ namespace MediaBrowser.Server.Implementations.Providers
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            if (force) item.ClearMetaValues();
-
             // Run the normal providers sequentially in order of priority
             foreach (var provider in MetadataProviders.Where(p => p.Supports(item)))
             {

+ 22 - 0
MediaBrowser.WebDashboard/ApiClient.js

@@ -377,6 +377,28 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
             });
         };
 
+        /**
+         * Refreshes metadata for an item
+         */
+        self.refreshItem = function (itemId, force, recursive) {
+
+            if (!itemId) {
+                throw new Error("null itemId");
+            }
+
+            var url = self.getUrl("Items/" + itemId + "/Refresh", {
+
+                force: force || false,
+                recursive: recursive || false
+
+            });
+
+            return self.ajax({
+                type: "POST",
+                url: url
+            });
+        };
+
         /**
          * Installs or updates a new plugin
          */

+ 1 - 1
MediaBrowser.WebDashboard/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.115" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.117" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.46" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.45" targetFramework="net45" />
 </packages>