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

MediaBrowser · Sep 26, 2014 · dc44e1d · dc44e1d
2 parents 5af34c5 + fbae55d
commit dc44e1d
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 2 deletions.
diff --git a/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs b/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+using MediaBrowser.Model.Entities;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -28,12 +29,28 @@ public interface IDisplayPreferencesRepository : IRepository
                                     CancellationToken cancellationToken);
 
         /// <summary>
+        /// Saves all display preferences for a user
+        /// </summary>
+        /// <param name="displayPreferences">The display preferences.</param>
+        /// <param name="userId">The user id.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task SaveAllDisplayPreferences(IEnumerable<DisplayPreferences> displayPreferences, Guid userId,
+                                    CancellationToken cancellationToken);
+        /// <summary>
         /// Gets the display preferences.
         /// </summary>
         /// <param name="displayPreferencesId">The display preferences id.</param>
         /// <param name="userId">The user id.</param>
         /// <param name="client">The client.</param>
         /// <returns>Task{DisplayPreferences}.</returns>
         DisplayPreferences GetDisplayPreferences(string displayPreferencesId, Guid userId, string client);
+
+        /// <summary>
+        /// Gets all display preferences for the given user.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <returns>Task{DisplayPreferences}.</returns>
+        IEnumerable<DisplayPreferences> GetAllDisplayPreferences(Guid userId);
     }
 }
diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs
@@ -98,6 +98,10 @@ public DisplayPreferences()
         /// </summary>
         /// <value><c>true</c> if [show sidebar]; otherwise, <c>false</c>.</value>
         public bool ShowSidebar { get; set; }
+        /// <summary>
+        /// Gets or sets the client
+        /// </summary>
+        public string Client { get; set; }
 
         /// <summary>
         /// Increases the size of the image.

diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Configuration;
+using System.Collections.Generic;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Entities;
@@ -176,6 +177,84 @@ public async Task SaveDisplayPreferences(DisplayPreferences displayPreferences,
             }
         }
 
+        /// <summary>
+        /// Save all display preferences associated with a user in the repo
+        /// </summary>
+        /// <param name="displayPreferences">The display preferences.</param>
+        /// <param name="userId">The user id.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        /// <exception cref="System.ArgumentNullException">item</exception>
+        public async Task SaveAllDisplayPreferences(IEnumerable<DisplayPreferences> displayPreferences, Guid userId, CancellationToken cancellationToken)
+        {
+            if (displayPreferences == null)
+            {
+                throw new ArgumentNullException("displayPreferences");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            IDbTransaction transaction = null;
+
+            try
+            {
+                transaction = _connection.BeginTransaction();
+
+                foreach (var displayPreference in displayPreferences)
+                {
+
+                    var serialized = _jsonSerializer.SerializeToBytes(displayPreference);
+
+                    using (var cmd = _connection.CreateCommand())
+                    {
+                        cmd.CommandText = "replace into userdisplaypreferences (id, userid, client, data) values (@1, @2, @3, @4)";
+
+                        cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = new Guid(displayPreference.Id);
+                        cmd.Parameters.Add(cmd, "@2", DbType.Guid).Value = userId;
+                        cmd.Parameters.Add(cmd, "@3", DbType.String).Value = displayPreference.Client;
+                        cmd.Parameters.Add(cmd, "@4", DbType.Binary).Value = serialized;
+
+                        cmd.Transaction = transaction;
+
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+
+                transaction.Commit();
+            }
+            catch (OperationCanceledException)
+            {
+                if (transaction != null)
+                {
+                    transaction.Rollback();
+                }
+
+                throw;
+            }
+            catch (Exception e)
+            {
+                _logger.ErrorException("Failed to save display preferences:", e);
+
+                if (transaction != null)
+                {
+                    transaction.Rollback();
+                }
+
+                throw;
+            }
+            finally
+            {
+                if (transaction != null)
+                {
+                    transaction.Dispose();
+                }
+
+                _writeLock.Release();
+            }
+        }
+
         /// <summary>
         /// Gets the display preferences.
         /// </summary>
@@ -217,6 +296,32 @@ public DisplayPreferences GetDisplayPreferences(string displayPreferencesId, Gui
             };
         }
 
+        /// <summary>
+        /// Gets all display preferences for the given user.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <returns>Task{DisplayPreferences}.</returns>
+        /// <exception cref="System.ArgumentNullException">item</exception>
+        public IEnumerable<DisplayPreferences> GetAllDisplayPreferences(Guid userId)
+        {
+
+            var cmd = _connection.CreateCommand();
+            cmd.CommandText = "select data from userdisplaypreferences where userId=@userId";
+
+            cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
+
+            using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+            {
+                while (reader.Read())
+                {
+                    using (var stream = reader.GetMemoryStream(0))
+                    {
+                        yield return _jsonSerializer.DeserializeFromStream<DisplayPreferences>(stream);
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>