From bbcc332166ccc63117820528bf59a53e082b1179 Mon Sep 17 00:00:00 2001 From: Trygve Date: Wed, 6 Dec 2023 23:04:41 +0100 Subject: [PATCH] Finner ut av koder som mangler --- otime/cli.py | 41 ++++++++++++++++++++++++----------------- otime/otime.py | 16 +++++++++++++--- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/otime/cli.py b/otime/cli.py index 9a54e8e..b019568 100644 --- a/otime/cli.py +++ b/otime/cli.py @@ -100,26 +100,30 @@ def run(port='/dev/ttyUSB0', project_dir='./', xml_path='./output/'): csv_path = project_dir + '/runners.csv' while True: if mtr.in_waiting > 0: - mtr.read_until(expected=b'\xFF\xFF\xFF\xFF') - size = mtr.read(size=1) - if size == b'\xe6': + block = mtr.read_until(expected=b'\xFF\xFF\xFF\xFF') + size = block[0] + if size == 230: event = file_io.event_from_yaml_and_csv(config_path, mtr_path, csv_path) - meat = mtr.read(229) - message = b'\xFF\xFF\xFF\xFF' + size + meat - card_dump = otime.CardDump.from_mtr_bytes(message) - event.card_dumps.append(card_dump) - file_io.write_card_dumps(event, mtr_path) - print(runner_info(event, card_dump)) - subprocess.run(['git', 'add', './*'], cwd=project_dir, stdout=subprocess.DEVNULL) - subprocess.run(['git', 'commit', '-m', f'Added {card_dump.card}'], cwd=project_dir, stdout=subprocess.DEVNULL) + message = b'\xFF\xFF\xFF\xFF' + block[:230] if not is_checksum_valid(message): print('[red]Checksum is not valid![red]') - iof_xml.create_result_file(event, xml_path + '/results.xml') - pdf.create_result_list(event, project_dir + '/output/results.pdf') + try: + print(otime.CardDump.from_mtr_bytes(message)) + print(runner_info(event, card_dump)) + except ValueError as error: + print(error) + else: + card_dump = otime.CardDump.from_mtr_bytes(message) + event.card_dumps.append(card_dump) + file_io.write_card_dumps(event, mtr_path) + print(runner_info(event, card_dump)) + subprocess.run(['git', 'add', './*'], cwd=project_dir, stdout=subprocess.DEVNULL) + subprocess.run(['git', 'commit', '-m', f'Added {card_dump.card}'], cwd=project_dir, stdout=subprocess.DEVNULL) + iof_xml.create_result_file(event, xml_path + '/results.xml') + pdf.create_result_list(event, project_dir + '/output/results.pdf') - elif size == b'\x37': - meat = mtr.read(54) - message = b'\xFF\xFF\xFF\xFF' + size + meat + elif size == 55: + message = b'\xFF\xFF\xFF\xFF' + block[:55] mtr_id = int.from_bytes(message[6:8], 'little') year = int.from_bytes(message[8:9], 'little') @@ -132,6 +136,9 @@ def run(port='/dev/ttyUSB0', project_dir='./', xml_path='./output/'): battery_status = int.from_bytes(message[16:17], 'little') time = datetime.datetime(year, month, day, hours, minutes, seconds, milliseconds) print(f'MTR status message: id: {mtr_id}, time: {time}, battery: {battery_status}') + else: + print('Data not found!') + print(block) def gen(project_dir='./', xml_path='./output/'): @@ -155,7 +162,7 @@ def runner_info(event, card_dump): if result.status == 'OK': result_text = f'[green]Place: {result.place}. Time: [bold][yellow]{format_m_s(result.total_time)}[/yellow][/bold][/green]' elif result.status == 'MissingPunch': - result_text = f'[red]Missed Control! Time: [bold][yellow]{format_m_s(result.total_time)}[/yellow][/bold][/red]' + result_text = f'[red]Missed control(s): {result.missed_controls}! Time: [bold][yellow]{format_m_s(result.total_time)}[/yellow][/bold][/red]' else: result_text = f'[blue]{result.status}, Time: [bold][yellow]{result.total_time}[/yellow][/bold][/blue]' return result_text + f' [blue]{result.fullname()}[/blue], {result.o_class}, {result.club}, [italic]Card: {result.card_id}[/italic]' diff --git a/otime/otime.py b/otime/otime.py index 1c6611c..8397551 100644 --- a/otime/otime.py +++ b/otime/otime.py @@ -181,7 +181,7 @@ class OClass: class RunnerResult: def __init__(self, runner_id: int, first: str, last: str, status: str, place: int, total_time: int, splits: list[int], end_time, - club=None, club_id=None, country=None, card_id=None, o_class=None, controls=None, fork=0, start_time=datetime.datetime(1973, 1, 1), fee_id=None): + club=None, club_id=None, country=None, card_id=None, o_class=None, controls=None, fork=0, start_time=datetime.datetime(1973, 1, 1), fee_id=None, missed_controls=None, ran_other_course=None): self.id = runner_id self.first = first self.last = last @@ -200,6 +200,10 @@ class RunnerResult: self.total_time = total_time self.splits = splits self.end_time = end_time + # List of controls missed + self.missed_controls = missed_controls + # If the runner ran other course it is named here + self.ran_other_course = ran_other_course def fullname(self): return f'{self.first} {self.last}' @@ -398,7 +402,10 @@ def produce_class_result(event, o_class_name) -> ClassResult: results = [RunnerResult(i.id, i.first, i.last, event.get_runner_status(i.id), ok_runners.index(i)+1, event.get_runner_time(i.id), event.get_runner_splits(i.id), event.get_runner_end_clock(i.id), i.club, 0, i.country, i.card_id, i.o_class, event.get_runner_controls(i.id), start_time=event.get_card_dump(i.card_id).s_time) for i in ok_runners] results += [RunnerResult(i.id, i.first, i.last, event.get_runner_status(i.id), 0, event.get_runner_time(i.id), event.get_runner_splits(i.id), - event.get_runner_end_clock(i.id), i.club, 0, i.country, i.card_id, i.o_class, event.get_runner_controls(i.id), start_time=event.get_card_dump(i.card_id).s_time) for i in dsq_runners] + event.get_runner_end_clock(i.id), i.club, 0, i.country, i.card_id, i.o_class, event.get_runner_controls(i.id), + start_time=event.get_card_dump(i.card_id).s_time, + missed_controls=find_missed_controls(event.get_runner_controls(i.id), event.get_course(o_class.course).codes[i.fork])) + for i in dsq_runners] results += [RunnerResult(i.id, i.first, i.last, event.get_runner_status(i.id), 0, event.get_runner_time(i.id), event.get_runner_splits(i.id), event.get_runner_end_clock(i.id), i.club, 0, i.country, i.card_id, i.o_class, event.get_runner_controls(i.id)) for i in other_runners] @@ -451,4 +458,7 @@ def contains(small, big): if valid: return map_bl else: - return False \ No newline at end of file + return False + +def find_missed_controls(punches, codes): + return [i for i in codes if i not in punches] \ No newline at end of file