Merge pull request #133 from SpudGunMan/lab

Lab Enhancments

README.md

@@ -213,7 +213,8 @@ This uses USA: SAME, FIPS, ZIP code to locate the alerts in the feed. By default
 ```ini
 eAlertBroadcastEnabled = False # Goverment IPAWS/CAP Alert Broadcast
 eAlertBroadcastCh = 2,3 # Goverment Emergency IPAWS/CAP Alert Broadcast Channels
-ignoreFEMAtest = True # Ignore any headline that includes the word Test
+ignoreFEMAenable = True # Ignore any headline that includes followig word list
+ignoreFEMAwords = test,exercise
 # comma separated list of codes (e.g., SAME,FIPS,ZIP) trigger local alert.
 # find your SAME https://www.weather.gov/nwr/counties
 mySAME = 053029,053073
@@ -455,6 +456,7 @@ I used ideas and snippets from other responder bots and want to call them out!
 - **PiDiBi**: For looking at test functions and other suggestions like wxc, CPU use, and alerting ideas.
 - **WH6GXZ nurse dude**: For bashing on installer
 - **Josh**: For more bashing on installer!
+- **dj505**: trying it on windows!
 - **Cisien, bitflip, **Woof**, **propstg**, **Josh** and Hailo1999**: For testing and feature ideas on Discord and GitHub.
 - **Meshtastic Discord Community**: For tossing out ideas and testing code.
 

config.template

@@ -147,8 +147,9 @@ eAlertBroadcastEnabled = False
 eAlertBroadcastCh = 2
 
 # FEMA Alert Broadcast Settings
-# Ignore any headline that includes the word Test
-ignoreFEMAtest = True
+#  Enable Ignore any headline that includes followig word list
+ignoreFEMAenable = True
+ignoreFEMAwords = test,exercise
 # comma separated list of codes (e.g., SAME,FIPS,ZIP) trigger local alert.
 # find your SAME https://www.weather.gov/nwr/counties
 mySAME = 053029,053073

modules/locationdata.py

@@ -532,10 +532,11 @@ def getIpawsAlert(lat=0, lon=0, shortAlerts = False):
             # check if the alert is for the current location, if wanted keep alert
             if (sameVal in mySAME) or (geocode_value in mySAME):
                 # ignore the FEMA test alerts
-                if ignoreFEMAtest:
-                    if "Test" in headline:
-                        logger.debug(f"System: Ignoring FEMA Test Alert: {headline} for {areaDesc}")
-                        continue
+                if ignoreFEMAenable:
+                    for word in ignoreFEMAwords:
+                        if word.lower() in headline.lower():
+                            logger.debug(f"System: Ignoring FEMA Alert: {headline} containing {word} at {areaDesc}")
+                            continue
 
                 # add to alerts list
                 alerts.append({

modules/log.py

@@ -69,14 +69,14 @@ logger.addHandler(stdout_handler)
 
 if syslog_to_file:
     # Create file handler for logging to a file
-    file_handler_sys = TimedRotatingFileHandler('logs/meshbot.log', when='midnight', backupCount=log_backup_count)
+    file_handler_sys = TimedRotatingFileHandler('logs/meshbot.log', when='midnight', backupCount=log_backup_count, encoding='utf-8')
     file_handler_sys.setLevel(LOGGING_LEVEL) # DEBUG used by default for system logs to disk
     file_handler_sys.setFormatter(plainFormatter(logFormat))
     logger.addHandler(file_handler_sys)
 
 if log_messages_to_file:
     # Create file handler for logging to a file
-    file_handler = TimedRotatingFileHandler('logs/messages.log', when='midnight', backupCount=log_backup_count)
+    file_handler = TimedRotatingFileHandler('logs/messages.log', when='midnight', backupCount=log_backup_count, encoding='utf-8')
     file_handler.setLevel(logging.INFO) # INFO used for messages to disk
     file_handler.setFormatter(logging.Formatter(msgLogFormat))
     msgLogger.addHandler(file_handler)

modules/settings.py

@@ -36,7 +36,7 @@ config = configparser.ConfigParser()
 config_file = "config.ini"
 
 try:
-    config.read(config_file)
+    config.read(config_file, encoding='utf-8')
 except Exception as e:
     print(f"System: Error reading config file: {e}")
 
@@ -257,7 +257,8 @@ try:
     numWxAlerts = config['location'].getint('NOAAalertCount', 2) # default 2 alerts
     enableExtraLocationWx = config['location'].getboolean('enableExtraLocationWx', False) # default False
     ipawsPIN = config['location'].get('ipawsPIN', '000000') # default 000000
-    ignoreFEMAtest = config['location'].getboolean('ignoreFEMAtest', True) # default True
+    ignoreFEMAenable = config['location'].getboolean('ignoreFEMAenable', True) # default True
+    ignoreFEMAwords = config['location'].get('ignoreFEMAwords', 'test,exercise').split(',') # default test,exercise
     wxAlertBroadcastChannel = config['location'].get('wxAlertBroadcastCh', '2').split(',') # default Channel 2
     emergencyAlertBroadcastCh = config['location'].get('eAlertBroadcastCh', '2').split(',') # default Channel 2