add more data checks

droso-hass · Dec 18, 2022 · d3701ea · d3701ea
1 parent 5f9fa3d
commit d3701ea
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/idfm_api/models.py b/idfm_api/models.py
@@ -109,12 +109,12 @@ class TrafficData:
     def from_json(data: dict):
         try:
             dir = data["MonitoredVehicleJourney"]["DirectionName"][0]["value"]
-        except KeyError:
+        except (KeyError, IndexError):
             dir = data["MonitoredVehicleJourney"]["DestinationName"][0]["value"]
 
         try:
             note = data["MonitoredVehicleJourney"]["JourneyNote"][0]["value"]
-        except KeyError:
+        except (KeyError, IndexError):
             note = ""
 
         sch = None
@@ -135,9 +135,9 @@ def from_json(data: dict):
         except KeyError:
             plat = ""
 
-        if "ArrivalStatus" in data["MonitoredVehicleJourney"]["MonitoredCall"]:
+        if "ArrivalStatus" in data["MonitoredVehicleJourney"]["MonitoredCall"] and data["MonitoredVehicleJourney"]["MonitoredCall"]["ArrivalStatus"] != "":
             status = TransportStatus(data["MonitoredVehicleJourney"]["MonitoredCall"]["ArrivalStatus"])
-        elif "DepartureStatus" in data["MonitoredVehicleJourney"]["MonitoredCall"]:
+        elif "DepartureStatus" in data["MonitoredVehicleJourney"]["MonitoredCall"] and data["MonitoredVehicleJourney"]["MonitoredCall"]["DepartureStatus"] != "":
             status = TransportStatus(data["MonitoredVehicleJourney"]["MonitoredCall"]["DepartureStatus"])
         else:
             status = TransportStatus.UNKNOWN