Misc Settings

NzbDrone.Core/Configuration/ConfigService.cs

@@ -149,7 +149,6 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("DownloadClientTvDirectory", value); }
         }
 
-
         public bool UseSeasonFolder
         {
             get { return GetValueBoolean("UseSeasonFolder", true); }
@@ -373,12 +372,6 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("MetadataUseBanners", value); }
         }
 
-        public string AllowedReleaseGroups
-        {
-            get { return GetValue("AllowedReleaseGroups"); }
-            set { SetValue("AllowedReleaseGroups", value); }
-        }
-
         public string PneumaticDirectory
         {
             get { return GetValue("PneumaticDirectory", String.Empty); }
@@ -479,6 +472,12 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("NzbgetRecentTvPriority", (int)value); }
         }
 
+        public string NzbRestrictions
+        {
+            get { return GetValue("NzbRestrictions", String.Empty); }
+            set { SetValue("NzbRestrictions", value); }
+        }
+
         private string GetValue(string key)
         {
             return GetValue(key, String.Empty);

NzbDrone.Core/Configuration/IConfigService.cs

@@ -61,7 +61,6 @@ namespace NzbDrone.Core.Configuration
         string PlexUsername { get; set; }
         string PlexPassword { get; set; }
         Boolean MetadataUseBanners { get; set; }
-        string AllowedReleaseGroups { get; set; }
         string PneumaticDirectory { get; set; }
         string RecycleBin { get; set; }
         int RssSyncInterval { get; set; }
@@ -77,6 +76,7 @@ namespace NzbDrone.Core.Configuration
         Int32 NzbgetPriority { get; set; }
         PriorityType NzbgetBacklogTvPriority { get; set; }
         PriorityType NzbgetRecentTvPriority { get; set; }
+        string NzbRestrictions { get; set; }
         string GetValue(string key, object defaultValue, bool persist = false);
         void SetValue(string key, string value);
         void SaveValues(Dictionary<string, object> configValues);

NzbDrone.Core/DecisionEngine/Specifications/AllowedReleaseGroupSpecification.cs

@@ -29,7 +29,10 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
         {
             _logger.Trace("Beginning release group check for: {0}", subject);
 
-            var allowed = _configService.AllowedReleaseGroups;
+            //Todo: Make this use NzbRestrictions - How should whitelist be used? Will it override blacklist or vice-versa?
+
+            //var allowed = _configService.AllowedReleaseGroups;
+            var allowed = "";
 
             if (string.IsNullOrWhiteSpace(allowed))
                 return true;