Fix/bw list default setting (#8687)

* post BW_list as an array instead of joined string like for qualities * join/split BW_list on save/load config.ini to always have a list obj * tweak list array --------- Co-authored-by: miigotu <[email protected]> Co-authored-by: BKSteve <[email protected]>
SickChill · Feb 1, 2024 · d3e270c · d3e270c
1 parent 42670d9
commit d3e270c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/sickchill/gui/slick/js/core.js b/sickchill/gui/slick/js/core.js
@@ -4019,6 +4019,14 @@ const SICKCHILL = {
                 $('#bestQualities option:selected').each((i, d) => {
                     bestQualArray.push($(d).val());
                 });
+                const grpwhitelistArray = [];
+                const grpblacklistArray = [];
+                $('#white option').each((i, d) => {
+                    grpwhitelistArray.push($(d).val());
+                });
+                $('#black option').each((i, d) => {
+                    grpblacklistArray.push($(d).val());
+                });
                 generateBlackWhiteList(); // eslint-disable-line no-undef
                 $.post(scRoot + '/config/general/saveAddShowDefaults', {
                     defaultStatus: $('#statusSelect').val(),
@@ -4029,8 +4037,8 @@ const SICKCHILL = {
                     anime: $('#anime').is(':checked'),
                     scene: $('#scene').is(':checked'),
                     defaultStatusAfter: $('#statusSelectAfter').val(),
-                    whitelist: $('#whitelist').val(),
-                    blacklist: $('#blacklist').val(),
+                    whitelist: grpwhitelistArray,
+                    blacklist: grpblacklistArray,
                 });
 
                 $(this).attr('disabled', true);

diff --git a/sickchill/start.py b/sickchill/start.py
@@ -263,8 +263,8 @@ def path_leaf(path):
         settings.ANIME_DEFAULT = check_setting_bool(settings.CFG, "General", "anime_default")
         settings.SCENE_DEFAULT = check_setting_bool(settings.CFG, "General", "scene_default")
 
-        settings.WHITELIST_DEFAULT = check_setting_str(settings.CFG, "General", "whitelist_default")
-        settings.BLACKLIST_DEFAULT = check_setting_str(settings.CFG, "General", "blacklist_default")
+        settings.WHITELIST_DEFAULT = check_setting_str(settings.CFG, "General", "whitelist_default").split(",")
+        settings.BLACKLIST_DEFAULT = check_setting_str(settings.CFG, "General", "blacklist_default").split(",")
 
         settings.PROVIDER_ORDER = check_setting_str(settings.CFG, "General", "provider_order").split()
 
@@ -1213,8 +1213,8 @@ def save_config():
                 "indexer_timeout": int(settings.INDEXER_TIMEOUT),
                 "anime_default": int(settings.ANIME_DEFAULT),
                 "scene_default": int(settings.SCENE_DEFAULT),
-                "whitelist_default": settings.WHITELIST_DEFAULT,
-                "blacklist_default": settings.BLACKLIST_DEFAULT,
+                "whitelist_default": ",".join(settings.WHITELIST_DEFAULT),
+                "blacklist_default": ",".join(settings.BLACKLIST_DEFAULT),
                 "provider_order": " ".join(settings.PROVIDER_ORDER),
                 "version_notify": int(settings.VERSION_NOTIFY),
                 "auto_update": int(settings.AUTO_UPDATE),

diff --git a/sickchill/views/config/general.py b/sickchill/views/config/general.py
@@ -40,8 +40,8 @@ def saveAddShowDefaults(self):
         settings.STATUS_DEFAULT = int(self.get_body_argument("defaultStatus", settings.STATUS_DEFAULT_AFTER))
         settings.STATUS_DEFAULT_AFTER = int(self.get_body_argument("defaultStatusAfter", settings.STATUS_DEFAULT_AFTER))
 
-        settings.WHITELIST_DEFAULT = self.get_body_arguments("whitelist")
-        settings.BLACKLIST_DEFAULT = self.get_body_arguments("blacklist")
+        settings.WHITELIST_DEFAULT = self.get_body_arguments("whitelist[]")
+        settings.BLACKLIST_DEFAULT = self.get_body_arguments("blacklist[]")
 
         settings.SEASON_FOLDERS_DEFAULT = config.checkbox_to_value(self.get_body_argument("defaultSeasonFolders", settings.SEASON_FOLDERS_DEFAULT))
         settings.SUBTITLES_DEFAULT = config.checkbox_to_value(self.get_body_argument("subtitles", settings.SUBTITLES_DEFAULT))