Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

1 files changed, 4 insertions, 13 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
index b0dee9aaf..3a06fac1b 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
@@ -17,19 +17,13 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         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;
         }
 
@@ -41,19 +35,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// <returns>Task.</returns>
         public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            var items = _libraryManager.RootFolder.RecursiveChildren.Where(i => !(i is IHasMusicGenres) && !(i is Game))
+            var items = _libraryManager.RootFolder.GetRecursiveChildren(i => !(i is IHasMusicGenres) && !(i is Game))
                 .SelectMany(i => i.Genres)
                 .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);