RWC sjekk for diska løpere

otime/__main__.py

@@ -0,0 +1,2 @@
+from cli import main
+main()

otime/cli.py

@@ -0,0 +1,178 @@
+import argparse
+import file_io
+import datetime
+import iof_xml
+import serial
+import subprocess
+import os
+import otime
+import iof_xml
+import pdf
+from pdf import format_m_s
+from rich import print
+import search_tui
+
+from rich.traceback import install
+from rich import inspect
+install(show_locals=True)
+
+# Main entrypoint for now. Cli with two options; init will make the files needed and run will start the program from the specified directory
+def main():
+    parser = argparse.ArgumentParser(description='Otime very alpha version 😁')
+    subparsers = parser.add_subparsers(dest='command')
+    parser_init = subparsers.add_parser('init', help='Create project files')
+    parser_init.add_argument('--entries', required=True, dest='entries_file', action='store', default='./',
+                        help='The xml file with entries')
+    parser_init.add_argument('--courses', required=True, dest='courses_file', action='store', default='./',
+                        help='The xml with courses')
+    parser_init.add_argument('--dir', required=False, dest='dir', action='store', default='./',
+                        help='Specify a directort, if not set the files are created in the current directory')
+
+    parser_init = subparsers.add_parser('run', help='run otime')
+    parser_init.add_argument('--dir', required=False, dest='dir', action='store', default='./', help='specify a directory')
+    parser_init.add_argument('--port', required=False, dest='port', action='store', help='specify a serial port')
+    parser_init.add_argument('--xml', required=False, dest='xml_path', action='store', default=None, help='Where the xml result file should be saved')
+
+    parser_init = subparsers.add_parser('gen', help='Generate result files')
+    parser_init.add_argument('--dir', required=False, dest='dir', action='store', default='./', help='specify a directory')
+    parser_init.add_argument('--xml', required=False, dest='xml_path', action='store', default=None, help='Where the xml result file should be saved')
+
+    parser_init = subparsers.add_parser('view', help='View otime data')
+    parser_init.add_argument('--dir', required=False, dest='dir', action='store', default='./', help='specify a directory')
+    parser_init.add_argument('--xml', required=False, dest='xml_path', action='store', default=None, help='Where the xml result file should be saved')
+
+    parser_init = subparsers.add_parser('mtr', help='run mtr commands')
+    parser_init.add_argument('--port', required=True, dest='port', action='store', help='specify a serial port')
+    parser_init.add_argument('--spool', required=False, dest='mtr_spool', action='store_true', help='Spool all mtr data')
+    parser_init.add_argument('--status', required=False, dest='mtr_status', action='store_true', help='Spool all mtr data')
+
+    args = parser.parse_args()
+
+    try:
+        if not args.xml_path:
+            args.xml_path = args.dir + '/output'
+    except AttributeError:
+        pass
+
+    match args.command:
+        case 'init':
+            init_dir(args.dir, args.entries_file, args.courses_file)
+        case 'run':
+            run(args.port, args.dir, args.xml_path)
+        case 'view':
+            search_tui.main(args.dir)
+        case 'gen':
+            gen(args.dir, args.xml_path)
+        case 'mtr':
+            mtr = serial.Serial(port=args.port, baudrate=9600, timeout=40)
+            if args.mtr_spool:
+                mtr.write(b'/SA')
+            if args.mtr_status:
+                mtr.write(b'/ST')
+        case other:
+            parser.print_help()
+
+def init_dir(project_dir, entries_xml_file, courses_xml_file):
+    # Lager mappe med en config fil, en csv fil med løpere og en fil med mtr data
+    csv_db_path = project_dir + '/runners.csv'
+    config_path = project_dir + '/config.yaml'
+    mtr_path = project_dir + 'mtr.yaml'
+    
+    event = iof_xml.event_from_xml_entries(entries_xml_file)
+    event.courses = iof_xml.courses_from_xml(courses_xml_file)
+    
+    print(f'Read {len(event.runners)} runners, {len(event.card_dumps)} ecards, {len(event.courses)} courses and {len(event.o_classes)} classes')
+    print('Remember to manually link the courses and classes in the config file')
+
+    file_io.write_runners_csv(event, csv_db_path)
+    file_io.write_config(event, config_path)
+    file_io.write_card_dumps(event, mtr_path)
+    os.makedirs(project_dir+'/output')
+
+    subprocess.run(['git', 'init', project_dir])
+    subprocess.run(['git', 'add', './*'], cwd=project_dir)
+    subprocess.run(['git', 'commit', '-m', f'Project initiated by otime'], cwd=project_dir)
+
+def run(port='/dev/ttyUSB0', project_dir='./', xml_path='./output/'):
+    mtr = serial.Serial(port=port, baudrate=9600, timeout=40)
+    config_path = project_dir + '/config.yaml'
+    mtr_path = project_dir + '/mtr.yaml'
+    csv_path = project_dir + '/runners.csv'
+    while True:
+        if mtr.in_waiting > 0:
+            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)
+                message = b'\xFF\xFF\xFF\xFF' + block[:230]
+                if not is_checksum_valid(message):
+                    print('[red]Checksum is not valid![red]')
+                    try:
+                        print(otime.CardDump.from_mtr_bytes(message))
+                        print(runner_info(event, card_dump))
+                    except Exception 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 == 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')
+                month = int.from_bytes(message[9:10], 'little')
+                day = int.from_bytes(message[10:11], 'little')
+                hours =int.from_bytes(message[11:12], 'little')
+                minutes = int.from_bytes(message[12:13], 'little')
+                seconds = int.from_bytes(message[13:14], 'little')
+                milliseconds =int.from_bytes(message[14:16], 'little')
+                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/'):
+    config_path = project_dir + '/config.yaml'
+    mtr_path = project_dir + '/mtr.yaml'
+    csv_path = project_dir + '/runners.csv'
+    event = file_io.event_from_yaml_and_csv(config_path, mtr_path, csv_path)
+    subprocess.run(['git', 'add', './*'], cwd=project_dir, stdout=subprocess.DEVNULL)
+    subprocess.run(['git', 'commit', '-m', f'Manually run'], 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')
+
+def runner_info(event, card_dump):
+    runner = next((i for i in event.runners if str(i.card_id) == str(card_dump.card)), None)
+    if runner is None:
+        return f'[orange_red1]No runner with ecard {card_dump.card}! It matches these courses: {otime.find_courses_matching_controls(card_dump.controls, event.courses)}[/orange_red1] {card_dump}'
+    result = event.get_runner_result(runner.id)
+    if result is None:
+        return '🧐 Dette skal ikke skje...'
+    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(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]'
+
+def is_checksum_valid(message):
+    # Hentet fra https://github.com/knutsiem/mtr-log-extractor
+    checksum = int.from_bytes(message[232:233], 'little')
+    # calculate checksum for message bytes up until checksum
+    calculated_checksum = sum(message[:232]) % 256
+    return checksum == calculated_checksum
+
+if __name__ == '__main__':
+    main()

otime/file_io.py

@@ -22,20 +22,34 @@ def write_card_dumps(event, file_path):
         
 def write_runners_csv(event, file_path):
     with open(file_path, 'w') as f:
+        f.write('ID;Status;Fornavn, Etternavn;Klasse;klubb;Brikke;Gafling;Starttid\n')
         for i in event.runners:
             f.write(f'{i.id};{i.status_override};{i.first}, {i.last};{i.o_class};{i.club};{i.card_id};{i.fork};{i.start_time}\n')
     
 def event_from_yaml_and_csv(config_path, mtr_path, csv_path):
+    try:
         with open(mtr_path, 'r') as f:
             card_dumps = load(f, Loader=Loader)
+    except FileNotFoundError:
+        card_dumps=[]
     
     with open(config_path, 'r') as f:
         event = load(f, Loader=Loader)
 
     with open(csv_path, 'r') as f:
         data = [i.split(';') for i in f.readlines()]
+        data.pop(0)
         for i in data: i[2] = i[2].split(',')
-        runners = [otime.Runner(id=i[0], status_override=i[1], first=i[2][0], last=i[2][1].strip(), o_class=i[3], club=i[4], card_id=i[5], fork=i[6], start_time=i[7]) for i in data]
+        for i in data:
+            # Setter starttid til None hvis den ikke er satt
+            if len(i[7]) > 8: 
+                i[7] = i[7]
+            else:
+                i[7] = None
+            # Sjekk om brikkenummer er tomt
+            if i[5] == '':
+                i[5] = 0
+        runners = [otime.Runner(id=i[0], status_override=i[1], first=i[2][0], last=i[2][1].strip(), o_class=i[3], club=i[4], card_id=int(i[5]), fork=int(i[6]), start_time=i[7]) for i in data]
     event.card_dumps = card_dumps
     event.runners = runners
     return event

otime/iof_xml.py

@@ -16,7 +16,7 @@ def create_result_file(event, file_path, o_classes=[]):
     root.set('iofVersion', '3.0')
     root.set('createTime', datetime.datetime.now().isoformat(timespec='seconds'))
     root.set('creator', 'oTime')
-    root.set('status', 'Complete')
+    #root.set('status', 'Complete')
     tree = ET.ElementTree(root)
     xml_event = ET.SubElement(root, 'Event')
     xml_child(xml_event, 'Id', event.id)
@@ -30,6 +30,9 @@ def create_result_file(event, file_path, o_classes=[]):
         # <PersonResult>
 
         for n in i.runner_results:
+            if n.status == 'DidNotStart':
+                continue
+
             person_result = ET.SubElement(class_result, 'PersonResult')
             # <Person>
             person = ET.SubElement(person_result, 'Person')
@@ -64,14 +67,14 @@ def create_result_file(event, file_path, o_classes=[]):
                     xml_child(result, 'Status', n.status)
                     # <SplitTime>
                     # TODO: ta utgangspunkt i løypa, ikke det brikka har stempla
-                    for code, split in zip(i.course.codes, n.splits):
+                    for code, split in zip(i.course.codes[n.fork][:-1], n.splits[:-1]):
                         st = ET.SubElement(result, 'SplitTime')
                         xml_child(st, 'ControlCode', code)
                         xml_child(st, 'Time', split)
                     # </SplitTime>
                 elif n.status == 'MissingPunch':
                     xml_child(result, 'Status', n.status)
-                    for code, split in zip(i.course.codes, n.splits):
+                    for code, split in zip(i.course.codes[n.fork][:-1], n.splits[:-1]):
                         st = ET.SubElement(result, 'SplitTime')
                         xml_child(st, 'ControlCode', code)
                         if split != 0: xml_child(st, 'Time', split)
@@ -122,7 +125,7 @@ def runners_from_xml_entries(xml_file):
 
         start_time = None
         runners.append(otime.Runner(rid, first, last, club=club_name, club_id=club_id,
-                              country=country,card_id=card, o_class_str=class_str,
+                              country=country,card_id=card, o_class=class_str,
                               start_time=start_time, fee_id=fee_id))
     return runners
 
@@ -172,7 +175,7 @@ def courses_from_xml(xml_file):
         controls.remove('STA1')
         controls.remove('FIN1')
         controls = [int(l) for l in controls]
-        courseobjs.append(otime.Course(name, controls))
+        courseobjs.append(otime.Course(name, [controls]))
     return courseobjs
 
 def event_from_xml_entries(xml_file):
@@ -201,7 +204,9 @@ def event_from_xml_entries(xml_file):
     o_classes = [otime.OClass(i, []) for i in set(class_names)]
 
     runners = runners_from_xml_entries(xml_file)
-    fees = fees_from_xml_entries(xml_file)
+    # TODO: fiks fees
+    #fees = fees_from_xml_entries(xml_file)
+    fees = []
 
     return otime.Event(event_id, name, organiser=organiser, runners=runners,
                     fees=fees, start_time=start_time, end_time=end_time, o_classes=o_classes)

otime/main.py

@@ -1,36 +0,0 @@
-import argparse
-import file_io
-import iof_xml
-
-# Main entrypoint for now. Cli with two options; init will make the files needed and run will start the program from the specified directory
-def main():
-    parser = argparse.ArgumentParser(description='Otime very alpha version 😁')
-    subparsers = parser.add_subparsers(dest='command')
-    parser_init = subparsers.add_parser('init', help='INIT')
-    parser_init.add_argument('--entries', required=True, dest='entries_file', action='store', default='./',
-                        help='The xml file with entries')
-    parser_init.add_argument('--courses', required=True, dest='courses_file', action='store', default='./',
-                        help='The xml with courses')
-    parser_init.add_argument('--dir', required=False, dest='dir', action='store', default='./',
-
-                        help='Specify a directort, if not set the files are created in the current directory')
-
-    args = parser.parse_args()
-    if args.command == 'init':
-        init_dir(args.dir, args.entries_file, args.courses_file)
-
-def init_dir(project_dir, entries_xml_file, courses_xml_file):
-    # Lager mappe med en config fil, en csv fil med løpere og en fil med mtr data
-    csv_db_path = project_dir + '/runners.csv'
-    config_path = project_dir + '/config.yaml'
-    mtr_path = project_dir + 'mtr.yaml'
-    
-    event = iof_xml.event_from_xml_entries(entries_xml_file)
-    event.courses = iof_xml.courses_from_xml(courses_xml_file)
-
-    file_io.write_runners_csv(event, csv_db_path)
-    file_io.write_config(event, config_path)
-    file_io.write_card_dumps(event, mtr_path)
-
-if __name__ == '__main__':
-    main()

otime/otime.py

@@ -2,7 +2,6 @@ import copy
 import datetime
 import re
 import xml.etree.ElementTree as etree
-import pdf
 
 class Runner:
     def __init__(self, id: int, first: str, last: str, club=None, club_id=None,
@@ -95,7 +94,7 @@ class CardDump:
                 splits.append(time)
 
         # Extract start time:
-        year = int.from_bytes(datamsg[8:9], 'little')
+        year = 2000 + int.from_bytes(datamsg[8:9], 'little')
         month = int.from_bytes(datamsg[9:10], 'little')
         day = int.from_bytes(datamsg[10:11], 'little')
         hours = int.from_bytes(datamsg[11:12], 'little')
@@ -162,12 +161,11 @@ class CardDump:
 
 # Stored in Event.courses
 class Course:
-    def __init__(self, name, codes, forked=False, variations=None):
+    def __init__(self, name, codes, forked=False):
         self.name = name
+        # Codes is a list of courses
         self.codes = codes
         self.forked = forked
-        # Variations is a list
-        self.variations = variations
 
     def __repr__(self):
         return f'name({self.name})'
@@ -183,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=None, 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
@@ -202,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}'
@@ -266,27 +268,46 @@ class Event:
         runner = self.get_runner(id)
         if runner.status_override: return runner.status_override
         o_class = self.get_o_class(runner.o_class)
+        if not o_class:
+            return 'Inactive'
         course = self.get_course(o_class.course)
-        if self.get_card_dump(runner.card_id) == None:
+        if not self.get_card_dump(runner.card_id):
             return 'Active'
-        if contains(course.codes, self.get_card_dump(runner.card_id).controls):
+        if contains(course.codes[runner.fork], self.get_card_dump(runner.card_id).controls):
             return 'OK'
         else:
             return 'MissingPunch'
 
+    def get_runner_result(self, runner_id):
+        runner = self.get_runner(runner_id)
+        return next((i for i in produce_class_result(self, runner.o_class).runner_results if i.id == runner_id), None)
+
+    def get_runner_o_class(self, id):
+        runner = self.get_runner(id)
+        return next((copy.copy(i) for i in self.o_classes if i.name == runner.o_class), None)
+
     def get_runner_time(self, id):
         runner = self.get_runner(id)
         card_dump = self.get_card_dump(runner.card_id)
-        if card_dump == None:
+        course = self.get_course(self.get_runner_o_class(id).course)
+        if card_dump == None or course == None:
             return False
 
-        f_control = card_dump.controls[-1]
+        f_control = course.codes[runner.fork][-1]
         # TODO: Må gjøres mer robust
-        try:
+        if f_control not in card_dump.controls:
+            # Hvis løperen ikke har vært på sistepost tar vi siste stempling istedet
+            return card_dump.splits[-1]
         index = card_dump.controls.index(f_control)
+        # Hvis løperen ikke har en startid spesifisert brukes brikketid
+        if runner.start_time is None:
             return card_dump.splits[index]
-        except:
+        #Hvis det er en startid finner jeg tidsforskjellen mellom brikkestart og faktisk start og trekker den fra totaltida
-            return False
+        else:
+            time_list = runner.start_time.split(':') # hour, minute, second
+            start_datetime = self.start_time.replace(hour=int(time_list[0]), minute=int(time_list[1]), second=int(time_list[2]))
+            diff =  start_datetime - card_dump.s_time
+            return card_dump.splits[index] - diff.total_seconds()
 
     def get_runner_splits(self, id):
         # Tida brukt frem til hver post, ikke tida fra forrige post
@@ -294,6 +315,7 @@ class Event:
             runner = self.get_runner(id)
             card_dump = self.get_card_dump(runner.card_id)
             course = self.get_course(self.get_o_class(runner.o_class).course)
+            codes = course.codes[runner.fork]
         except AttributeError:
             return None
 
@@ -301,8 +323,8 @@ class Event:
             return None
 
         split_iter = zip(card_dump.controls, card_dump.splits).__iter__()
-        splits = [0] * len(course.codes)
+        splits = [0] * len(codes)
-        for n, control in enumerate(course.codes):
+        for n, control in enumerate(codes):
             if control not in card_dump.controls:
                 continue
             while True:
@@ -330,7 +352,7 @@ class Event:
     def get_result(self, o_classes: list[str] = []) -> list[ClassResult]:
         if not o_classes:
             o_classes = [i.name for i in self.o_classes]
-        return [produce_class_result(copy.deepcopy(self), i) for i in o_classes]
+        return [produce_class_result(self, i) for i in o_classes]
 
     def read_xml_entries(self, xml_file):
         self.add_runners(*runners_from_xml_entries(xml_file))
@@ -378,11 +400,15 @@ def produce_class_result(event, o_class_name) -> ClassResult:
     other_runners = [i for i in runners if i not in ok_runners and i not in dsq_runners]
     
     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, 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]
+                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, 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]),
+                ran_other_course=find_courses_matching_controls(event.get_card_dump(i.card_id).controls, event.courses)) 
+                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, i.country, i.card_id, i.o_class, event.get_runner_controls(i.id)) for i in other_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)) for i in other_runners]
     
     return ClassResult(o_class.name, event.get_course(o_class.course), results)
 
@@ -399,7 +425,7 @@ def courses_from_ttime_conf(ttime_file):
                 n = n.split(',')
                 loops += 1
                 n = list(map(int, n))
-                courses.append(Course('course_'+str(loops), n))
+                courses.append(Course('course_'+str(loops), [n]))
     return courses
 
 def classes_from_ttime_conf(ttime_file, courses):
@@ -434,3 +460,14 @@ def contains(small, big):
         return map_bl
     else:
         return False
+
+def find_missed_controls(punches, codes):
+        return [i for i in codes if i not in punches]
+
+def find_courses_matching_controls(controls, courses):
+    matches = []
+    for i in courses:
+        for fork in i.codes:
+            if contains(fork, controls):
+                matches.append(i.name)
+    return matches

otime/pdf.py

@@ -11,7 +11,7 @@ def create_result_list(event, file_path, o_classes=[]):
         
         pdf = FPDF()
         pdf.add_page()
-        pdf.add_font("LiberationSans", fname="../../otime/data/fonts/LiberationSans-Regular.ttf")
+        pdf.add_font("LiberationSans", fname="otime/data/fonts/LiberationSans-Regular.ttf")
         pdf.set_font("LiberationSans", size=10)
         line_height = pdf.font_size * 1.5
         col_width = pdf.epw / 4  # distribute content evenly
@@ -38,7 +38,7 @@ def create_split_result_list(event, file_path, o_classes=[]):
         
         pdf = FPDF()
         pdf.add_page(orientation='L')
-        pdf.add_font("LiberationSans", fname="../../otime/data/fonts/LiberationSans-Regular.ttf")
+        pdf.add_font("LiberationSans", fname="otime/data/fonts/LiberationSans-Regular.ttf")
         pdf.set_font("LiberationSans", size=8)
         line_height = pdf.font_size * 1.5
         col_width = pdf.epw / 4  # distribute content evenly

otime/search_tui.py

@@ -0,0 +1,30 @@
+from textual.app import App, ComposeResult
+from textual.widgets import DataTable
+import otime
+import file_io
+from pdf import format_m_s
+
+global ROWS
+class TableApp(App):
+    def compose(self) -> ComposeResult:
+        yield DataTable()
+
+    def on_mount(self) -> None:
+        global ROWS
+        table = self.query_one(DataTable)
+        table.add_columns(*ROWS[0])
+        table.add_rows(ROWS[1:])
+
+def main(path):
+    event = file_io.event_from_yaml_and_csv(path + '/config.yaml', path + '/mtr.yaml', path + '/runners.csv')
+    result = event.get_result()
+    global ROWS
+    ROWS = []
+    for o_class in result:
+        ROWS += [(str(i.id), str(i.place), i.fullname(), i.o_class, i.club, str(i.card_id), format_m_s(i.total_time), str(i.controls)) for i in o_class.runner_results]
+    print(ROWS)
+    app = TableApp()
+    app.run()
+
+if __name__ == "__main__":
+    main()

requirements.txt

@@ -1 +1,3 @@
 fpdf2
+pyserial
+rich

test_files/mtr_simulator/create_virt_serial.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+socat -d -d pty,rawer,b9600 pty,rawer,b9600

test_files/mtr_simulator/mtr_sim.py

@@ -0,0 +1,78 @@
+import sys
+sys.path.insert(0, '../../otime')
+import argparse
+import serial
+import otime
+from rich import inspect
+def main():
+    global package_n
+    package_n = 0
+    argparser = argparse.ArgumentParser(
+        description=("Acts as a live mtr reading data line by line from a log file and sending them over serial"))
+    argparser.add_argument('port', help='Serial port identifier')
+    argparser.add_argument(
+            '-f', '--file',
+            help=(
+                "Mtr log file to use"))
+    argparser.add_argument(
+            '-v', '--verbose', action='store_true', help='Verbose output')
+    args = argparser.parse_args()
+
+    port = serial.Serial(port=args.port, baudrate=9600)
+    event = otime.Event(0, 'NoName')
+    event.read_mtr_file(args.file)
+
+    for card in event.card_dumps:
+        input('Press enter to send next card')
+        if args.verbose == True:
+            inspect(card)
+        data = card_to_bytes(card)
+        port.write(data)
+
+def card_to_bytes(card):
+    global package_n
+    package_n += 1
+    msg = b'\xFF\xFF\xFF\xFF\xE6\x4D\x9C\x3E'
+    year = int(str(card.read_time.year)[2:4])
+    month = card.read_time.month
+    day = card.read_time.day
+    hour = card.read_time.hour
+    minute = card.read_time.minute
+    second = card.read_time.second
+    msg += year.to_bytes(1, byteorder='little')
+    msg += month.to_bytes(1, byteorder='little')
+    msg += day.to_bytes(1, byteorder='little')
+    msg += hour.to_bytes(1, byteorder='little')
+    msg += minute.to_bytes(1, byteorder='little')
+    msg += second.to_bytes(1, byteorder='little')
+    #ms
+    msg += b'\x00\x00'
+
+    msg += package_n.to_bytes(4, byteorder='little')
+    msg += card.card.to_bytes(3, byteorder='little')
+
+    # Gidder ikke å finne ut hva Producweek Producyear er
+    msg += b'\x00\x00'
+
+    # Hopper overogså over ECardHeadSum
+    msg += b'\x00'
+
+    for n in range(50):
+        try:
+            control = card.controls[n]
+            split = card.splits[n]
+        except:
+            control = 0
+            split = 0
+        msg += control.to_bytes(1, byteorder='little')
+        msg += split.to_bytes(2, byteorder='little')
+    # 56 byte string
+    msg += int(0).to_bytes(56, byteorder='little')
+    # Checksum
+    csum = sum(msg) % 256
+    msg += csum.to_bytes(1, byteorder='little')
+    msg += b'\x00'
+    return msg
+
+if __name__ == '__main__':
+    main()