From 628c6cbc28f5a744785731dd4e94ec7a1f881dd2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 17 Jan 2015 13:15:09 -0500
Subject: make library scan a bit more hands off

---
 .../Library/Validators/ArtistsPostScanTask.cs      |  7 ++-
 .../Library/Validators/ArtistsValidator.cs         | 65 +---------------------
 .../Library/Validators/GameGenresPostScanTask.cs   |  8 ++-
 .../Library/Validators/GameGenresValidator.cs      | 15 +----
 .../Library/Validators/GenresPostScanTask.cs       |  8 ++-
 .../Library/Validators/GenresValidator.cs          | 15 +----
 .../Library/Validators/MusicGenresPostScanTask.cs  |  8 ++-
 .../Library/Validators/MusicGenresValidator.cs     |  7 +--
 .../Library/Validators/StudiosPostScanTask.cs      |  8 ++-
 .../Library/Validators/StudiosValidator.cs         | 15 +----
 .../Library/Validators/YearsPostScanTask.cs        | 12 ++--
 11 files changed, 48 insertions(+), 120 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library/Validators')

diff --git a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
index 60116ac61..079867ddd 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,14 +15,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// The _library manager
         /// </summary>
         private readonly ILibraryManager _libraryManager;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
-        public ArtistsPostScanTask(ILibraryManager libraryManager)
+        public ArtistsPostScanTask(ILibraryManager libraryManager, ILogger logger)
         {
             _libraryManager = libraryManager;
+            _logger = logger;
         }
 
         /// <summary>
@@ -32,7 +35,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// <returns>Task.</returns>
         public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            return ((LibraryManager)_libraryManager).ValidateArtists(cancellationToken, progress);
+            return new ArtistsValidator(_libraryManager, _logger).Run(progress, cancellationToken);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
index 5968d847e..5363aef25 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
@@ -1,7 +1,5 @@
-using MediaBrowser.Common.Progress;
-using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
@@ -22,11 +20,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// </summary>
         private readonly ILibraryManager _libraryManager;
 
-        /// <summary>
-        /// The _user manager
-        /// </summary>
-        private readonly IUserManager _userManager;
-
         /// <summary>
         /// The _logger
         /// </summary>
@@ -36,12 +29,10 @@ 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>
         /// <param name="logger">The logger.</param>
-        public ArtistsValidator(ILibraryManager libraryManager, IUserManager userManager, ILogger logger)
+        public ArtistsValidator(ILibraryManager libraryManager, ILogger logger)
         {
             _libraryManager = libraryManager;
-            _userManager = userManager;
             _logger = logger;
         }
 
@@ -55,56 +46,8 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         {
             var allItems = _libraryManager.RootFolder.GetRecursiveChildren();
 
-            var allSongs = allItems.OfType<Audio>().ToList();
-
-            var innerProgress = new ActionableProgress<double>();
-
-            innerProgress.RegisterAction(pct => progress.Report(pct * .8));
-
-            var allArtists = await GetAllArtists(allSongs, cancellationToken, innerProgress).ConfigureAwait(false);
-
-            progress.Report(80);
-
-            var numComplete = 0;
-
-            var numArtists = allArtists.Count;
-
-            foreach (var artist in allArtists)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                // 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
-                    var artist1 = artist;
+            var allSongs = allItems.Where(i => !i.IsFolder).OfType<IHasArtist>().ToList();
 
-                    artist.Genres = allSongs.Where(i => i.HasArtist(artist1.Name))
-                        .SelectMany(i => i.Genres)
-                        .Distinct(StringComparer.OrdinalIgnoreCase)
-                        .ToList();
-                }
-
-                numComplete++;
-                double percent = numComplete;
-                percent /= numArtists;
-                percent *= 20;
-
-                progress.Report(80 + percent);
-            }
-
-            progress.Report(100);
-        }
-
-        /// <summary>
-        /// Gets all artists.
-        /// </summary>
-        /// <param name="allSongs">All songs.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <returns>Task{Artist[]}.</returns>
-        private async Task<List<MusicArtist>> GetAllArtists(IEnumerable<Audio> allSongs, CancellationToken cancellationToken, IProgress<double> progress)
-        {
             var allArtists = allSongs.SelectMany(i => i.AllArtists)
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
@@ -138,8 +81,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
 
                 progress.Report(100 * percent);
             }
-
-            return returnArtists;
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
index ae6c863a7..8be2e436f 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,14 +15,17 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// The _library manager
         /// </summary>
         private readonly ILibraryManager _libraryManager;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GameGenresPostScanTask" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
-        public GameGenresPostScanTask(ILibraryManager libraryManager)
+        /// <param name="logger">The logger.</param>
+        public GameGenresPostScanTask(ILibraryManager libraryManager, ILogger logger)
         {
             _libraryManager = libraryManager;
+            _logger = logger;
         }
 
         /// <summary>
@@ -32,7 +36,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// <returns>Task.</returns>
         public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            return ((LibraryManager)_libraryManager).ValidateGameGenres(cancellationToken, progress);
+            return new GameGenresValidator(_libraryManager, _logger).Run(progress, cancellationToken);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
index 6b658e175..b2f2a60c2 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
@@ -15,20 +15,14 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// </summary>
         private readonly ILibraryManager _libraryManager;
 
-        /// <summary>
-        /// The _user manager
-        /// </summary>
-        private readonly IUserManager _userManager;
-
         /// <summary>
         /// The _logger
         /// </summary>
         private readonly ILogger _logger;
 
-        public GameGenresValidator(ILibraryManager libraryManager, IUserManager userManager, ILogger logger)
+        public GameGenresValidator(ILibraryManager libraryManager, ILogger logger)
         {
             _libraryManager = libraryManager;
-            _userManager = userManager;
             _logger = logger;
         }
 
@@ -45,14 +39,11 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
-            progress.Report(2);
             var numComplete = 0;
             var count = items.Count;
 
             foreach (var name in items)
             {
-                cancellationToken.ThrowIfCancellationRequested();
-
                 try
                 {
                     var itemByName = _libraryManager.GetGameGenre(name);
@@ -72,9 +63,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 numComplete++;
                 double percent = numComplete;
                 percent /= count;
-                percent *= 90;
+                percent *= 100;
 
-                progress.Report(percent + 10);
+                progress.Report(percent);
             }
 
             progress.Report(100);
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GenresPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/GenresPostScanTask.cs
index f1d0ef370..a1c34676c 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GenresPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GenresPostScanTask.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
 
 namespace MediaBrowser.Server.Implementations.Library.Validators
 {
@@ -11,14 +12,17 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// The _library manager
         /// </summary>
         private readonly ILibraryManager _libraryManager;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
-        public GenresPostScanTask(ILibraryManager libraryManager)
+        /// <param name="logger">The logger.</param>
+        public GenresPostScanTask(ILibraryManager libraryManager, ILogger logger)
         {
             _libraryManager = libraryManager;
+            _logger = logger;
         }
 
         /// <summary>
@@ -29,7 +33,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// <returns>Task.</returns>
         public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            return ((LibraryManager)_libraryManager).ValidateGenres(cancellationToken, progress);
+            return new GenresValidator(_libraryManager, _logger).Run(progress, cancellationToken);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
index b0dee9aaf..43dc69e63 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
@@ -16,20 +16,14 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// </summary>
         private readonly ILibraryManager _libraryManager;
 
-        /// <summary>
-        /// The _user manager
-        /// </summary>
-        private readonly IUserManager _userManager;
-
         /// <summary>
         /// The _logger
         /// </summary>
         private readonly ILogger _logger;
 
-        public GenresValidator(ILibraryManager libraryManager, IUserManager userManager, ILogger logger)
+        public GenresValidator(ILibraryManager libraryManager, ILogger logger)
         {
             _libraryManager = libraryManager;
-            _userManager = userManager;
             _logger = logger;
         }
 
@@ -46,14 +40,11 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
-            progress.Report(2);
             var numComplete = 0;
             var count = items.Count;
 
             foreach (var name in items)
             {
-                cancellationToken.ThrowIfCancellationRequested();
-
                 try
                 {
                     var itemByName = _libraryManager.GetGenre(name);
@@ -73,9 +64,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 numComplete++;
                 double percent = numComplete;
                 percent /= count;
-                percent *= 90;
+                percent *= 100;
 
-                progress.Report(percent + 10);
+                progress.Report(percent);
             }
 
             progress.Report(100);
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
index 280dd90f4..dbcab0832 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,14 +15,17 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// The _library manager
         /// </summary>
         private readonly ILibraryManager _libraryManager;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
-        public MusicGenresPostScanTask(ILibraryManager libraryManager)
+        /// <param name="logger">The logger.</param>
+        public MusicGenresPostScanTask(ILibraryManager libraryManager, ILogger logger)
         {
             _libraryManager = libraryManager;
+            _logger = logger;
         }
 
         /// <summary>
@@ -32,7 +36,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// <returns>Task.</returns>
         public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            return ((LibraryManager)_libraryManager).ValidateMusicGenres(cancellationToken, progress);
+            return new MusicGenresValidator(_libraryManager, _logger).Run(progress, cancellationToken);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
index aa6c6281e..dfdbda1d9 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
@@ -39,14 +39,11 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
-            progress.Report(2);
             var numComplete = 0;
             var count = items.Count;
 
             foreach (var name in items)
             {
-                cancellationToken.ThrowIfCancellationRequested();
-
                 try
                 {
                     var itemByName = _libraryManager.GetMusicGenre(name);
@@ -66,9 +63,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 numComplete++;
                 double percent = numComplete;
                 percent /= count;
-                percent *= 90;
+                percent *= 100;
 
-                progress.Report(percent + 10);
+                progress.Report(percent);
             }
 
             progress.Report(100);
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
index 0f998b070..0ff609da1 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -15,13 +16,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// </summary>
         private readonly ILibraryManager _libraryManager;
 
+        private readonly ILogger _logger;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
-        public StudiosPostScanTask(ILibraryManager libraryManager)
+        public StudiosPostScanTask(ILibraryManager libraryManager, ILogger logger)
         {
             _libraryManager = libraryManager;
+            _logger = logger;
         }
 
         /// <summary>
@@ -32,7 +36,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// <returns>Task.</returns>
         public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            return ((LibraryManager)_libraryManager).ValidateStudios(cancellationToken, progress);
+            return new StudiosValidator(_libraryManager, _logger).Run(progress, cancellationToken);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
index a2ec9788c..643deef01 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
@@ -14,20 +14,14 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// </summary>
         private readonly ILibraryManager _libraryManager;
 
-        /// <summary>
-        /// The _user manager
-        /// </summary>
-        private readonly IUserManager _userManager;
-
         /// <summary>
         /// The _logger
         /// </summary>
         private readonly ILogger _logger;
 
-        public StudiosValidator(ILibraryManager libraryManager, IUserManager userManager, ILogger logger)
+        public StudiosValidator(ILibraryManager libraryManager, ILogger logger)
         {
             _libraryManager = libraryManager;
-            _userManager = userManager;
             _logger = logger;
         }
 
@@ -44,14 +38,11 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
-            progress.Report(2);
             var numComplete = 0;
             var count = items.Count;
 
             foreach (var name in items)
             {
-                cancellationToken.ThrowIfCancellationRequested();
-
                 try
                 {
                     var itemByName = _libraryManager.GetStudio(name);
@@ -71,9 +62,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 numComplete++;
                 double percent = numComplete;
                 percent /= count;
-                percent *= 90;
+                percent *= 100;
 
-                progress.Report(percent + 10);
+                progress.Report(percent);
             }
 
             progress.Report(100);
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
index 78783db90..5b8f27f58 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
@@ -26,17 +26,15 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 .Distinct()
                 .ToList();
 
-            progress.Report(10);
-
             var count = allYears.Count;
             var numComplete = 0;
 
             foreach (var yearNumber in allYears)
             {
-                var year = _libraryManager.GetYear(yearNumber);
-
                 try
                 {
+                    var year = _libraryManager.GetYear(yearNumber);
+
                     await year.RefreshMetadata(cancellationToken).ConfigureAwait(false);
                 }
                 catch (OperationCanceledException)
@@ -46,15 +44,15 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error refreshing year {0}", ex, year);
+                    _logger.ErrorException("Error refreshing year {0}", ex, yearNumber);
                 }
 
                 numComplete++;
                 double percent = numComplete;
                 percent /= count;
-                percent *= 90;
+                percent *= 100;
 
-                progress.Report(percent + 10);
+                progress.Report(percent);
             }
         }
     }
-- 
cgit v1.2.3