3 files changed, 56 insertions, 31 deletions
diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs
index 36c7eba1f..d9244c64c 100644
--- a/MediaBrowser.Controller/Library/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Library/DtoBuilder.cs
@@ -28,11 +28,13 @@ namespace MediaBrowser.Controller.Library
 
         private readonly ILogger _logger;
         private readonly ILibraryManager _libraryManager;
+        private readonly IUserManager _userManager;
 
-        public DtoBuilder(ILogger logger, ILibraryManager libraryManager)
+        public DtoBuilder(ILogger logger, ILibraryManager libraryManager, IUserManager userManager)
         {
             _logger = logger;
             _libraryManager = libraryManager;
+            _userManager = userManager;
         }
 
         /// <summary>
@@ -141,9 +143,9 @@ namespace MediaBrowser.Controller.Library
                 tasks.Add(AttachPeople(dto, item));
             }
 
-            AttachBasicFields(dto, item, fields);
+            tasks.Add(AttachUserSpecificInfo(dto, item, user, fields));
 
-            AttachUserSpecificInfo(dto, item, user, fields);
+            AttachBasicFields(dto, item, fields);
 
             // Make sure all the tasks we kicked off have completed.
             if (tasks.Count > 0)
@@ -161,21 +163,20 @@ namespace MediaBrowser.Controller.Library
         /// <param name="item">The item.</param>
         /// <param name="user">The user.</param>
         /// <param name="fields">The fields.</param>
-        private void AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List<ItemFields> fields)
+        private async Task AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List<ItemFields> fields)
         {
             if (fields.Contains(ItemFields.UserData))
             {
-                var userData = item.GetUserData(user, false);
+                var userData = await _userManager.GetUserData(user.Id, item.UserDataId).ConfigureAwait(false);
 
-                if (userData != null)
-                {
-                    dto.UserData = GetUserItemDataDto(userData);
-                }
+                dto.UserData = GetUserItemDataDto(userData);
             }
 
             if (item.IsFolder && fields.Contains(ItemFields.DisplayPreferences))
             {
-                dto.DisplayPreferences = ((Folder)item).GetDisplayPreferences(user, false) ?? new DisplayPreferences { UserId = user.Id };
+                var displayPreferencesId = ((Folder) item).DisplayPreferencesId;
+
+                dto.DisplayPreferences = await _userManager.GetDisplayPreferences(user.Id, displayPreferencesId).ConfigureAwait(false);
             }
 
             if (item.IsFolder)
@@ -187,11 +188,11 @@ namespace MediaBrowser.Controller.Library
                     // Skip sorting since all we want is a count
                     dto.ChildCount = folder.GetChildren(user).Count();
 
-                    SetSpecialCounts(folder, user, dto);
+                    await SetSpecialCounts(folder, user, dto, _userManager).ConfigureAwait(false);
                 }
             }
         }
-
+        
         /// <summary>
         /// Attaches the primary image aspect ratio.
         /// </summary>
@@ -484,7 +485,9 @@ namespace MediaBrowser.Controller.Library
         /// <param name="folder">The folder.</param>
         /// <param name="user">The user.</param>
         /// <param name="dto">The dto.</param>
-        private static void SetSpecialCounts(Folder folder, User user, BaseItemDto dto)
+        /// <param name="userManager">The user manager.</param>
+        /// <returns>Task.</returns>
+        private static async Task SetSpecialCounts(Folder folder, User user, BaseItemDto dto, IUserManager userManager)
         {
             var rcentlyAddedItemCount = 0;
             var recursiveItemCount = 0;
@@ -494,7 +497,7 @@ namespace MediaBrowser.Controller.Library
             // Loop through each recursive child
             foreach (var child in folder.GetRecursiveChildren(user).Where(i => !i.IsFolder))
             {
-                var userdata = child.GetUserData(user, false);
+                var userdata = await userManager.GetUserData(user.Id, child.UserDataId).ConfigureAwait(false);
 
                 recursiveItemCount++;
 
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 1b9d2f4b2..da2f46abb 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -108,15 +108,6 @@ namespace MediaBrowser.Controller.Library
         Task ValidateMediaLibrary(IProgress<double> progress, CancellationToken cancellationToken);
 
         /// <summary>
-        /// Saves display preferences for a Folder
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="folder">The folder.</param>
-        /// <param name="data">The data.</param>
-        /// <returns>Task.</returns>
-        Task SaveDisplayPreferencesForFolder(User user, Folder folder, DisplayPreferences data);
-
-        /// <summary>
         /// Gets the default view.
         /// </summary>
         /// <returns>IEnumerable{VirtualFolderInfo}.</returns>
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index 229e4cb76..8374c6880 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Common.Events;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Connectivity;
+using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -157,14 +158,6 @@ namespace MediaBrowser.Controller.Library
         Task OnPlaybackStopped(User user, BaseItem item, long? positionTicks, string clientType, string deviceId, string deviceName);
 
         /// <summary>
-        /// Saves user data for an item
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="item">The item.</param>
-        /// <param name="data">The data.</param>
-        Task SaveUserDataForItem(User user, BaseItem item, UserItemData data);
-
-        /// <summary>
         /// Resets the password.
         /// </summary>
         /// <param name="user">The user.</param>
@@ -178,5 +171,43 @@ namespace MediaBrowser.Controller.Library
         /// <param name="newPassword">The new password.</param>
         /// <returns>Task.</returns>
         Task ChangePassword(User user, string newPassword);
+
+        /// <summary>
+        /// Saves display preferences for an item
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="userDataId">The user data id.</param>
+        /// <param name="userData">The user data.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task SaveUserData(Guid userId, Guid userDataId, UserItemData userData,
+                                    CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the display preferences.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="userDataId">The user data id.</param>
+        /// <returns>Task{DisplayPreferences}.</returns>
+        Task<UserItemData> GetUserData(Guid userId, Guid userDataId);
+        
+        /// <summary>
+        /// Gets the display preferences.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="displayPreferencesId">The display preferences id.</param>
+        /// <returns>DisplayPreferences.</returns>
+        Task<DisplayPreferences> GetDisplayPreferences(Guid userId, Guid displayPreferencesId);
+
+        /// <summary>
+        /// Saves display preferences for an item
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="displayPreferencesId">The display preferences id.</param>
+        /// <param name="displayPreferences">The display preferences.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task SaveDisplayPreferences(Guid userId, Guid displayPreferencesId, DisplayPreferences displayPreferences,
+                                    CancellationToken cancellationToken);
     }
 }