From 3ffd95a6371c40246a8163c17da3626374685271 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 8 Feb 2014 15:22:40 -0500
Subject: [PATCH] minor cleanup

---
 .../Entities/Audio/MusicArtist.cs                |  2 +-
 MediaBrowser.Controller/Entities/Folder.cs       | 16 +++-------------
 .../Entities/Movies/BoxSet.cs                    |  2 +-
 .../Library/Validators/ArtistsValidator.cs       |  5 +----
 .../Library/Validators/GameGenresPostScanTask.cs |  3 +--
 .../Library/Validators/GameGenresValidator.cs    |  7 ++-----
 .../Library/Validators/GenresValidator.cs        |  7 ++-----
 .../Validators/MusicGenresPostScanTask.cs        |  1 -
 .../Library/Validators/MusicGenresValidator.cs   |  7 ++-----
 .../Library/Validators/PeoplePostScanTask.cs     |  3 ---
 .../Library/Validators/StudiosPostScanTask.cs    |  1 -
 .../Library/Validators/StudiosValidator.cs       |  7 ++-----
 .../Library/Validators/YearsPostScanTask.cs      |  2 ++
 13 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index e80aaa69a3..42bfe9160e 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -152,7 +152,7 @@ namespace MediaBrowser.Controller.Entities.Audio
             // Refresh songs
             foreach (var item in songs)
             {
-                if (tasks.Count > 3)
+                if (tasks.Count >= 2)
                 {
                     await Task.WhenAll(tasks).ConfigureAwait(false);
                     tasks.Clear();
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 25197be675..8fae9629be 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -518,7 +518,7 @@ namespace MediaBrowser.Controller.Entities
 
             foreach (var child in children)
             {
-                if (tasks.Count > 5)
+                if (tasks.Count >= 2)
                 {
                     await Task.WhenAll(tasks).ConfigureAwait(false);
                     tasks.Clear();
@@ -596,15 +596,8 @@ namespace MediaBrowser.Controller.Entities
 
             var percentages = new Dictionary<Guid, double>(list.Count);
 
-            var tasks = new List<Task>();
-
             foreach (var item in list)
             {
-                if (tasks.Count > 10)
-                {
-                    await Task.WhenAll(tasks).ConfigureAwait(false);
-                }
-
                 cancellationToken.ThrowIfCancellationRequested();
 
                 var child = item;
@@ -624,12 +617,9 @@ namespace MediaBrowser.Controller.Entities
                     }
                 });
 
-                tasks.Add(child.ValidateChildrenWithCancellationSupport(innerProgress, cancellationToken, true, false, null));
+                await child.ValidateChildrenWithCancellationSupport(innerProgress, cancellationToken, true, false, null)
+                        .ConfigureAwait(false);
             }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index e5fdb7ee04..a00bda7726 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -99,7 +99,7 @@ namespace MediaBrowser.Controller.Entities.Movies
             // Refresh songs
             foreach (var item in items)
             {
-                if (tasks.Count > 3)
+                if (tasks.Count >= 2)
                 {
                     await Task.WhenAll(tasks).ConfigureAwait(false);
                     tasks.Clear();
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
index 40ef5304c6..1d9eea8663 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
@@ -79,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                // Only do this for artists accessed by name. Folder-based artists use ArtistInfoFromSongsProvider
+                // Only do this for artists accessed by name. Folder-based artists get it from the normal refresh
                 if (artist.IsAccessedByName && !artist.LockedFields.Contains(MetadataFields.Genres))
                 {
                     // Avoid implicitly captured closure
@@ -91,9 +91,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                         .ToList();
                 }
 
-                // Populate counts of items
-                //SetItemCounts(artist, null, allItems.OfType<IHasArtist>());
-
                 foreach (var lib in userLibraries)
                 {
                     SetItemCounts(artist, lib.Item1, lib.Item2);
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
index 9e140c6261..097e94216e 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
@@ -16,10 +16,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         private readonly ILibraryManager _libraryManager;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="GameGenresPostScanTask"/> class.
+        /// Initializes a new instance of the <see cref="GameGenresPostScanTask" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
-        /// <param name="userManager">The user manager.</param>
         public GameGenresPostScanTask(ILibraryManager libraryManager)
         {
             _libraryManager = libraryManager;
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
index c7af7a238f..9e64c7810e 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
@@ -47,9 +47,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
 
-            // Populate counts of items
-            //SetItemCounts(null, allLibraryItems, masterDictionary);
-
             progress.Report(2);
 
             var numComplete = 0;
@@ -98,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             progress.Report(100);
         }
 
-        private async Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
+        private Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
         {
             var itemByName = _libraryManager.GetGameGenre(name);
 
@@ -109,7 +106,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 itemByName.SetItemByNameCounts(libraryId, itemCounts);
             }
 
-            await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
+            return itemByName.RefreshMetadata(cancellationToken);
         }
 
         private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary)
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
index cb1253df07..e0a9e2ce8e 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
@@ -48,9 +48,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
 
-            // Populate counts of items
-            //SetItemCounts(null, allLibraryItems, masterDictionary);
-
             progress.Report(2);
 
             var numComplete = 0;
@@ -99,7 +96,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             progress.Report(100);
         }
 
-        private async Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
+        private Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
         {
             var itemByName = _libraryManager.GetGenre(name);
 
@@ -110,7 +107,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 itemByName.SetItemByNameCounts(libraryId, itemCounts);
             }
 
-            await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
+            return itemByName.RefreshMetadata(cancellationToken);
         }
 
         private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary)
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
index e5535c6e06..da378228ad 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
@@ -19,7 +19,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
-        /// <param name="userManager">The user manager.</param>
         public MusicGenresPostScanTask(ILibraryManager libraryManager)
         {
             _libraryManager = libraryManager;
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
index 57a6a612bc..b55ab1cbe1 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
@@ -48,9 +48,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
 
-            // Populate counts of items
-            //SetItemCounts(null, allLibraryItems, masterDictionary);
-
             progress.Report(2);
 
             var numComplete = 0;
@@ -99,7 +96,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             progress.Report(100);
         }
 
-        private async Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
+        private Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
         {
             var itemByName = _libraryManager.GetMusicGenre(name);
 
@@ -110,7 +107,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 itemByName.SetItemByNameCounts(libraryId, itemCounts);
             }
 
-            await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
+            return itemByName.RefreshMetadata(cancellationToken);
         }
 
         private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary)
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs
index 706ff67a7c..86c5dbc4c6 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs
@@ -53,9 +53,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
 
-            // Populate counts of items
-            //SetItemCounts(null, allLibraryItems, masterDictionary);
-
             progress.Report(2);
 
             var numComplete = 0;
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
index fb9562da2a..a3a8b86781 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
@@ -19,7 +19,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
-        /// <param name="userManager">The user manager.</param>
         public StudiosPostScanTask(ILibraryManager libraryManager)
         {
             _libraryManager = libraryManager;
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
index 0f4ff562ef..54fadfb776 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
@@ -47,9 +47,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
             var masterDictionary = new Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>>(StringComparer.OrdinalIgnoreCase);
 
-            // Populate counts of items
-            //SetItemCounts(null, allLibraryItems, masterDictionary);
-
             progress.Report(2);
 
             var numComplete = 0;
@@ -98,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             progress.Report(100);
         }
 
-        private async Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
+        private Task UpdateItemByNameCounts(string name, CancellationToken cancellationToken, Dictionary<Guid, Dictionary<CountType, int>> counts)
         {
             var itemByName = _libraryManager.GetStudio(name);
 
@@ -109,7 +106,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 itemByName.SetItemByNameCounts(libraryId, itemCounts);
             }
 
-            await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
+            return itemByName.RefreshMetadata(cancellationToken);
         }
 
         private void SetItemCounts(Guid userId, IEnumerable<BaseItem> allItems, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary)
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
index c65568db97..78783db90a 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
@@ -26,6 +26,8 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 .Distinct()
                 .ToList();
 
+            progress.Report(10);
+
             var count = allYears.Count;
             var numComplete = 0;