From 8807e80d0a04cf0c13a2113fab9917065cb0fdd9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 20 Dec 2014 01:06:27 -0500
Subject: start using user policy

---
 MediaBrowser.Model/Configuration/UserConfiguration.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Model/Configuration/UserConfiguration.cs')

diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index f0a27a2b9..01f90a0ba 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -42,6 +42,10 @@ namespace MediaBrowser.Model.Configuration
         /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
         public bool IsHidden { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is disabled.
+        /// </summary>
+        /// <value><c>true</c> if this instance is disabled; otherwise, <c>false</c>.</value>
         public bool IsDisabled { get; set; }
 
         public bool DisplayMissingEpisodes { get; set; }
@@ -74,9 +78,6 @@ namespace MediaBrowser.Model.Configuration
 
         public string[] OrderedViews { get; set; }
 
-        public bool SyncConnectName { get; set; }
-        public bool SyncConnectImage { get; set; }
-
         public bool IncludeTrailersInSuggestions { get; set; }
 
         public bool EnableCinemaMode { get; set; }
@@ -87,7 +88,9 @@ namespace MediaBrowser.Model.Configuration
 
         public string[] LatestItemsExcludes { get; set; }
         public string[] BlockedTags { get; set; }
-   
+
+        public bool ValuesMigratedToPolicy { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
@@ -110,8 +113,6 @@ namespace MediaBrowser.Model.Configuration
             ExcludeFoldersFromGrouping = new string[] { };
             DisplayCollectionsView = true;
 
-            SyncConnectName = true;
-            SyncConnectImage = true;
             IncludeTrailersInSuggestions = true;
             EnableCinemaMode = true;
             EnableUserPreferenceAccess = true;
-- 
cgit v1.2.3


From fef1d16cec5d3bf22f5efee21595480ca1aaa602 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 22 Dec 2014 02:00:40 -0500
Subject: fix user policy serialization

---
 MediaBrowser.Model/Configuration/UserConfiguration.cs      |  2 +-
 MediaBrowser.Server.Implementations/Library/UserManager.cs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Model/Configuration/UserConfiguration.cs')

diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 01f90a0ba..9e33c1c36 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -89,7 +89,7 @@ namespace MediaBrowser.Model.Configuration
         public string[] LatestItemsExcludes { get; set; }
         public string[] BlockedTags { get; set; }
 
-        public bool ValuesMigratedToPolicy { get; set; }
+        public bool HasMigratedToPolicy { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 7b95ab681..1d58ad074 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -293,7 +293,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private async Task DoPolicyMigration(User user)
         {
-            if (!user.Configuration.ValuesMigratedToPolicy)
+            if (!user.Configuration.HasMigratedToPolicy)
             {
                 user.Policy.AccessSchedules = user.Configuration.AccessSchedules;
                 user.Policy.BlockedChannels = user.Configuration.BlockedChannels;
@@ -314,7 +314,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
                 await UpdateUserPolicy(user.Id.ToString("N"), user.Policy);
 
-                user.Configuration.ValuesMigratedToPolicy = true;
+                user.Configuration.HasMigratedToPolicy = true;
                 await UpdateConfiguration(user, user.Configuration, true).ConfigureAwait(false);
             }
         }
@@ -800,7 +800,7 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 lock (_policySyncLock)
                 {
-                    return (UserPolicy)_jsonSerializer.DeserializeFromFile(typeof(UserPolicy), path);
+                    return (UserPolicy)_xmlSerializer.DeserializeFromFile(typeof(UserPolicy), path);
                 }
             }
             catch (FileNotFoundException)
@@ -842,7 +842,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             lock (_policySyncLock)
             {
-                _jsonSerializer.SerializeToFile(userPolicy, path);
+                _xmlSerializer.SerializeToFile(userPolicy, path);
                 user.Policy = userPolicy;
             }
 
@@ -881,7 +881,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private string GetPolifyFilePath(User user)
         {
-            return Path.Combine(user.ConfigurationDirectoryPath, "policy.json");
+            return Path.Combine(user.ConfigurationDirectoryPath, "policy.xml");
         }
 
         private string GetConfigurationFilePath(User user)
-- 
cgit v1.2.3