Implement parsing of new config options

diff --git a/infoex-autowx.py b/infoex-autowx.py
index d9adcff65270cd25d9e1b43a68c910eb1eb74cf8..a1bcf004ef9900b42f33196a52a4ff7fa632bd69 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -128,9 +128,35 @@ def setup_config(config):
             LOG.critical("%s is not a valid timezone", tz)
             sys.exit(1)
 
             LOG.critical("%s is not a valid timezone", tz)
             sys.exit(1)
 

+        # HN24
+        if 'hn24' in config['station']:
+            if config['station']['hn24'] not in ['true', 'false']:
+                raise ValueError("hn24 must be either 'true' or 'false'")
+
+            if config['station']['hn24'] == "true":
+                station['hn24'] = True
+            else:
+                station['hn24'] = False
+        else:
+            # default to False
+            station['hn24'] = False
+
+        # Wind mode
+        if 'wind_mode' in config['station']:
+            if config['station']['wind_mode'] not in ['normal', 'average']:
+                raise ValueError("wind_mode must be either 'normal' or 'average'")
+
+            station['wind_mode'] = config['station']['wind_mode']
+        else:
+            # default to False
+            station['wind_mode'] = "normal"
+

     except KeyError as err:
         LOG.critical("%s not defined in configuration file", err)
         sys.exit(1)
     except KeyError as err:
         LOG.critical("%s not defined in configuration file", err)
         sys.exit(1)

+    except ValueError as err:
+        LOG.critical("%s", err)
+        sys.exit(1)

 
     # all sections/values present in config file, final sanity check
     try:
 
     # all sections/values present in config file, final sanity check
     try: