diff --git a/.idea/MSFS_Simbrief2.iml b/.idea/MSFS_Simbrief2.iml
index d8b3f6c..8388dbc 100644
--- a/.idea/MSFS_Simbrief2.iml
+++ b/.idea/MSFS_Simbrief2.iml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1d3ce46..01cb8a2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/Simbriefimport.py b/Simbriefimport.py
index ea13e93..6bf9d8f 100644
--- a/Simbriefimport.py
+++ b/Simbriefimport.py
@@ -1,4 +1,4 @@
-#V0.1b @PC
+#V0.1b @MAC
import requests
import json
from pathlib import Path
@@ -260,7 +260,8 @@ def replaceFiles():
e.write(inhalt_neu)
return files
def Simbriefimport():
- USERNAME = "hubobel"
+ #USERNAME = "hubobel"
+ USERNAME = passw['Prompt']['Simbrief']
URL = "https://www.simbrief.com/api/xml.fetcher.php"
params = {
"username": USERNAME,
@@ -271,11 +272,14 @@ def Simbriefimport():
data = resp.json()
general = data.get("general", {})
origin = data.get("origin", {})
+
origin_name = start_name(origin["icao_code"])
origin_icao = origin["icao_code"]
dest = data.get("destination", {})
dest_name = start_name(dest["icao_code"])
dest_icao = dest["icao_code"]
+
+ creationdate = unix_to_datetime(int(data['params']['time_generated']))
aircraft = data.get("aircraft", {})
time = data.get("times", {})
block = minuten_zu_zeit(int(time.get("sched_block")) / 60)
@@ -297,11 +301,11 @@ def Simbriefimport():
zfw = data['weights']['est_zfw']
airline_icao = general.get("icao_airline")
route = data['general']['route']
- print(data.keys())
- print(data['general'])
+ #print(data.keys())
+ #print(data['general'])
return (zfw, tow, payload, pax, metar_dest, metar_origin, fuel, distance, fl, flightlevel, flightnumber, airline,
aircraft_name, aircraft_icao, land_time, start_time, block, time, aircraft, dest_icao, dest_name, dest,
- origin_icao, origin_name, origin, general, airline_icao, route)
+ origin_icao, origin_name, origin, general, airline_icao, route, creationdate)
def txtSave(Datei, Inhalt):
voice = None
Inhalt = Inhalt.replace("„", "").replace("“", "").replace('"', "")
@@ -382,16 +386,20 @@ Stimmung = str(stimmung())
(zfw, tow, payload, pax, metar_dest, metar_origin, fuel, distance, fl, flightlevel, flightnumber, airline,
aircraft_name, aircraft_icao, land_time, start_time, block, time, aircraft, dest_icao, dest_name, dest, origin_icao,
- origin_name, origin, general, airline_icao, route) = Simbriefimport()
+ origin_name, origin, general, airline_icao, route, creationdate) = Simbriefimport()
logging.info("--------------------------------------------------")
-logging.info("SimbriefUsername: %s",passw['Prompt']['PurserName'])
-logging.info("Simbriefdate: %s",passw['Prompt']['CptName'])
-logging.info("Simbrief Route: %s", Stimmung)
+logging.info("SimbriefUsername: %s",passw['Prompt']['Simbrief'])
+logging.info("Simbriefdate: %s",creationdate)
+logging.info(
+ "Simbrief Route: %s / %s",
+ origin.get("icao_code"),
+ dest.get("icao_code")
+)
logging.info("--------------------------------------------------")
logging.info("--------------------------------------------------")
-logging.info("PurserName: %s",passw['Prompt']['PurserName'])
-logging.info("Cpt.Name: %s",passw['Prompt']['CptName'])
-logging.info("Stimmung: %s", Stimmung)
+logging.info("PurserName: %s",passw['Prompt']['PurserName'])
+logging.info("Cpt.Name: %s",passw['Prompt']['CptName'])
+logging.info("Stimmung: %s",Stimmung)
logging.info("--------------------------------------------------")
logging.info("FLUGINFORMATIONEN")
logging.info("--------------------------------------------------")