2 files changed, 19 insertions, 69 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index d397b1548..3bb5472df 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -101,6 +101,8 @@ namespace MediaBrowser.Server.Implementations.Library
         /// </summary>
         private readonly IUserManager _userManager;
 
+        private readonly IUserDataRepository _userDataRepository;
+        
         /// <summary>
         /// Gets or sets the configuration manager.
         /// </summary>
@@ -136,12 +138,14 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <param name="taskManager">The task manager.</param>
         /// <param name="userManager">The user manager.</param>
         /// <param name="configurationManager">The configuration manager.</param>
-        public LibraryManager(ILogger logger, ITaskManager taskManager, IUserManager userManager, IServerConfigurationManager configurationManager)
+        /// <param name="userDataRepository">The user data repository.</param>
+        public LibraryManager(ILogger logger, ITaskManager taskManager, IUserManager userManager, IServerConfigurationManager configurationManager, IUserDataRepository userDataRepository)
         {
             _logger = logger;
             _taskManager = taskManager;
             _userManager = userManager;
             ConfigurationManager = configurationManager;
+            _userDataRepository = userDataRepository;
             ByReferenceItems = new ConcurrentDictionary<Guid, BaseItem>();
 
             ConfigurationManager.ConfigurationUpdated += ConfigurationUpdated;
@@ -903,6 +907,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
                     userComparer.User = user;
                     userComparer.UserManager = _userManager;
+                    userComparer.UserDataRepository = _userDataRepository;
 
                     return userComparer;
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 311a31264..dbb2d7b32 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
@@ -86,20 +87,14 @@ namespace MediaBrowser.Server.Implementations.Library
         /// </summary>
         private readonly ILogger _logger;
 
+        private readonly IUserDataRepository _userDataRepository;
+        
         /// <summary>
         /// Gets or sets the configuration manager.
         /// </summary>
         /// <value>The configuration manager.</value>
         private IServerConfigurationManager ConfigurationManager { get; set; }
 
-        private readonly ConcurrentDictionary<string, Task<UserItemData>> _userData = new ConcurrentDictionary<string, Task<UserItemData>>();
-
-        /// <summary>
-        /// Gets the active user data repository
-        /// </summary>
-        /// <value>The user data repository.</value>
-        public IUserDataRepository UserDataRepository { get; set; }
-
         /// <summary>
         /// Gets the active user repository
         /// </summary>
@@ -321,13 +316,13 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var connection = _activeConnections.GetOrAdd(key, keyName => new ClientConnectionInfo
             {
-                UserId = userId,
+                UserId = userId.ToString(),
                 Client = clientType,
                 DeviceName = deviceName,
                 DeviceId = deviceId
             });
 
-            connection.UserId = userId;
+            connection.UserId = userId.ToString();
             
             return connection;
         }
@@ -591,12 +586,14 @@ namespace MediaBrowser.Server.Implementations.Library
 
             UpdateNowPlayingItemId(user, clientType, deviceId, deviceName, item, positionTicks);
 
+            var key = item.GetUserDataKey();
+            
             if (positionTicks.HasValue)
             {
-                var data = await GetUserData(user.Id, item.UserDataId).ConfigureAwait(false);
+                var data = await _userDataRepository.GetUserData(user.Id, key).ConfigureAwait(false);
 
                 UpdatePlayState(item, data, positionTicks.Value, false);
-                await SaveUserData(user.Id, item.UserDataId, data, CancellationToken.None).ConfigureAwait(false);
+                await _userDataRepository.SaveUserData(user.Id, key, data, CancellationToken.None).ConfigureAwait(false);
             }
 
             EventHelper.QueueEventIfNotNull(PlaybackProgress, this, new PlaybackProgressEventArgs
@@ -631,7 +628,9 @@ namespace MediaBrowser.Server.Implementations.Library
 
             RemoveNowPlayingItemId(user, clientType, deviceId, deviceName, item);
 
-            var data = await GetUserData(user.Id, item.UserDataId).ConfigureAwait(false);
+            var key = item.GetUserDataKey();
+
+            var data = await _userDataRepository.GetUserData(user.Id, key).ConfigureAwait(false);
 
             if (positionTicks.HasValue)
             {
@@ -644,7 +643,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 data.Played = true;
             }
 
-            await SaveUserData(user.Id, item.UserDataId, data, CancellationToken.None).ConfigureAwait(false);
+            await _userDataRepository.SaveUserData(user.Id, key, data, CancellationToken.None).ConfigureAwait(false);
 
             EventHelper.QueueEventIfNotNull(PlaybackStopped, this, new PlaybackProgressEventArgs
             {
@@ -703,59 +702,5 @@ namespace MediaBrowser.Server.Implementations.Library
                 data.LastPlayedDate = DateTime.UtcNow;
             }
         }
-
-        /// <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>
-        public async Task SaveUserData(Guid userId, Guid userDataId, UserItemData userData, CancellationToken cancellationToken)
-        {
-            var key = userId + userDataId.ToString();
-            try
-            {
-                await 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 user data.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <param name="userDataId">The user data id.</param>
-        /// <returns>Task{UserItemData}.</returns>
-        public Task<UserItemData> GetUserData(Guid userId, Guid userDataId)
-        {
-            var key = userId + userDataId.ToString();
-
-            return _userData.GetOrAdd(key, keyName => RetrieveUserData(userId, userDataId));
-        }
-
-        /// <summary>
-        /// Retrieves the user data.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <param name="userDataId">The user data id.</param>
-        /// <returns>Task{UserItemData}.</returns>
-        private async Task<UserItemData> RetrieveUserData(Guid userId, Guid userDataId)
-        {
-            var userdata = await UserDataRepository.GetUserData(userId, userDataId).ConfigureAwait(false);
-
-            return userdata ?? new UserItemData();
-        }
     }
 }