diff --git a/app/commands/logbook.py b/app/commands/logbook.py index 01d5e81..e34cf51 100644 --- a/app/commands/logbook.py +++ b/app/commands/logbook.py @@ -44,76 +44,3 @@ def compute_logbook(start, end): for single_date in pbar: pbar.set_description(single_date.strftime("%Y-%m-%d")) result = logbook_update_entries(session=db.session, date=single_date) - - -@user_cli.command("show") -@click.argument("airport_name") -@click.argument("date") -def show(airport_name, date=None): - """Show a logbook for .""" - airport = db.session.query(Airport).filter(Airport.name == airport_name).first() - - if airport is None: - print('Airport "{}" not found.'.format(airport_name)) - return - - or_args = [] - if date is not None: - date = datetime.strptime(date, "%Y-%m-%d") - (start, end) = date_to_timestamps(date) - or_args = [db.between(Logbook.reftime, start, end)] - - # get all logbook entries and add device and airport infos - logbook_query = ( - db.session.query(func.row_number().over(order_by=Logbook.reftime).label("row_number"), Logbook) - .filter(*or_args) - .filter(db.or_(Logbook.takeoff_airport_id == airport.id, Logbook.landing_airport_id == airport.id)) - .order_by(Logbook.reftime) - ) - - # ... and finally print out the logbook - print("--- Logbook ({}) ---".format(airport_name)) - - def none_datetime_replacer(datetime_object): - return "--:--:--" if datetime_object is None else datetime_object.time() - - def none_track_replacer(track_object): - return "--" if track_object is None else round(track_object / 10.0) - - def none_timedelta_replacer(timedelta_object): - return "--:--:--" if timedelta_object is None else timedelta_object - - def none_registration_replacer(device_object): - return "[" + device_object.address + "]" if len(device_object.infos) == 0 else device_object.infos[0].registration - - def none_aircraft_replacer(device_object): - return "(unknown)" if len(device_object.infos) == 0 else device_object.infos[0].aircraft - - def airport_marker(logbook_object): - if logbook_object.takeoff_airport is not None and logbook_object.takeoff_airport.name is not airport.name: - return "FROM: {}".format(logbook_object.takeoff_airport.name) - elif logbook_object.landing_airport is not None and logbook_object.landing_airport.name is not airport.name: - return "TO: {}".format(logbook_object.landing_airport.name) - else: - return "" - - def none_altitude_replacer(logbook_object): - return "?" if logbook_object.max_altitude is None else "{:5d}m ({:+5d}m)".format(logbook_object.max_altitude, logbook_object.max_altitude - logbook_object.takeoff_airport.altitude) - - for [row_number, logbook] in logbook_query.all(): - print( - "%3d. %10s %8s (%2s) %8s (%2s) %8s %15s %8s %17s %20s" - % ( - row_number, - logbook.reftime.date(), - none_datetime_replacer(logbook.takeoff_timestamp), - none_track_replacer(logbook.takeoff_track), - none_datetime_replacer(logbook.landing_timestamp), - none_track_replacer(logbook.landing_track), - none_timedelta_replacer(logbook.duration), - none_altitude_replacer(logbook), - none_registration_replacer(logbook.device), - none_aircraft_replacer(logbook.device), - airport_marker(logbook), - ) - )