From 492cd3d99fb40ef452c3ad50d07b14bc916d4548 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Thu, 21 May 2020 17:50:51 -0400
Subject: [PATCH] configfile: Fix check for unused config sections and options

Commit c3899cef inadvertently broke the error check for unused config
options.  Add a new note_valid parameter to the config access wrappers
and use that in get_status() to fix the check.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
 klippy/configfile.py | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/klippy/configfile.py b/klippy/configfile.py
index 21f0b794..8cff4a5b 100644
--- a/klippy/configfile.py
+++ b/klippy/configfile.py
@@ -21,12 +21,13 @@ class ConfigWrapper:
         return self.printer
     def get_name(self):
         return self.section
-    def _get_wrapper(self, parser, option, default,
-                     minval=None, maxval=None, above=None, below=None):
+    def _get_wrapper(self, parser, option, default, minval=None, maxval=None,
+                     above=None, below=None, note_valid=True):
         if (default is not sentinel
             and not self.fileconfig.has_option(self.section, option)):
             return default
-        self.access_tracking[(self.section.lower(), option.lower())] = 1
+        if note_valid:
+            self.access_tracking[(self.section.lower(), option.lower())] = 1
         try:
             v = parser(self.section, option)
         except self.error as e:
@@ -49,19 +50,23 @@ class ConfigWrapper:
             raise self.error("Option '%s' in section '%s' must be below %s" % (
                 option, self.section, below))
         return v
-    def get(self, option, default=sentinel):
-        return self._get_wrapper(self.fileconfig.get, option, default)
-    def getint(self, option, default=sentinel, minval=None, maxval=None):
-        return self._get_wrapper(
-            self.fileconfig.getint, option, default, minval, maxval)
-    def getfloat(self, option, default=sentinel,
-                 minval=None, maxval=None, above=None, below=None):
+    def get(self, option, default=sentinel, note_valid=True):
+        return self._get_wrapper(self.fileconfig.get, option, default,
+                                 note_valid=note_valid)
+    def getint(self, option, default=sentinel, minval=None, maxval=None,
+               note_valid=True):
+        return self._get_wrapper(self.fileconfig.getint, option, default,
+                                 minval, maxval, note_valid=note_valid)
+    def getfloat(self, option, default=sentinel, minval=None, maxval=None,
+                 above=None, below=None, note_valid=True):
         return self._get_wrapper(self.fileconfig.getfloat, option, default,
-                                 minval, maxval, above, below)
-    def getboolean(self, option, default=sentinel):
-        return self._get_wrapper(self.fileconfig.getboolean, option, default)
-    def getchoice(self, option, choices, default=sentinel):
-        c = self.get(option, default)
+                                 minval, maxval, above, below,
+                                 note_valid=note_valid)
+    def getboolean(self, option, default=sentinel, note_valid=True):
+        return self._get_wrapper(self.fileconfig.getboolean, option, default,
+                                 note_valid=note_valid)
+    def getchoice(self, option, choices, default=sentinel, note_valid=True):
+        c = self.get(option, default, note_valid=note_valid)
         if c not in choices:
             raise error("Choice '%s' for option '%s' in section '%s'"
                         " is not a valid choice" % (c, option, self.section))
@@ -252,7 +257,7 @@ class PrinterConfig:
         for section in config.get_prefix_sections(''):
             self.status_info[section.get_name()] = section_status = {}
             for option in section.get_prefix_options(''):
-                section_status[option] = section.get(option)
+                section_status[option] = section.get(option, note_valid=False)
     def get_status(self, eventtime):
         return {'config': self.status_info}
     # Autosave functions