Merge pull request #4 from karaktaka/fix_empty_station_name

Add some failesafes
karaktaka · Feb 4, 2024 · df288d1 · df288d1
2 parents b6a94da + 53ded4c
commit df288d1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ jobs:
         pip install flake8 black
     - name: Lint with flake8
       run: |
-        flake8 netatmo-client --count --max-line-length=127 --statistics
+        flake8 netatmo-client --count --max-line-length=120 --statistics
     - name: Lint with black
       run: |
         black -t py311 -l 120 --check --diff netatmo-client
diff --git a/netatmo-client/netatmo_influx.py b/netatmo-client/netatmo_influx.py
@@ -120,6 +120,13 @@ def get_authorization() -> Tuple[NetatmoOAuth2, str]:
             exit(1)
 
 
+def safe_list_get(input_list, idx, default=None):
+    try:
+        return input_list[idx]
+    except IndexError:
+        return default
+
+
 if __name__ == "__main__":
     running = True
     interval = None
@@ -203,24 +210,29 @@ def get_authorization() -> Tuple[NetatmoOAuth2, str]:
                         module_data = []
 
                         station = weatherData.get_station(station_id)
-                        station_name = station["station_name"]
-                        station_module_name = station["module_name"]
+                        station_name = station.get("station_name", "Unknown")
+                        station_module_name = station.get("module_name", "Unknown")
+                        station_long_lat = station.get("place", {}).get("location", [])
                         log.debug(f"Station: {station}")
                         log.debug(f"Station Name: {station_name}")
                         log.debug(f"Station Module Name: {station_module_name}")
 
-                        altitude = station["place"]["altitude"]
-                        country = station["place"]["country"]
-                        timezone = station["place"]["timezone"]
-                        longitude = station["place"]["location"][0]
-                        latitude = station["place"]["location"][1]
+                        altitude = station.get("place", {}).get("altitude")
+                        country = station.get("place", {}).get("country")
+                        timezone = station.get("place", {}).get("timezone")
+                        longitude = safe_list_get(station_long_lat, 0)
+                        latitude = safe_list_get(station_long_lat, 1)
 
                         for module_id, moduleData in weatherData.get_last_data(station_id).items():
                             module = weatherData.get_module(module_id)
                             log.debug(f"Module: {module}")
-                            module_name = module["module_name"] if module else station["module_name"]
+                            module_name = module.get("module_name") if module else station.get("module_name")
                             log.debug(f"Module Name: {module_name}")
-                            module_data_type = module["data_type"][0] if module else station["data_type"][0]
+                            module_data_type = (
+                                safe_list_get(module.get("data_type"), 0)
+                                if module
+                                else safe_list_get(station.get("data_type"), 0)
+                            )
                             log.debug(f"Module Data: {moduleData}")
 
                             if not module: