RomanNum3ral
/
plane-notify
mirror of https://github.com/RomanNum3ral/plane-notify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update self.last_pos_datetime handling 

Updated all `self.last_pos_datetime` caculations to not exit the program if `ac_dict.time_position` is NoneType.
This commit is contained in:
NomsterDude 2022-06-10 11:21:35 -07:00 committed by GitHub
parent d39b404f62
commit f2e5314578
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
planeClass.py
View File

@ -88,7 +88,8 @@ class Plane:
from mictronics_parse import get_aircraft_reg_by_icao, get_type_code_by_icao from mictronics_parse import get_aircraft_reg_by_icao, get_type_code_by_icao
self.reg = get_aircraft_reg_by_icao(self.icao) self.reg = get_aircraft_reg_by_icao(self.icao)
self.type = get_type_code_by_icao(self.icao) self.type = get_type_code_by_icao(self.icao)
self.last_pos_datetime = datetime.fromtimestamp(ac_dict.time_position) if ac_dict.time_position is not None:
self.last_pos_datetime = datetime.fromtimestamp(ac_dict.time_position)
except ValueError as e: except ValueError as e:
print("Got data but some data is invalid!") print("Got data but some data is invalid!")
print(e) print(e)
@ -544,7 +545,8 @@ class Plane:
if self.feeding: if self.feeding:
#Squawks #Squawks
emergency_squawks ={"7500" : "Hijacking", "7600" :"Radio Failure", "7700" : "General Emergency"} emergency_squawks ={"7500" : "Hijacking", "7600" :"Radio Failure", "7700" : "General Emergency"}
seen = datetime.now() - self.last_pos_datetime if self.last_pos_datetime is not None:
seen = datetime.now() - self.last_pos_datetime
#Only run check if emergency data previously set #Only run check if emergency data previously set
if self.last_emergency is not None and not self.emergency_already_triggered: if self.last_emergency is not None and not self.emergency_already_triggered:
time_since_org_emer = datetime.now() - self.last_emergency[0] time_since_org_emer = datetime.now() - self.last_emergency[0]
@ -567,7 +569,8 @@ class Plane:
#Realizes first time seeing emergency, stores time and type #Realizes first time seeing emergency, stores time and type
elif self.squawk in emergency_squawks.keys() and not self.emergency_already_triggered and not self.on_ground: elif self.squawk in emergency_squawks.keys() and not self.emergency_already_triggered and not self.on_ground:
print("Emergency", self.squawk, "detected storing code and time and waiting to trigger") print("Emergency", self.squawk, "detected storing code and time and waiting to trigger")
self.last_emergency = (self.last_pos_datetime, self.squawk) if self.last_pos_datetime is not None:
self.last_emergency = (self.last_pos_datetime, self.squawk)
elif self.squawk not in emergency_squawks.keys() and self.emergency_already_triggered: elif self.squawk not in emergency_squawks.keys() and self.emergency_already_triggered:
self.emergency_already_triggered = None self.emergency_already_triggered = None
@ -876,4 +879,4 @@ class Plane:
print(time_since_ra) print(time_since_ra)
if time_since_ra.seconds >= 600: if time_since_ra.seconds >= 600:
print(ra_type) print(ra_type)
self.recent_ra_types.pop(ra_type) self.recent_ra_types.pop(ra_type)