From 3aa349fd1f7813128936c4fc83bca38c3f05e296 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 10 May 2016 22:21:28 -0400
Subject: [PATCH] update queries

---
 MediaBrowser.Controller/Playlists/Playlist.cs            | 3 ++-
 MediaBrowser.Providers/Music/ArtistMetadataService.cs    | 8 +++++---
 MediaBrowser.Server.Implementations/Dto/DtoService.cs    | 9 ++++-----
 .../Library/Validators/YearsPostScanTask.cs              | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index 003cbcfcda..67b1d479b9 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -142,7 +142,8 @@ namespace MediaBrowser.Controller.Playlists
                     Recursive = true,
                     IsFolder = false,
                     SortBy = new[] { ItemSortBy.SortName },
-                    MediaTypes = new[] { mediaType }
+                    MediaTypes = new[] { mediaType },
+                    EnableTotalRecordCount = false
                 };
 
                 var itemsResult = await folder.GetItems(query).ConfigureAwait(false);
diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
index 0c0339e12e..21e9b006bf 100644
--- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs
+++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
@@ -27,10 +27,12 @@ namespace MediaBrowser.Providers.Music
             {
                 if (!item.IsLocked)
                 {
-                    var itemFilter = item.GetItemFilter();
-
                     var taggedItems = item.IsAccessedByName ?
-                        LibraryManager.RootFolder.GetRecursiveChildren(i => !i.IsFolder && itemFilter(i)).ToList() :
+                        item.GetTaggedItems(new Controller.Entities.InternalItemsQuery()
+                        {
+                            Recursive = true,
+                            IsFolder = false
+                        }) :
                         item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder).ToList();
 
                     if (!item.LockedFields.Contains(MetadataFields.Genres))
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 312eef9bfa..aac80d150e 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -115,11 +115,10 @@ namespace MediaBrowser.Server.Implementations.Dto
                 {
                     if (options.Fields.Contains(ItemFields.ItemCounts))
                     {
-                        var itemFilter = byName.GetItemFilter();
-
-                        var libraryItems = user != null ?
-                           user.RootFolder.GetRecursiveChildren(user, itemFilter) :
-                           _libraryManager.RootFolder.GetRecursiveChildren(itemFilter);
+                        var libraryItems = byName.GetTaggedItems(new InternalItemsQuery(user)
+                        {
+                            Recursive = true
+                        });
 
                         SetItemByNameInfo(item, dto, libraryItems.ToList(), user);
                     }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
index a6dbb99da9..7f52a4506f 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
             var count = maxYear - yearNumber + 1;
             var numComplete = 0;
 
-            while (yearNumber < DateTime.UtcNow.Year + 3)
+            while (yearNumber < maxYear)
             {
                 try
                 {