Fix config issues + minor refactor

Author: lambdadog

config.json

@@ -3,5 +3,5 @@
   "again_button_name": "Fail",
   "good_button_name": "Pass",
   "again_button_textcolor": "#000000",
-  "good_button_textcolor": "#000000",
+  "good_button_textcolor": "#000000"
 }

config.py

@@ -0,0 +1,58 @@
+# This should maybe be a class, but there should never be multiple
+# instances of it, really.
+
+from .logger import log
+
+from aqt import mw
+
+_config = {
+    'toggle_names_textcolors': "0",
+    'again_button_name': "Fail",
+    'good_button_name': "Pass",
+    'again_button_textcolor': "#000000",
+    'good_button_textcolor': "#000000"
+}
+
+# Required asserts to make config work properly
+assert(not any(isinstance(val, dict) for val in _config.values()))
+assert(all(isinstance(val, str) for val in _config.values()))
+
+def as_str(key):
+    return _config[key]
+def as_bool(key):
+    return bool(int(_config[key]))
+
+def update(new_kv):
+    for k in new_kv.keys():
+        if k in _config:
+            _config[k] = new_kv[k]
+        else:
+            raise KeyError("Key '%s' does not exist in config.".format(k))
+
+    save()
+
+def copy():
+    return _config.copy()
+
+def load():
+    try:
+        fs_config = mw.addonManager.getConfig(__name__)
+
+        log.info(fs_config)
+        log.info(_config)
+        # We don't reuse update here because we want to silently
+        # ignore removed keys in newer versions
+        for k in _config.keys():
+            try:
+                _config[k] = fs_config[k]
+            except:
+                ()
+    except:
+        log.warn("Failed to load config. Writing.")
+
+    log.info(_config)
+
+    save()
+
+def save():
+    mw.addonManager.writeConfig(__name__, _config)

configuration_menu.py

@@ -1,13 +1,15 @@
 from aqt import mw
 from aqt.qt import *
 
+from . import config
+
 from . import passfail2
 from . import build_info
 
 class SettingsDialog(QDialog):
     def __init__(self, parent=None):
         super(SettingsDialog, self).__init__(parent)
-        self.preview_config = read_config()
+        self.preview_config = config.copy()
         self.error_label = None
         self.mainWindow()
 
@@ -162,15 +164,11 @@ def colorPick(self, button_number):
                 self.good_button_textcolor.setText(hex_color)
 
     def prepopulate_fields(self):
-        config_from_json = read_config()
-
-        self.toggle_names_textcolors.setChecked(bool(int(config_from_json['toggle_names_textcolors'])))
-        self.again_button_name.setText(config_from_json['again_button_name'])
-        self.good_button_name.setText(config_from_json['good_button_name'])
-        self.again_button_textcolor.setText(config_from_json['again_button_textcolor'])
-        self.good_button_textcolor.setText(config_from_json['good_button_textcolor'])
-
-        return config_from_json
+        self.toggle_names_textcolors.setChecked(bool(int(self.preview_config['toggle_names_textcolors'])))
+        self.again_button_name.setText(self.preview_config['again_button_name'])
+        self.good_button_name.setText(self.preview_config['good_button_name'])
+        self.again_button_textcolor.setText(self.preview_config['again_button_textcolor'])
+        self.good_button_textcolor.setText(self.preview_config['good_button_textcolor'])
 
     def update_preview_config(self):
         if self.current_config_is_valid():
@@ -199,7 +197,7 @@ def update_preview_buttons(self):
     def write_config(self):
         if self.current_config_is_valid():
             self.update_preview_config()
-            mw.addonManager.writeConfig(__name__, self.preview_config)
+            config.update(self.preview_config)
             self.close_config_window()
         else:
             self.error_label.show()

passfail2.py

@@ -31,7 +31,7 @@
         def point_version():
             return int(version.split(".")[-1])
 
-# from . import button_color
+from . import config
 from . import configuration_menu
 
 from anki.hooks import wrap
@@ -50,40 +50,30 @@ def point_version():
 else:
     from anki.lang import _
 
-# Setup config
-toggle_names_textcolors = False
-again_button_name = "Fail"
-good_button_name = "Pass"
-again_button_textcolor = ""
-good_button_textcolor = ""
-
-try:
-    config = mw.addonManager.getConfig(__name__)
-    toggle_names_textcolors = bool(int(config['toggle_names_textcolors']))
-    again_button_name = config['again_button_name']
-    good_button_name = config['good_button_name']
-    again_button_textcolor = config['again_button_textcolor']
-    good_button_textcolor = config['good_button_textcolor']
-except Exception as err:
-    log.warn("Failed to import configuration, using defaults: %s", err)
-
 # Hooks
 def pf2_hook_replace_buttons(
         buttons_tuple, # type: tuple[tuple[int, str], ...]
         reviewer,      # type: Reviewer
         card           # type: Card
 ): # type: (...) -> tuple[tuple[int,str], ...]
-    if toggle_names_textcolors:
-        return (
-            (1, f"<font color='{again_button_textcolor}'>{again_button_name}</font>"),
-            (reviewer._defaultEase(), f"<font color='{good_button_textcolor}'>{good_button_name}</font>")
+    again_text = "Fail"
+    good_text = "Pass"
+
+    if config.as_bool('toggle_names_textcolors'):
+        again_text = "<font color='{}'>{}</font>".format(
+            config.as_str('again_button_textcolor'),
+            config.as_str('again_button_name')
         )
-    else:
-        return (
-            (1, "Fail"),
-            (reviewer._defaultEase(), "Pass")
+        good_text = "<font color='{}'>{}</font>".format(
+            config.as_str('good_button_textcolor'),
+            config.as_str('good_button_name')
         )
 
+    return (
+        (1, again_text),
+        (reviewer._defaultEase(), good_text)
+    )
+
 def pf2_hook_remap_answer_ease(
         ease_tuple, # type: tuple[bool, Literal[1, 2, 3, 4]]
         reviewer,   # type: Reviewer
@@ -137,6 +127,7 @@ def pf2_fix_pass_title(
 def init():
     version = point_version()
 
+    config.load()
     configuration_menu.configuration_menu_init()
 
     # Answer button list