Add geolocation not configured logging

zim514 · Dec 30, 2023 · 9571fcb · 9571fcb
1 parent 55b1209
commit 9571fcb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 67 deletions.
diff --git a/.github/workflows/increment-version.yml b/.github/workflows/increment-version.yml
diff --git a/script.service.hue/addon.xml b/script.service.hue/addon.xml
@@ -1,4 +1,4 @@
-<addon id="script.service.hue" name="Hue Service" provider-name="zim514" version="1.5.2">
+<addon id="script.service.hue" name="Hue Service" provider-name="zim514" version="1.5.3">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.requests" version="2.27.1"/>

diff --git a/script.service.hue/resources/lib/hue.py b/script.service.hue/resources/lib/hue.py
@@ -99,6 +99,7 @@ def make_api_request(self, method, resource, discovery=False, **kwargs):
                     return 500
                 else:
                     xbmc.log(f"[script.service.hue] v2 make_request: HTTPError: {x}\nResponse: {x.response.text}")
+                    reporting.process_exception(f"Response: {x.response.text}, Exception: {x}", logging=True)
                     return x.response.status_code
             except (Timeout, json.JSONDecodeError) as x:
                 xbmc.log(f"[script.service.hue] v2 make_request: Timeout/JSONDecodeError: Response: {x.response.text}\n{x}")
@@ -313,6 +314,10 @@ def update_sunset(self):
         geolocation = self.make_api_request("GET", "geolocation")  # TODO: Support cases where geolocation is not configured on bridge.
         xbmc.log(f"[script.service.hue] v2 update_sunset(): geolocation: {geolocation}")
         sunset_str = self.search_dict(geolocation, "sunset_time")
+        if sunset_str is None:
+            reporting.process_exception(f"Sunset time not found in geolocation response: {geolocation}", logging=True)
+            return
+
         self.sunset = convert_time(sunset_str)
         xbmc.log(f"[script.service.hue] v2 update_sunset(): sunset: {self.sunset}")
 

diff --git a/script.service.hue/resources/lib/reporting.py b/script.service.hue/resources/lib/reporting.py
@@ -17,16 +17,18 @@
 from .language import get_string as _
 
 
-def process_exception(exc, level="critical", error=""):
+def process_exception(exc, level="critical", error="", logging=False):
     xbmc.log(f"[script.service.hue] *** EXCEPTION ***:  Type: {type(exc)},\n Exception: {exc},\n Error: {error},\n Traceback: {traceback.format_exc()}")
+    if ADDON.getSettingBool("error_reporting"):
+        if _error_report_dialog(exc):
+            _report_error(level, error, exc, logging)
 
+'''
     if exc is RequestException:
         xbmc.log("[script.service.hue] RequestException, not reporting to rollbar")
         notification(_("Hue Service"), _("Connection Error"), icon=xbmcgui.NOTIFICATION_ERROR)
     else:
-        if ADDON.getSettingBool("error_reporting"):
-            if _error_report_dialog(exc):
-                _report_error(level, error, exc)
+'''
 
 
 def _error_report_dialog(exc):
@@ -38,7 +40,7 @@ def _error_report_dialog(exc):
     return response
 
 
-def _report_error(level="critical", error="", exc=""):
+def _report_error(level="critical", error="", exc="", logging=False):
     if any(val in ADDONVERSION for val in ["dev", "alpha", "beta"]):
         env = "dev"
     else:
@@ -52,4 +54,7 @@ def _report_error(level="critical", error="", exc=""):
         'exc': exc
     }
     rollbar.init(ROLLBAR_API_KEY, capture_ip=False, code_version="v" + ADDONVERSION, root=ADDONPATH, scrub_fields='bridgeUser, bridgeIP, bridge_user, bridge_ip, server.host', environment=env)
-    rollbar.report_exc_info(sys.exc_info(), extra_data=data, level=level)
+    if logging:
+        rollbar.report_message(exc, extra_data=data, level=level)
+    else:
+        rollbar.report_exc_info(sys.exc_info(), extra_data=data, level=level)