diff --git a/travelInfo.py b/travelInfo.py index acad963..298c9ee 100755 --- a/travelInfo.py +++ b/travelInfo.py @@ -9,9 +9,10 @@ from datetime import datetime import pytz timezone = pytz.timezone('Europe/Berlin') -statusData = None +statusData = None #initialize variables... tripData = None +# Request the raw data from ICE-Portal def get_api_db(): global statusData global tripData @@ -19,7 +20,8 @@ def get_api_db(): statusData = statusData_response.json() tripData_response = get("https://iceportal.de/api1/rs/tripInfo/trip", timeout=5) tripData = tripData_response.json() - + +# Look for the current SSID. Replace wlp2s0 with the real name of your wifi interface and check, that the path to iwlist is correct (just type 'which iwlist' in the terminal) def get_ssid(): scanoutput = check_output(["/usr/sbin/iwlist", "wlp2s0", "scan"]) @@ -35,6 +37,7 @@ def get_speed_db(): speed= str(statusData["speed"]) return speed +# Figure out, whats the next station and filter the output for this. def get_next_db(): next_stop=tripData["trip"]["stopInfo"]["actualNext"] for i in tripData['trip']['stops']: @@ -43,10 +46,12 @@ def get_next_db(): arrivalDelay = i['timetable']['arrivalDelay'] utime=i['timetable']['actualArrivalTime']/1000 arrivalTime = datetime.fromtimestamp(utime, tz=timezone).strftime('%H:%M') + nextStationTrack = str(i['track']['actual']) break - tripinfo = nextStationName+" "+ arrivalTime+" " + arrivalDelay + tripinfo = nextStationName+" "+ arrivalTime+" ("+ arrivalDelay+") "+ nextStationTrack return tripinfo +# Get the Trainnumber and final station of your current train def get_trainInfo_db(): trainType = tripData["trip"]["trainType"] trainNumber = tripData["trip"]["vzn"] @@ -54,11 +59,11 @@ def get_trainInfo_db(): return trainType+" "+trainNumber+" "+ finalStationName def main(): + # Look for WIFIonICE otherwise do nothing... if get_ssid() == "WIFIonICE": get_api_db() print(get_trainInfo_db()+" | "+"SPEED: "+get_speed_db()+" km/h | "+"NEXT: "+get_next_db()) return 0 if __name__ == '__main__': - sys.exit(main()) # next section explains the use of sys.exit - + sys.exit(main())