switch to flat file storage

1 files changed, 11 insertions, 11 deletions

diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index 7fd188acb5..1e0e5286fa 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -73,11 +73,6 @@ namespace MediaBrowser.Controller.Dto
                 tasks.Add(AttachPeople(dto, item));
             }
 
-            if (user != null)
-            {
-                tasks.Add(AttachUserSpecificInfo(dto, item, user, fields));
-            }
-
             if (fields.Contains(ItemFields.PrimaryImageAspectRatio))
             {
                 try
@@ -91,6 +86,11 @@ namespace MediaBrowser.Controller.Dto
                 }
             }
 
+            if (user != null)
+            {
+                AttachUserSpecificInfo(dto, item, user, fields);
+            }
+
             AttachBasicFields(dto, item, fields);
 
             // Make sure all the tasks we kicked off have completed.
@@ -109,7 +109,7 @@ namespace MediaBrowser.Controller.Dto
         /// <param name="item">The item.</param>
         /// <param name="user">The user.</param>
         /// <param name="fields">The fields.</param>
-        private async Task AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List<ItemFields> fields)
+        private void AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List<ItemFields> fields)
         {
             if (item.IsFolder && fields.Contains(ItemFields.DisplayPreferencesId))
             {
@@ -127,13 +127,13 @@ namespace MediaBrowser.Controller.Dto
                     // Skip sorting since all we want is a count
                     dto.ChildCount = folder.GetChildren(user).Count();
 
-                    await SetSpecialCounts(folder, user, dto, _userDataRepository).ConfigureAwait(false);
+                    SetSpecialCounts(folder, user, dto, _userDataRepository);
                 }
             }
 
             if (addUserData)
             {
-                var userData = await _userDataRepository.GetUserData(user.Id, item.GetUserDataKey()).ConfigureAwait(false);
+                var userData = _userDataRepository.GetUserData(user.Id, item.GetUserDataKey());
 
                 dto.UserData = GetUserItemDataDto(userData);
 
@@ -529,7 +529,7 @@ namespace MediaBrowser.Controller.Dto
         /// <param name="dto">The dto.</param>
         /// <param name="userDataRepository">The user data repository.</param>
         /// <returns>Task.</returns>
-        private static async Task SetSpecialCounts(Folder folder, User user, BaseItemDto dto, IUserDataRepository userDataRepository)
+        private static void SetSpecialCounts(Folder folder, User user, BaseItemDto dto, IUserDataRepository userDataRepository)
         {
             var rcentlyAddedItemCount = 0;
             var recursiveItemCount = 0;
@@ -540,7 +540,7 @@ namespace MediaBrowser.Controller.Dto
             // Loop through each recursive child
             foreach (var child in folder.GetRecursiveChildren(user).Where(i => !i.IsFolder).ToList())
             {
-                var userdata = await userDataRepository.GetUserData(user.Id, child.GetUserDataKey()).ConfigureAwait(false);
+                var userdata = userDataRepository.GetUserData(user.Id, child.GetUserDataKey());
 
                 recursiveItemCount++;
 
@@ -767,7 +767,7 @@ namespace MediaBrowser.Controller.Dto
         {
             if (data == null)
             {
-                throw new ArgumentNullException();
+                throw new ArgumentNullException("data");
             }
 
             return new UserItemDataDto