2 files changed, 19 insertions, 39 deletions

diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs
index 0a892cbfb..0b14bb952 100644
--- a/MediaBrowser.Controller/Library/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Library/DtoBuilder.cs
@@ -474,14 +474,8 @@ namespace MediaBrowser.Controller.Library
         /// <param name="dto">The dto.</param>
         private static void SetSpecialCounts(Folder folder, User user, BaseItemDto dto)
         {
-            var utcNow = DateTime.UtcNow;
-
             var rcentlyAddedItemCount = 0;
             var recursiveItemCount = 0;
-            var favoriteItemsCount = 0;
-            var recentlyAddedUnPlayedItemCount = 0;
-            var resumableItemCount = 0;
-            var recentlyPlayedItemCount = 0;
 
             double totalPercentPlayed = 0;
 
@@ -498,12 +492,6 @@ namespace MediaBrowser.Controller.Library
                     if (child.IsRecentlyAdded(user))
                     {
                         rcentlyAddedItemCount++;
-
-                        // Check recently added unplayed
-                        if (userdata == null || userdata.PlayCount == 0)
-                        {
-                            recentlyAddedUnPlayedItemCount++;
-                        }
                     }
 
                     // Incrememt totalPercentPlayed
@@ -521,32 +509,10 @@ namespace MediaBrowser.Controller.Library
                         }
                     }
                 }
-
-                if (userdata != null)
-                {
-                    if (userdata.IsFavorite)
-                    {
-                        favoriteItemsCount++;
-                    }
-
-                    if (userdata.PlaybackPositionTicks > 0)
-                    {
-                        resumableItemCount++;
-                    }
-
-                    if (userdata.LastPlayedDate.HasValue && (utcNow - userdata.LastPlayedDate.Value).TotalDays < Kernel.Instance.Configuration.RecentlyPlayedDays)
-                    {
-                        recentlyPlayedItemCount++;
-                    }
-                }
             }
 
             dto.RecursiveItemCount = recursiveItemCount;
             dto.RecentlyAddedItemCount = rcentlyAddedItemCount;
-            dto.RecentlyAddedUnPlayedItemCount = recentlyAddedUnPlayedItemCount;
-            dto.ResumableItemCount = resumableItemCount;
-            dto.FavoriteItemCount = favoriteItemsCount;
-            dto.RecentlyPlayedItemCount = recentlyPlayedItemCount;
 
             if (recursiveItemCount > 0)
             {
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 0979c6845..2dbbc9d83 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -1,9 +1,9 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.IO;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using MediaBrowser.Controller.IO;
 
 namespace MediaBrowser.Controller.Library
 {
@@ -14,6 +14,20 @@ namespace MediaBrowser.Controller.Library
     public class ItemResolveArgs : EventArgs
     {
         /// <summary>
+        /// The _app paths
+        /// </summary>
+        private readonly IServerApplicationPaths _appPaths;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemResolveArgs" /> class.
+        /// </summary>
+        /// <param name="appPaths">The app paths.</param>
+        public ItemResolveArgs(IServerApplicationPaths appPaths)
+        {
+            _appPaths = appPaths;
+        }
+
+        /// <summary>
         /// Gets the file system children.
         /// </summary>
         /// <value>The file system children.</value>
@@ -99,9 +113,9 @@ namespace MediaBrowser.Controller.Library
                 }
 
                 var parentDir = FileInfo.Path != null ? System.IO.Path.GetDirectoryName(FileInfo.Path) ?? string.Empty : string.Empty;
-                
-                return (parentDir.Length > Kernel.Instance.ApplicationPaths.RootFolderPath.Length
-                    && parentDir.StartsWith(Kernel.Instance.ApplicationPaths.RootFolderPath, StringComparison.OrdinalIgnoreCase));
+
+                return (parentDir.Length > _appPaths.RootFolderPath.Length
+                    && parentDir.StartsWith(_appPaths.RootFolderPath, StringComparison.OrdinalIgnoreCase));
 
             }
         }
@@ -114,7 +128,7 @@ namespace MediaBrowser.Controller.Library
         {
             get
             {
-                return IsDirectory && Path.Equals(Kernel.Instance.ApplicationPaths.RootFolderPath, StringComparison.OrdinalIgnoreCase);
+                return IsDirectory && Path.Equals(_appPaths.RootFolderPath, StringComparison.OrdinalIgnoreCase);
             }
         }