From 1dbad4bafec756b4211fbb2a0db84959926fe178 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 24 Apr 2021 20:18:45 -0600
Subject: [PATCH] Split result variables to result and message

result is for the return variable from TryAndPrint calls.
message is the text to display or save to the registry.
---
 scripts/auto_repairs.py   |  6 +++---
 scripts/wk/repairs/win.py | 25 ++++++++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/scripts/auto_repairs.py b/scripts/auto_repairs.py
index 2ddfc344..00cea939 100644
--- a/scripts/auto_repairs.py
+++ b/scripts/auto_repairs.py
@@ -38,13 +38,13 @@ class MenuEntry():
 TRY_AND_PRINT = wk.std.TryAndPrint()
 TRY_AND_PRINT.width = 50
 def placeholder_function(group, name):
-  TRY_AND_PRINT.run(f'{name}...', time.sleep, random.randint(1, 3))
-  wk.repairs.win.save_settings(group, name, done=True, result='SUCCESS')
+  result = TRY_AND_PRINT.run(f'{name}...', time.sleep, random.randint(1, 3))
+  wk.repairs.win.save_settings(group, name, result=result)
 
 def placeholder_reboot(group, name):
   print('"Rebooting" shortly...')
   time.sleep(random.randint(1, 3))
-  wk.repairs.win.save_settings(group, name, done=True, result='DONE')
+  wk.repairs.win.save_settings(group, name, done=True, message='DONE')
   raise SystemExit
 
 
diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 97223d64..150229cd 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -150,7 +150,7 @@ def get_entry_settings(group, name):
   """Get menu entry settings from the registry, returns dict."""
   key_path = fr'{AUTO_REPAIR_KEY}\{group}\{strip_colors(name)}'
   settings = {}
-  for value in ('done', 'failed', 'result', 'selected', 'skipped', 'warning'):
+  for value in ('done', 'failed', 'message', 'selected', 'skipped', 'warning'):
     try:
       settings[value.title()] = reg_read_value('HKCU', key_path, value)
     except FileNotFoundError:
@@ -310,12 +310,13 @@ def run_group(group, menu):
     # Previously ran
     if done:
       color = 'GREEN'
-      if details.get('Failed', False):
-        color = 'RED'
-      elif details.get('Warning', False):
+      if details.get('Warning', False):
         color = 'YELLOW'
+      elif details.get('Failed', False):
+        color = 'RED'
       show_data(
-        f'{name_str}...', details.get('Result', 'Unknown'), color, width=WIDTH,
+        f'{name_str}...',
+        details.get('Message', 'Unknown'), color, width=WIDTH,
         )
       continue
 
@@ -342,9 +343,19 @@ def save_selection_settings(menus):
         )
 
 
-def save_settings(group, name, **kwargs):
+def save_settings(group, name, result=None, **kwargs):
   """Save entry settings in the registry."""
   key_path = fr'{AUTO_REPAIR_KEY}\{group}\{strip_colors(name)}'
+
+  # Get values from TryAndPrint result
+  if result:
+    kwargs.update({
+      'done': True,
+      'failed': result['Failed'],
+      'message': result['Message'],
+      })
+
+  # Write values to registry
   for value_name, data in kwargs.items():
     if isinstance(data, bool):
       data = 1 if data else 0
@@ -437,7 +448,7 @@ def auto_dism(group, name):
     group, name, done=True,
     failed=result['Failed'],
     warning=not result['Failed'] and needs_reboot,
-    result=result['Message'],
+    message=result['Message'],
     )
 
   # Done