diff --git a/Simbriefimport.py b/Simbriefimport.py index d5fd93d..087df0c 100644 --- a/Simbriefimport.py +++ b/Simbriefimport.py @@ -24,7 +24,7 @@ COPYRIGHT = "© 2025 Hubobel" VERSION_INFO_FILE = Path("version_info.txt") VERSION_RUNTIME_FILE = Path("version_runtime.txt") - +Fracht = False def _git_build_number() -> int: try: out = subprocess.check_output( @@ -366,6 +366,8 @@ def replaceFiles(): return files def Simbriefimport(): #USERNAME = "hubobel" + Fracht = False + USERNAME = passw['Prompt']['Simbrief'] URL = "https://www.simbrief.com/api/xml.fetcher.php" params = { @@ -413,9 +415,11 @@ def Simbriefimport(): zfw = data['weights']['est_zfw'] airline_icao = general.get("icao_airline") route = data['general']['route'] + if airline_icao in passw['Fracht']: + Fracht = True #print(data.keys()) #print(data['general']) - return (zfw, tow, payload, pax, metar_dest, metar_origin, fuel, distance, fl, flightlevel, flightnumber, airline, + return (Fracht, 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, creationdate) def txtSave(Datei, Inhalt): @@ -517,7 +521,7 @@ if "--make-version" in sys.argv: Stimmung = str(stimmung()) -(zfw, tow, payload, pax, metar_dest, metar_origin, fuel, distance, fl, flightlevel, flightnumber, airline, +(Fracht, 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, creationdate) = Simbriefimport() logging.info("--------------------------------------------------") @@ -552,6 +556,7 @@ logging.info("Geplanter Start: %s UTC", start_time) logging.info("Geplante Landung: %s UTC", land_time) logging.info("Fluggerät: %s (%s)", aircraft_icao, aircraft_name) + logging.info("Cruiselevel: FL%s", fl) logging.info("Entfernung: %s nm", distance) @@ -584,7 +589,7 @@ ordnerneu.mkdir(exist_ok=True) logging.info("--------------------------------------------------") logging.info("START .txt Erzeugung ") logging.info("--------------------------------------------------") -debug = False +debug = True if debug == False: metarCabin = METAR() metar = metarCabin.choices[0].message.content @@ -680,3 +685,4 @@ logging.info("--------------------------------------------------") logging.info("Version: %s", get_runtime_version()) ver = ensure_version_info() # erzeugt version_info.txt im Dev-Workspace logging.info("Programmversion: %s", get_runtime_version()) +print(Fracht) diff --git a/namen.json b/namen.json index 173fb38..3b4d172 100644 --- a/namen.json +++ b/namen.json @@ -289,4 +289,5 @@ "Smirnov", "Volkov" ] + } \ No newline at end of file