From 52ebf6ae8f050fcbdf675529a97cfbbfcca4953a Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Wed, 22 Jul 2020 14:53:32 -0400
Subject: Move DisplayPreferencesManager.cs to Users namespace

---
 .../DisplayPreferencesManager.cs                   | 49 ----------------------
 .../Users/DisplayPreferencesManager.cs             | 49 ++++++++++++++++++++++
 MediaBrowser.Api/DisplayPreferencesService.cs      |  2 +-
 3 files changed, 50 insertions(+), 50 deletions(-)
 delete mode 100644 Jellyfin.Server.Implementations/DisplayPreferencesManager.cs
 create mode 100644 Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs

diff --git a/Jellyfin.Server.Implementations/DisplayPreferencesManager.cs b/Jellyfin.Server.Implementations/DisplayPreferencesManager.cs
deleted file mode 100644
index 132e74c6a..000000000
--- a/Jellyfin.Server.Implementations/DisplayPreferencesManager.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Linq;
-using Jellyfin.Data.Entities;
-using MediaBrowser.Controller;
-
-namespace Jellyfin.Server.Implementations
-{
-    /// <summary>
-    /// Manages the storage and retrieval of display preferences through Entity Framework.
-    /// </summary>
-    public class DisplayPreferencesManager : IDisplayPreferencesManager
-    {
-        private readonly JellyfinDbProvider _dbProvider;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisplayPreferencesManager"/> class.
-        /// </summary>
-        /// <param name="dbProvider">The Jellyfin db provider.</param>
-        public DisplayPreferencesManager(JellyfinDbProvider dbProvider)
-        {
-            _dbProvider = dbProvider;
-        }
-
-        /// <inheritdoc />
-        public DisplayPreferences GetDisplayPreferences(Guid userId, string client)
-        {
-            var dbContext = _dbProvider.CreateContext();
-            var user = dbContext.Users.Find(userId);
-#pragma warning disable CA1307
-            var prefs = user.DisplayPreferences.FirstOrDefault(pref => string.Equals(pref.Client, client));
-
-            if (prefs == null)
-            {
-                prefs = new DisplayPreferences(client, userId);
-                user.DisplayPreferences.Add(prefs);
-            }
-
-            return prefs;
-        }
-
-        /// <inheritdoc />
-        public void SaveChanges(DisplayPreferences preferences)
-        {
-            var dbContext = _dbProvider.CreateContext();
-            dbContext.Update(preferences);
-            dbContext.SaveChanges();
-        }
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs b/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
new file mode 100644
index 000000000..29ec6e706
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Users/DisplayPreferencesManager.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Linq;
+using Jellyfin.Data.Entities;
+using MediaBrowser.Controller;
+
+namespace Jellyfin.Server.Implementations.Users
+{
+    /// <summary>
+    /// Manages the storage and retrieval of display preferences through Entity Framework.
+    /// </summary>
+    public class DisplayPreferencesManager : IDisplayPreferencesManager
+    {
+        private readonly JellyfinDbProvider _dbProvider;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DisplayPreferencesManager"/> class.
+        /// </summary>
+        /// <param name="dbProvider">The Jellyfin db provider.</param>
+        public DisplayPreferencesManager(JellyfinDbProvider dbProvider)
+        {
+            _dbProvider = dbProvider;
+        }
+
+        /// <inheritdoc />
+        public DisplayPreferences GetDisplayPreferences(Guid userId, string client)
+        {
+            var dbContext = _dbProvider.CreateContext();
+            var user = dbContext.Users.Find(userId);
+#pragma warning disable CA1307
+            var prefs = user.DisplayPreferences.FirstOrDefault(pref => string.Equals(pref.Client, client));
+
+            if (prefs == null)
+            {
+                prefs = new DisplayPreferences(client, userId);
+                user.DisplayPreferences.Add(prefs);
+            }
+
+            return prefs;
+        }
+
+        /// <inheritdoc />
+        public void SaveChanges(DisplayPreferences preferences)
+        {
+            var dbContext = _dbProvider.CreateContext();
+            dbContext.Update(preferences);
+            dbContext.SaveChanges();
+        }
+    }
+}
diff --git a/MediaBrowser.Api/DisplayPreferencesService.cs b/MediaBrowser.Api/DisplayPreferencesService.cs
index b95ab0dfd..cca2092e9 100644
--- a/MediaBrowser.Api/DisplayPreferencesService.cs
+++ b/MediaBrowser.Api/DisplayPreferencesService.cs
@@ -148,7 +148,7 @@ namespace MediaBrowser.Api
 
             foreach (var key in request.CustomPrefs.Keys.Where(key => key.StartsWith("homesection")))
             {
-                var order = int.Parse(key.Substring("homesection".Length));
+                var order = int.Parse(key.AsSpan().Slice("homesection".Length));
                 if (!Enum.TryParse<HomeSectionType>(request.CustomPrefs[key], true, out var type))
                 {
                     type = order < 7 ? defaults[order] : HomeSectionType.None;
-- 
cgit v1.2.3