Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2 files changed, 133 insertions, 43 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 84055cea7..a57eb8eaa 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -124,15 +124,6 @@ namespace MediaBrowser.Server.Implementations.Library
                 LazyInitializer.EnsureInitialized(ref _libraryItemsCache, ref _libraryItemsCacheInitialized, ref _libraryItemsCacheSyncLock, CreateLibraryItemsCache);
                 return _libraryItemsCache;
             }
-            set
-            {
-                _libraryItemsCache = value;
-
-                if (value == null)
-                {
-                    _libraryItemsCacheInitialized = false;
-                }
-            }
         }
 
         /// <summary>
@@ -267,10 +258,22 @@ namespace MediaBrowser.Server.Implementations.Library
             items.AddRange(specialFeatures);
             items.AddRange(localTrailers);
 
-            // Can't add these right now because there could be separate instances with the same id.
-            //items.AddRange(_userManager.Users.Select(i => i.RootFolder).Distinct().ToList());
+            // Need to use DistinctBy Id because there could be multiple instances with the same id
+            // due to sharing the default library
+            var userRootFolders = _userManager.Users.Select(i => i.RootFolder)
+                .DistinctBy(i => i.Id)
+                .ToList();
+
+            items.AddRange(userRootFolders);
 
-            items.AddRange(_userManager.Users.SelectMany(i => i.RootFolder.Children).Where(i => !(i is BasePluginFolder)).Distinct().ToList());
+            // Get all user collection folders
+            var userFolders =
+                _userManager.Users.SelectMany(i => i.RootFolder.Children)
+                            .Where(i => !(i is BasePluginFolder))
+                            .DistinctBy(i => i.Id)
+                            .ToList();
+
+            items.AddRange(userFolders);
 
             return new ConcurrentDictionary<Guid,BaseItem>(items.ToDictionary(i => i.Id));
         }
@@ -745,26 +748,6 @@ namespace MediaBrowser.Server.Implementations.Library
         }
 
         /// <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>
-        public Task SaveDisplayPreferencesForFolder(User user, Folder folder, DisplayPreferences data)
-        {
-            // Need to update all items with the same DisplayPreferencesId
-            foreach (var child in RootFolder.GetRecursiveChildren(user)
-                .OfType<Folder>()
-                .Where(i => i.DisplayPreferencesId == folder.DisplayPreferencesId))
-            {
-                child.AddOrUpdateDisplayPreferences(user, data);
-            }
-
-            return Kernel.DisplayPreferencesRepository.SaveDisplayPreferences(folder, CancellationToken.None);
-        }
-
-        /// <summary>
         /// Gets the default view.
         /// </summary>
         /// <returns>IEnumerable{VirtualFolderInfo}.</returns>
@@ -878,6 +861,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     var userComparer = (IUserBaseItemComparer)Activator.CreateInstance(comparer.GetType());
 
                     userComparer.User = user;
+                    userComparer.UserManager = _userManager;
 
                     return userComparer;
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 49b2a3f18..ca3c1fe7c 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -5,8 +5,10 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Connectivity;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -98,6 +100,13 @@ namespace MediaBrowser.Server.Implementations.Library
         private IServerConfigurationManager ConfigurationManager { get; set; }
 
         /// <summary>
+        /// The _user data
+        /// </summary>
+        private readonly ConcurrentDictionary<string, Task<DisplayPreferences>> _displayPreferences = new ConcurrentDictionary<string, Task<DisplayPreferences>>();
+
+        private readonly ConcurrentDictionary<string, Task<UserItemData>> _userData = new ConcurrentDictionary<string, Task<UserItemData>>();
+        
+        /// <summary>
         /// Initializes a new instance of the <see cref="UserManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
@@ -157,6 +166,63 @@ namespace MediaBrowser.Server.Implementations.Library
         #endregion
 
         /// <summary>
+        /// Gets the display preferences.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="displayPreferencesId">The display preferences id.</param>
+        /// <returns>DisplayPreferences.</returns>
+        public Task<DisplayPreferences> GetDisplayPreferences(Guid userId, Guid displayPreferencesId)
+        {
+            var key = userId + displayPreferencesId.ToString();
+
+            return _displayPreferences.GetOrAdd(key, keyName => RetrieveDisplayPreferences(userId, displayPreferencesId));
+        }
+
+        /// <summary>
+        /// Retrieves the display preferences.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="displayPreferencesId">The display preferences id.</param>
+        /// <returns>DisplayPreferences.</returns>
+        private async Task<DisplayPreferences> RetrieveDisplayPreferences(Guid userId, Guid displayPreferencesId)
+        {
+            var displayPreferences = await Kernel.Instance.DisplayPreferencesRepository.GetDisplayPreferences(userId, displayPreferencesId).ConfigureAwait(false);
+
+            return displayPreferences ?? new DisplayPreferences();
+        }
+
+        /// <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>
+        public async Task SaveDisplayPreferences(Guid userId, Guid displayPreferencesId, DisplayPreferences displayPreferences, CancellationToken cancellationToken)
+        {
+            var key = userId + displayPreferencesId.ToString();
+           
+            try
+            {
+                await Kernel.Instance.DisplayPreferencesRepository.SaveDisplayPreferences(userId, displayPreferencesId,
+                                                                                        displayPreferences,
+                                                                                        cancellationToken).ConfigureAwait(false);
+
+                var newValue = Task.FromResult(displayPreferences);
+
+                // Once it succeeds, put it into the dictionary to make it available to everyone else
+                _displayPreferences.AddOrUpdate(key, newValue, delegate { return newValue; });
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error saving display preferences", ex);
+
+                throw;
+            }
+        }
+
+        /// <summary>
         /// Gets a User by Id
         /// </summary>
         /// <param name="id">The id.</param>
@@ -588,10 +654,10 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (positionTicks.HasValue)
             {
-                var data = item.GetUserData(user, true);
+                var data = await GetUserData(user.Id, item.UserDataId).ConfigureAwait(false);
 
                 UpdatePlayState(item, data, positionTicks.Value, false);
-                await SaveUserDataForItem(user, item, data).ConfigureAwait(false);
+                await SaveUserData(user.Id, item.UserDataId, data, CancellationToken.None).ConfigureAwait(false);
             }
 
             EventHelper.QueueEventIfNotNull(PlaybackProgress, this, new PlaybackProgressEventArgs
@@ -626,7 +692,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             RemoveNowPlayingItemId(user, clientType, deviceId, deviceName, item);
 
-            var data = item.GetUserData(user, true);
+            var data = await GetUserData(user.Id, item.UserDataId).ConfigureAwait(false);
 
             if (positionTicks.HasValue)
             {
@@ -639,7 +705,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 data.Played = true;
             }
 
-            await SaveUserDataForItem(user, item, data).ConfigureAwait(false);
+            await SaveUserData(user.Id, item.UserDataId, data, CancellationToken.None).ConfigureAwait(false);
 
             EventHelper.QueueEventIfNotNull(PlaybackStopped, this, new PlaybackProgressEventArgs
             {
@@ -700,17 +766,57 @@ namespace MediaBrowser.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Saves user data for an item
+        /// Saves display preferences for an item
         /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="item">The item.</param>
-        /// <param name="data">The data.</param>
-        public Task SaveUserDataForItem(User user, BaseItem item, UserItemData data)
+        /// <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>
+        public async Task SaveUserData(Guid userId, Guid userDataId, UserItemData userData, CancellationToken cancellationToken)
+        {
+            var key = userId + userDataId.ToString();
+            try
+            {
+                await Kernel.Instance.UserDataRepository.SaveUserData(userId, userDataId, userData, cancellationToken).ConfigureAwait(false);
+
+                var newValue = Task.FromResult(userData);
+
+                // Once it succeeds, put it into the dictionary to make it available to everyone else
+                _userData.AddOrUpdate(key, newValue, delegate { return newValue; });
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error saving user data", ex);
+
+                throw;
+            }
+        }
+
+        /// <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>
+        public Task<UserItemData> GetUserData(Guid userId, Guid userDataId)
         {
-            item.AddOrUpdateUserData(user, data);
+            var key = userId + userDataId.ToString();
 
-            return Kernel.UserDataRepository.SaveUserData(item, CancellationToken.None);
+            return _userData.GetOrAdd(key, keyName => RetrieveUserData(userId, userDataId));
         }
 
+        /// <summary>
+        /// Retrieves the display preferences.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="userDataId">The user data id.</param>
+        /// <returns>DisplayPreferences.</returns>
+        private async Task<UserItemData> RetrieveUserData(Guid userId, Guid userDataId)
+        {
+            var userdata = await Kernel.Instance.UserDataRepository.GetUserData(userId, userDataId).ConfigureAwait(false);
+
+            return userdata ?? new UserItemData();
+        }
     }
 }