From b4dd8a210629bc74445f106e2379b986af9520c5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 2 Apr 2013 13:37:49 -0400
Subject: moved displaypreferences to usermanager to solve concurrency issues

---
 .../Library/LibraryManager.cs                      | 29 ----------
 .../Library/UserManager.cs                         | 66 +++++++++++++++++++++-
 2 files changed, 64 insertions(+), 31 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 5cbe8ae18..0c1d2ddf8 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>
@@ -756,26 +747,6 @@ namespace MediaBrowser.Server.Implementations.Library
             await RootFolder.ValidateChildren(progress, cancellationToken, recursive: true).ConfigureAwait(false);
         }
 
-        /// <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>
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 49b2a3f18..b17f2955e 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -1,10 +1,12 @@
-using MediaBrowser.Common.Events;
+using System.Collections.Concurrent;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
 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.Generic;
@@ -97,6 +99,11 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <value>The configuration manager.</value>
         private IServerConfigurationManager ConfigurationManager { get; set; }
 
+        /// <summary>
+        /// The _user data
+        /// </summary>
+        private readonly ConcurrentDictionary<string, Task<DisplayPreferences>> _displayPreferences = new ConcurrentDictionary<string, Task<DisplayPreferences>>();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserManager" /> class.
         /// </summary>
@@ -156,6 +163,62 @@ 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();
+            var newValue = Task.FromResult(displayPreferences);
+
+            try
+            {
+                await Kernel.Instance.DisplayPreferencesRepository.SaveDisplayPreferences(userId, displayPreferencesId,
+                                                                                        displayPreferences,
+                                                                                        cancellationToken).ConfigureAwait(false);
+
+                // 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>
@@ -711,6 +774,5 @@ namespace MediaBrowser.Server.Implementations.Library
 
             return Kernel.UserDataRepository.SaveUserData(item, CancellationToken.None);
         }
-
     }
 }
-- 
cgit v1.2.3