From a037abe820009099d0a4ee7812142cb4ded4a8d4 Mon Sep 17 00:00:00 2001 From: Trygve Date: Sun, 29 May 2022 22:43:08 +0200 Subject: [PATCH] =?UTF-8?q?Event=20metoder=20bruker=20filobjekt=20istedet?= =?UTF-8?q?=20for=20paths=20n=C3=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cli.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/cli.py b/cli.py index 3dfff2d..018b192 100755 --- a/cli.py +++ b/cli.py @@ -14,6 +14,8 @@ def print_runners(Runners): table.add_column("club", style="magenta") table.add_column("card", style="red") table.add_column("class", justify="right", style="green") + table.add_column("start_time", justify="right", style="green") + table.add_column("fork", justify="right", style="green") table.add_column("Status", justify="right", style="blue") for i in Runners: @@ -21,7 +23,7 @@ def print_runners(Runners): o_class = i.o_class.name except: o_class = '' - table.add_row(i.fullname(), i.club ,str(i.card), o_class, i.status()) + table.add_row(i.fullname(), i.club ,str(i.card), o_class, i.start_time, str(i.fork), i.status()) console = Console() console.print(table) @@ -147,16 +149,16 @@ def main(): args = parser.parse_args() if args.command == 'show_runners': event = otime.Event(0, 'NoName') - event.import_ttime_cnf(args.ttcnf) - event.import_ttime_db(args.ttdb) - event.import_mtr_file(args.mtr) + event.import_ttime_cnf(open(args.ttcnf, encoding='latin-1')) + event.import_ttime_db(open(args.ttdb, encoding='latin-1')) + event.import_mtr_file(open(args.mtr, encoding='latin-1')) event.match_runners_cards() print_runners(event.runners) elif args.command == 'show_runner': event = otime.Event(0, 'NoName') - event.import_ttime_cnf(args.ttcnf) - event.import_ttime_db(args.ttdb) - event.import_mtr_file(args.mtr) + event.import_ttime_cnf(open(args.ttcnf, encoding='latin-1')) + event.import_ttime_db(open(args.ttdb, encoding='latin-1')) + event.import_mtr_file(open(args.mtr, encoding='latin-1')) event.match_runners_cards() for n in event.runners: if args.runner == n.fullname(): @@ -168,9 +170,9 @@ def main(): elif args.command == 'show_result': event = otime.Event(0, 'NoName') - event.import_ttime_cnf(args.ttcnf) - event.import_ttime_db(args.ttdb) - event.import_mtr_file(args.mtr) + event.import_ttime_cnf(open(args.ttcnf, encoding='latin-1')) + event.import_ttime_db(open(args.ttdb, encoding='latin-1')) + event.import_mtr_file(open(args.mtr, encoding='latin-1')) event.match_runners_cards() for n in event.o_classes: if args.o_class_str == n.name: @@ -185,14 +187,14 @@ def main(): print_class_result(event.runners, o_class) elif args.command == 'show_classes': event = otime.Event(0, 'NoName') - event.import_ttime_cnf(args.ttcnf) + event.import_ttime_cnf(open(args.ttcnf, encoding='latin-1')) print_o_classes(event.o_classes) elif args.command == 'create_xml': event = otime.Event(0, 'NoName') - event.import_ttime_cnf(args.ttcnf) - event.import_ttime_db(args.ttdb) - event.import_mtr_file(args.mtr) + event.import_ttime_cnf(open(args.ttcnf, encoding='latin-1')) + event.import_ttime_db(open(args.ttdb, encoding='latin-1')) + event.import_mtr_file(open(args.mtr, encoding='latin-1')) event.match_runners_cards() event.get_xml_res().write(args.file)