Merge pull request #6 from jm-73/develop

Handle unknown alert codes
sander1988 · Aug 20, 2019 · 61e147e · 61e147e
2 parents 79b9946 + 6b6e651
commit 61e147e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,12 +2,22 @@
 # .gitignore                                                #
 #############################################################
 
+.git
+.gitignore
+
+# Python cache
+__pycache__/
+pyIndego/__pycache__/
+
 # Test script
 config.py
 test_pyIndego.py
 
 # Log files
 *.log
 
-# Python cache
-__pycache__/
+# Python wheel build package
+build/
+dist/
+pyIndego.egg-info/
+_build.cmd
diff --git a/pyIndego/__init__.py b/pyIndego/__init__.py
@@ -813,28 +813,43 @@ def AlertsDescription(self):
             if (tmp_cnt == 1):
                 self._alert1_time  = self.ConvertBoschDateTime(alert['date']) 
                 self._alert1_error = alert['error_code']
-                self._alert1_friendly_description = ALERT_ERROR_CODE[tmp_code]
+                #self._alert1_friendly_description = ALERT_ERROR_CODE[tmp_code]
+                self._alert1_friendly_description = self.FriendlyAlertErrorCode(tmp_code)
                 self._alert2_time  = None
                 self._alert2_error = None
                 self._alert3_name  = None
                 self._alert3_error = None
             if (tmp_cnt == 2):
                 self._alert2_time  = self.ConvertBoschDateTime(alert['date'])
                 self._alert2_error = alert['error_code']
-                self._alert2_friendly_description = ALERT_ERROR_CODE[tmp_code]
+                #self._alert2_friendly_description = ALERT_ERROR_CODE[tmp_code]
+                self._alert2_friendly_description = self.FriendlyAlertErrorCode(tmp_code)
                 self._alert3_time  = None
                 self._alert3_error = None
             if (tmp_cnt == 3):
                 self._alert3_time  = self.ConvertBoschDateTime(alert['date'])
                 self._alert3_error = alert['error_code']
-                self._alert3_friendly_description = ALERT_ERROR_CODE[tmp_code]
-            print(tmp_cnt, alert['date'], alert['error_code'], alert['headline'])
-            tmp_code = alert['error_code']
-            print("Friendly Description: " + ALERT_ERROR_CODE[tmp_code])
+                #self._alert3_friendly_description = ALERT_ERROR_CODE[tmp_code]
+                self._alert3_friendly_description = self.FriendlyAlertErrorCode(tmp_code)
+            #print(tmp_cnt, alert['date'], alert['error_code'], alert['headline'])
+            #tmp_code = alert['error_code']
+            #print("Friendly Description: " + ALERT_ERROR_CODE[tmp_code])
             #ALERT_ERROR_CODE = {
             #alerts_list.update(date = alert['date'])
         return self._alerts
 
+    def FriendlyAlertErrorCode(self, tmp):
+        tmp_val = tmp
+
+        if str(tmp_val) in ALERT_ERROR_CODE.keys():
+            _LOGGER.debug(f"Alert value in dict = {tmp_val}")
+            alert_description = ALERT_ERROR_CODE[tmp_val]
+            _LOGGER.debug(f"Mower state description: {alert_description}")
+        else:
+            _LOGGER.debug(f"Alert value not in dict = {tmp_val}")
+            alert_description = "Not in database!"
+        return alert_description
+
     def ConvertBoschDateTime(self, boshdatetime):
         return boshdatetime[0:10] + " " + boshdatetime[11:16]
 

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pyIndego",
-    version="0.7.4",
+    version="0.7.5",
     author="jm-73",
     author_email="[email protected]",
     description="API for Bosch Indego mower",