Merge pull request #356 from tidusjar/dev

1.8.2
Ombi-app · Jun 22, 2016 · 514553f · 514553f
2 parents 8dd399b + 6bf7735
commit 514553f
Show file tree

Hide file tree

Showing 31 changed files with 3,967 additions and 3,758 deletions.
diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
@@ -1,77 +1,78 @@
-#region Copyright
-// /************************************************************************
-//    Copyright (c) 2016 Jamie Rees
-//    File: PlexRequestSettings.cs
-//    Created By: Jamie Rees
-//   
-//    Permission is hereby granted, free of charge, to any person obtaining
-//    a copy of this software and associated documentation files (the
-//    "Software"), to deal in the Software without restriction, including
-//    without limitation the rights to use, copy, modify, merge, publish,
-//    distribute, sublicense, and/or sell copies of the Software, and to
-//    permit persons to whom the Software is furnished to do so, subject to
-//    the following conditions:
-//   
-//    The above copyright notice and this permission notice shall be
-//    included in all copies or substantial portions of the Software.
-//   
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//  ************************************************************************/
-#endregion
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-
-namespace PlexRequests.Core.SettingModels
-{
-    public class PlexRequestSettings : Settings
-    {
-        public int Port { get; set; }
-        public string BaseUrl { get; set; }
-        public bool SearchForMovies { get; set; }
-        public bool SearchForTvShows { get; set; }
-        public bool SearchForMusic { get; set; }
-        public bool RequireMovieApproval { get; set; }
-        public bool RequireTvShowApproval { get; set; }
-        public bool RequireMusicApproval { get; set; }
-        public bool UsersCanViewOnlyOwnRequests { get; set; }
-        public bool UsersCanViewOnlyOwnIssues { get; set; }
-        public int WeeklyRequestLimit { get; set; }
-        public string NoApprovalUsers { get; set; }
-        public bool CollectAnalyticData { get; set; }
-
-        /// <summary>
-        /// The CSS name of the theme we want
-        /// </summary>
-        public string ThemeName { get; set; }
-
-        public string ApiKey { get; set; }
-
-        [JsonIgnore]
-        public List<string> ApprovalWhiteList
-        {
-            get
-            {
-                var users = new List<string>();
-                if (string.IsNullOrEmpty(NoApprovalUsers))
-                {
-                    return users;
-                }
-
-                var splitUsers = NoApprovalUsers.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                foreach (var user in splitUsers)
-                {
-                    if (!string.IsNullOrWhiteSpace(user))
-                        users.Add(user.Trim());
-                }
-                return users;
-            }
-        }
-    }
-}
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: PlexRequestSettings.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
+namespace PlexRequests.Core.SettingModels
+{
+    public class PlexRequestSettings : Settings
+    {
+        public int Port { get; set; }
+        public string BaseUrl { get; set; }
+        public bool SearchForMovies { get; set; }
+        public bool SearchForTvShows { get; set; }
+        public bool SearchForMusic { get; set; }
+        public bool RequireMovieApproval { get; set; }
+        public bool RequireTvShowApproval { get; set; }
+        public bool RequireMusicApproval { get; set; }
+        public bool UsersCanViewOnlyOwnRequests { get; set; }
+        public bool UsersCanViewOnlyOwnIssues { get; set; }
+        public int WeeklyRequestLimit { get; set; }
+        public string NoApprovalUsers { get; set; }
+        public bool CollectAnalyticData { get; set; }
+        public bool IgnoreNotifyForAutoApprovedRequests { get; set; }
+
+        /// <summary>
+        /// The CSS name of the theme we want
+        /// </summary>
+        public string ThemeName { get; set; }
+
+        public string ApiKey { get; set; }
+
+        [JsonIgnore]
+        public List<string> ApprovalWhiteList
+        {
+            get
+            {
+                var users = new List<string>();
+                if (string.IsNullOrEmpty(NoApprovalUsers))
+                {
+                    return users;
+                }
+
+                var splitUsers = NoApprovalUsers.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var user in splitUsers)
+                {
+                    if (!string.IsNullOrWhiteSpace(user))
+                        users.Add(user.Trim());
+                }
+                return users;
+            }
+        }
+    }
+}
diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
@@ -57,10 +57,6 @@ public string SetupDb(string urlBase)
             var version = CheckSchema();
             if (version > 0)
             {
-                if (version > 1700 && version <= 1799)
-                {
-                    MigrateToVersion1700();
-                }
                 if (version > 1799 && version <= 1800)
                 {
                     MigrateToVersion1800();

diff --git a/PlexRequests.Helpers.Tests/CookieHelperTests.cs b/PlexRequests.Helpers.Tests/CookieHelperTests.cs
@@ -0,0 +1,52 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: DateTimeHelperTests.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+using System.Collections.Generic;
+
+using NUnit.Framework;
+
+namespace PlexRequests.Helpers.Tests
+{
+    [TestFixture]
+    public class CookieHelperTests
+    {
+        [TestCaseSource(nameof(GetAnalyticsClientId))]
+        public string TestGetAnalyticsClientId(Dictionary<string,string> cookies)
+        {
+            return CookieHelper.GetAnalyticClientId(cookies);
+        }
+
+        private static IEnumerable<TestCaseData> GetAnalyticsClientId
+        {
+            get
+            {
+                yield return new TestCaseData(new Dictionary<string, string>()).Returns(string.Empty);
+                yield return new TestCaseData(new Dictionary<string, string> { { "_ga", "GA1.1.306549087.1464005217" } }).Returns("306549087.1464005217");
+                yield return new TestCaseData(new Dictionary<string,string> { {"_ga", "GA1.1.306549087" } }).Returns(string.Empty);
+            }
+        }
+    }
+}