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

@@ -0,0 +1,55 @@
+from yaml import load, dump
+try:
+    from yaml import CLoader as Loader, CDumper as Dumper
+except ImportError:
+    from yaml import Loader, Dumper
+
+from copy import deepcopy
+import otime
+
+# Disse funksjonene er for å kunne lese og skrive seperate config, mtr og databasefiler.
+def write_config(event, file_path):
+    output_event = deepcopy(event)
+    output_event.runners = []
+    output_event.card_dumps = []
+    with open(file_path, 'w') as f:
+        dump(output_event, f)
+    
+def write_card_dumps(event, file_path):
+    card_dumps = deepcopy(event.card_dumps)
+    with open(file_path, 'w') as f:
+        dump(card_dumps, f)
+        
+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(',')
+        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

@@ -0,0 +1,212 @@
+import datetime
+import xml.etree.ElementTree as ET
+import otime
+
+def xml_child(parent, tag, content):
+    # Used to make creating xml files easier
+    e = ET.SubElement(parent, tag)
+    e.text = str(content)
+
+def create_result_file(event, file_path, o_classes=[]):
+    results = event.get_result(o_classes)
+    
+    root = ET.Element('ResultList')
+    root.set('xmlns', 'http://www.orienteering.org/datastandard/3.0')
+    root.set('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance')
+    root.set('iofVersion', '3.0')
+    root.set('createTime', datetime.datetime.now().isoformat(timespec='seconds'))
+    root.set('creator', 'oTime')
+    #root.set('status', 'Complete')
+    tree = ET.ElementTree(root)
+    xml_event = ET.SubElement(root, 'Event')
+    xml_child(xml_event, 'Id', event.id)
+    xml_child(xml_event, 'Name', event.name)
+    for i in results:
+        # <ClassResult>
+        class_result = ET.SubElement(root, 'ClassResult')
+        # <Class>
+        t = ET.SubElement(class_result, 'Class')
+        xml_child(t, 'Name', i.name)
+        # <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')
+            xml_child(person, 'Id', n.id)
+            # <Name>
+            name = ET.SubElement(person, 'Name')
+            xml_child(name, 'Family', n.last)
+            xml_child(name, 'Given', n.first)
+            # </Name>
+            # </Person>
+            # <Organisation>
+            org = ET.SubElement(person_result, 'Organisation')
+            xml_child(org, 'Id', n.club_id)
+            xml_child(org, 'Name', n.club)
+            country = ET.SubElement(org, 'Country')
+            # TODO: hent land fra løperobjektet
+            country.text = 'Norway'
+            country.set('code', 'NOR')
+            # </Organisation>
+            # <Result>
+            result = ET.SubElement(person_result, 'Result')
+
+            if n.status == 'OK' or n.status == 'MissingPunch':
+                xml_child(result, 'StartTime', n.start_time.isoformat())
+                xml_child(result, 'FinishTime', n.end_time.isoformat())
+                xml_child(result, 'Time', n.total_time)
+                if n.status == 'OK':
+                    # <TimeBehind>
+                    xml_child(result, 'TimeBehind', n.total_time - i.runner_results[0].total_time)
+                    # </TimeBehind>
+                    xml_child(result, 'Position', n.place)
+                    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.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.fork][:-1], n.splits[:-1]):
+                        st = ET.SubElement(result, 'SplitTime')
+                        xml_child(st, 'ControlCode', code)
+                        if split != 0: xml_child(st, 'Time', split)
+                else:
+                    xml_child(result, 'Status', n.status)
+            else:
+                xml_child(result, 'Status', n.status)
+            # </Result>
+        # </PersonResult>
+        # </Class>
+    ET.indent(root, space=' ', level=0)
+    tree.write(file_path)
+
+def runners_from_xml_entries(xml_file):
+    tree = ET.parse(xml_file)
+    root = tree.getroot()
+
+    url = '{http://www.orienteering.org/datastandard/3.0}'
+    runners = []
+    person_entries = root.findall(f'./{url}PersonEntry')
+    for p_entry in person_entries:
+
+        rid = p_entry[1][0].text
+
+        person = p_entry.find(f'./{url}Person')
+        name = person.find(f'./{url}Name')
+        first = name.find(f'./{url}Given').text
+        last = name.find(f'./{url}Family').text
+
+        organisation = p_entry.find(f'./{url}Organisation')
+        if organisation is not None:
+            club_id = organisation.find(f'./{url}Id').text
+            club_name = organisation.find(f'./{url}Name').text
+            club_name_short = organisation.find(f'./{url}ShortName').text
+            country = organisation.find(f'./{url}Country').attrib['code']
+        else:
+            club_id = club_name = club_name_short = country = None
+
+        class_el = p_entry.find(f'./{url}Class')
+        class_str = class_el.find(f'./{url}Name').text
+
+        fee_id = int(p_entry.find(f'./{url}AssignedFee/{url}Fee/{url}Id').text)
+
+        try:
+            card = int(p_entry.find(f'./{url}ControlCard').text)
+        except AttributeError:
+            card = None
+
+        start_time = None
+        runners.append(otime.Runner(rid, first, last, club=club_name, club_id=club_id,
+                              country=country,card_id=card, o_class=class_str,
+                              start_time=start_time, fee_id=fee_id))
+    return runners
+
+def fees_from_xml_entries(xml_file):
+    tree = ET.parse(xml_file)
+    root = tree.getroot()
+
+    url = '{http://www.orienteering.org/datastandard/3.0}'
+    allfees = root.findall(f'.//{url}Fee')
+    added_ids = []
+    fee_objs = []
+    for fee in allfees:
+        f_id = int(fee.find(f'./{url}Id').text)
+        if f_id not in added_ids:
+            added_ids.append(f_id)
+
+            fee_id = f_id
+            name = fee.find(f'./{url}Name').text
+            currency = fee.find(f'./{url}Amount').attrib['currency']
+            amount = int(fee.find(f'./{url}Amount').text)
+            try:
+                from_birth_date = fee.find(f'./{url}FromDateOfBirth').text
+            except AttributeError:
+                from_birth_date = None
+            try:
+                to_birth_date = fee.find(f'./{url}ToDateOfBirth').text
+            except AttributeError:
+                to_birth_date = None
+
+            fee_objs.append(otime.Fee(fee_id, name, currency, amount,
+                            from_birth_date=from_birth_date, to_birth_date=to_birth_date))
+    return fee_objs
+
+def courses_from_xml(xml_file):
+    tree = ET.parse(xml_file)
+    root = tree.getroot()
+
+    url = '{http://www.orienteering.org/datastandard/3.0}'
+    allcourses = root.findall(f'.//{url}Course')
+    courseobjs = []
+    for c in allcourses:
+        name = c.find(f'./{url}Name').text
+        controls = []
+        allcontrols = c.findall(f'./{url}CourseControl')
+        for n in allcontrols:
+            controls.append(n.find(f'./{url}Control').text)
+        controls.remove('STA1')
+        controls.remove('FIN1')
+        controls = [int(l) for l in controls]
+        courseobjs.append(otime.Course(name, [controls]))
+    return courseobjs
+
+def event_from_xml_entries(xml_file):
+    tree = ET.parse(xml_file)
+    root = tree.getroot()
+
+    url = '{http://www.orienteering.org/datastandard/3.0}'
+    event_el = root.find(f'./{url}Event')
+    event_id = int(event_el.find(f'./{url}Id').text)
+    name = event_el.find(f'./{url}Name').text
+    organiser = event_el.find(f'./{url}Organiser/{url}Name').text
+
+    start_ds = event_el.find(f'./{url}StartTime/{url}Date').text
+    start_ts = event_el.find(f'./{url}StartTime/{url}Time').text[:-1]
+    start_time = datetime.datetime.fromisoformat(f'{start_ds}T{start_ts}')
+
+    end_ds = event_el.find(f'./{url}EndTime/{url}Date').text
+    end_ts = event_el.find(f'./{url}EndTime/{url}Time').text[:-1]
+    end_time = datetime.datetime.fromisoformat(f'{end_ds}T{end_ts}')
+
+    person_entries = root.findall(f'./{url}PersonEntry')
+
+    class_names = []
+    for p_entry in person_entries: 
+        class_names.append(p_entry.find(f'./{url}Class/{url}Name').text)
+    o_classes = [otime.OClass(i, []) for i in set(class_names)]
+
+    runners = runners_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/otime.py

@@ -2,13 +2,12 @@ import copy
 import datetime
 import re
 import xml.etree.ElementTree as etree
-import pdf
 
 class Runner:
-    def __init__(self, runner_id: int, first: str, last: str, club=None, club_id=None,
+    def __init__(self, id: int, first: str, last: str, club=None, club_id=None,
                  country=None, card_id=None, o_class_str=None, o_class=None,
-                 fork=0, start_time=None, fee_id=None, fee=None):
-        self.id = runner_id
+                 fork=0, start_time=None, fee_id=None, fee=None, status_override=''):
+        self.id = id
         self.first = first
         self.last = last
         self.club = club
@@ -19,7 +18,8 @@ class Runner:
         self.fork = fork
         self.start_time = start_time
         self.fee_id = fee_id
-    
+        self.status_override = status_override
+
     def __repr__(self):
         return(f'name({self.fullname()})')
         
@@ -62,92 +62,6 @@ class Runner:
     def fullname(self):
         return '{} {}'.format(self.first, self.last)
 
-    def check_codes(self):
-        return contains(self.res_codes(), self.card_r.controls)
-
-    def totaltime(self):
-        f_control = self.res_codes()[-1]
-        try:
-            index = self.card_r.controls.index(f_control)
-            return self.card_r.splits[index]
-        except:
-            return 0
-
-    def status(self):
-        if hasattr(self, 'card_r') is False or self.o_class is None:
-            return 'Active'
-        elif self.check_codes():
-            return 'OK'
-        elif self.check_codes() is False:
-            return 'Disqualified'
-
-    # TODO: må forbedres
-    def rank(self, allrunners):
-        c_ranked = rank_runners(allrunners, self.o_class)
-        try:
-            return c_ranked.index(self) + 1
-        except ValueError:
-            return None
-
-    def get_codes(self):
-        if self.o_class.course.forked is False:
-            return self.o_class.course.codes
-        else:
-            return self.o_class.course.variations[self.fork]
-
-    # TODO: Mange bugs med løyper som har samme post flere ganger
-    # Used for making result files and tables
-    def get_splits(self):
-        if self.status() == 'OK':
-            splits_cpy = self.card_r.splits.copy()
-            for control in self.card_r.controls:
-                if control not in self.res_codes():
-                    index = self.card_r.controls.index(control)
-                    split = self.card_r.splits[index]
-                    splits_cpy.remove(split)
-            return splits_cpy
-
-        else:
-            splits_cpy = self.card_r.splits.copy()
-            for control in self.card_r.controls:
-                if control not in self.res_codes():
-                    index = self.card_r.controls.index(control)
-                    split = self.card_r.splits[index]
-                    try:
-                        splits_cpy.remove(split)
-                    except Exception:
-                        print('aaaaaa')
-
-
-            punches = self.card_r.controls.copy()
-            splits = []
-            for code in self.res_codes():
-                if punches[0] == code:
-                    splits.append(splits_cpy[0])
-                    splits_cpy.pop(0)
-                    punches.pop(0)
-                    continue
-                else:
-                    splits.append(None)
-            return splits
-
-    def asdict(self):
-        return {
-            'id': self.id,
-            'first': self.first,
-            'last': self.last,
-            'club_id': self.club_id,
-            'club': self.club,
-            'country': self.country,
-            'card': self.card,
-            'o_class_str': self.o_class_str,
-            'fork' : self.fork,
-            'start_time': self.start_time,
-            'fee_id': self.fee_id
-        }
-
-
-
 class CardDump:
     def __init__(self, card, controls, splits, read_time, s_time, f_time):
         self.card = card
@@ -180,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')
@@ -237,39 +151,25 @@ class CardDump:
             else:
                 s_time = read_time
                 f_time = read_time
+
+            # Remove mtr from splits:
+            if controls[-1] == 250:
+                controls.pop(-1)
+                splits.pop(-1)
             cards.append(CardDump(int(row[6]), controls, splits, read_time, s_time, f_time))
         return cards
 
-    def asdict(self):
-        return {
-            'card': self.card,
-            'controls': self.controls,
-            'splits': self.splits,
-            'read_time': self.read_time.isoformat(),
-            's_time': self.s_time.isoformat(),
-            'f_time': self.f_time.isoformat()
-        }
-
 # 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})'
 
-    def asdict(self):
-        return {
-            'name': self.name,
-            'codes': self.codes,
-            'forked': self.forked,
-            'variations': self.variations
-        }
-
 # Stored in Event.o_classes
 class OClass:
     def __init__(self, name, course):
@@ -280,8 +180,8 @@ class OClass:
         return f'name({self.name})'
 
 class RunnerResult:
-    def __init__(self, runner_id: int, first: str, last: str, status: str, place: int, total_time: int, split_times: list[int], end_time,
-                 club=None, club_id=None, country=None, card_id=None, o_class=None, fork=0, start_time=None, fee_id=None):
+    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, missed_controls=None, ran_other_course=None):
         self.id = runner_id
         self.first = first
         self.last = last
@@ -290,6 +190,7 @@ class RunnerResult:
         self.country = country
         self.card_id = card_id
         self.o_class = o_class
+        self.controls = controls
         self.fork = fork
         self.start_time = start_time
         self.fee_id = fee_id
@@ -297,17 +198,24 @@ class RunnerResult:
         self.status = status
         self.place = place
         self.total_time = total_time
-        self.split_times = split_times
+        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}'
 
 class ClassResult:
     def __init__(self, name: str, course: Course, runner_results: list[RunnerResult]):
-        self.name
-        self.course
-        self.runner_results
+        self.name = name
+        self.course = course
+        self.runner_results = runner_results
 
 class Event:
-    def __init__(self, eventid, name, start_time=None, end_time=None,
+    def __init__(self, eventid=0, name=None, start_time=None, end_time=None,
                  organiser=None, courses=[], o_classes=[], runners=[],
                  card_dumps=[], fees=[]):
         self.id = eventid
@@ -344,14 +252,103 @@ class Event:
             self.fees.append(n)
     
     def get_course(self, name):
-        pass
+        return next((copy.copy(i) for i in self.courses if i.name == name), None)
 
     def get_o_class(self, name):
         return next((copy.copy(i) for i in self.o_classes if i.name == name), None)
 
-    def get_runner(self, name):
-        pass
+    def get_card_dump(self, id):
+        return next((copy.copy(i) for i in self.card_dumps if i.card == id), None)
+
+    def get_runner(self, id):
+        return next((copy.copy(i) for i in self.runners if i.id == id), None)
+
+    def get_runner_status(self, id):
+        # https://github.com/international-orienteering-federation/datastandard-v3/blob/24eb108e4c6b5e2904e5f8f0e49142e45e2c5230/IOF.xsd#L2903C3-L2903C3
+        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 not self.get_card_dump(runner.card_id):
+            return 'Active'
+        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)
+        course = self.get_course(self.get_runner_o_class(id).course)
+        if card_dump == None or course == None:
+            return False
+
+        f_control = course.codes[runner.fork][-1]
+        # TODO: Må gjøres mer robust
+        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]
+        #Hvis det er en startid finner jeg tidsforskjellen mellom brikkestart og faktisk start og trekker den fra totaltida
+        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
+        try:
+            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
+
+        if card_dump == None:
+            return None
+
+        split_iter = zip(card_dump.controls, card_dump.splits).__iter__()
+        splits = [0] * len(codes)
+        for n, control in enumerate(codes):
+            if control not in card_dump.controls:
+                continue
+            while True:
+                try:
+                    punched_control, split = next(split_iter)
+                except StopIteration:
+                    break
+                if punched_control == control:
+                    splits[n] = split
+                    break
+        return splits
+
+    def get_runner_controls(self, id):
+        try:
+            return self.get_card_dump(self.get_runner(id).card_id).controls
+        except AttributeError:
+            return None
     
+    def get_runner_end_clock(self, id):
+        try:
+            return self.get_card_dump(self.get_runner(id).card_id).f_time
+        except AttributeError:
+            return None
+
     def get_result(self, o_classes: list[str] = []) -> list[ClassResult]:
         if not o_classes:
             o_classes = [i.name for i in self.o_classes]
@@ -362,29 +359,6 @@ class Event:
         self.add_fees(*fees_from_xml_entries(xml_file))
 
     # Må endres
-    def from_xml_entries(xml_file):
-        tree = ET.parse(xml_file)
-        root = tree.getroot()
-
-        url = '{http://www.orienteering.org/datastandard/3.0}'
-        event_el = root.find(f'./{url}Event')
-        event_id = int(event_el.find(f'./{url}Id').text)
-        name = event_el.find(f'./{url}Name').text
-        organiser = event_el.find(f'./{url}Organiser/{url}Name').text
-
-        start_ds = event_el.find(f'./{url}StartTime/{url}Date').text
-        start_ts = event_el.find(f'./{url}StartTime/{url}Time').text[:-1]
-        start_time = datetime.datetime.fromisoformat(f'{start_ds}T{start_ts}')
-
-        end_ds = event_el.find(f'./{url}EndTime/{url}Date').text
-        end_ts = event_el.find(f'./{url}EndTime/{url}Time').text[:-1]
-        end_time = datetime.datetime.fromisoformat(f'{end_ds}T{end_ts}')
-
-        runners = runners_from_xml_entries(xml_file)
-        fees = fees_from_xml_entries(xml_file)
-
-        return Event(event_id, name, organiser=organiser, runners=runners,
-                     fees=fees, start_time=start_time, end_time=end_time)
 
     def read_xml_courses(self, xml_file):
         self.courses = courses_from_xml(xml_file)
@@ -407,94 +381,6 @@ class Event:
     def create_result_pdf(self, file_path):
         pdf.create_result_list(copy.deepcopy(self), file_path)
 
-    def create_result_xml(self):
-        root = ET.Element('ResultList')
-        root.set('xmlns', 'http://www.orienteering.org/datastandard/3.0')
-        root.set('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance')
-        root.set('iofVersion', '3.0')
-        root.set('createTime', datetime.datetime.now().isoformat(timespec='seconds'))
-        root.set('creator', 'oTime')
-        root.set('status', 'Complete')
-        tree = ET.ElementTree(root)
-        event = ET.SubElement(root, 'Event')
-        xml_child(event, 'Id', self.id)
-        xml_child(event, 'Name', self.name)
-        for i in self.o_classes:
-            print('Hmmmmmm')
-            # <ClassResult>
-            class_result = ET.SubElement(root, 'ClassResult')
-            # <Class>
-            t = ET.SubElement(class_result, 'Class')
-            xml_child(t, 'Name', i.name)
-            # <PersonResult>
-            runners_same_c = get_runners_in_class(self.runners, i)
-            runners_ranked = rank_runners(runners_same_c, i)
-            # Put the OK runners first and Active last
-            runners_sorted = [i for i in runners_same_c if i not in runners_ranked]
-            runners_ranked.extend(runners_sorted)
-
-            for n in runners_ranked:
-                person_result = ET.SubElement(class_result, 'PersonResult')
-                # <Person>
-                person = ET.SubElement(person_result, 'Person')
-                xml_child(person, 'Id', n.id)
-                # <Name>
-                name = ET.SubElement(person, 'Name')
-                xml_child(name, 'Family', n.last)
-                xml_child(name, 'Given', n.first)
-                # </Name>
-                # </Person>
-                # <Organisation>
-                org = ET.SubElement(person_result, 'Organisation')
-                xml_child(org, 'Id', n.club_id)
-                xml_child(org, 'Name', n.club)
-                country = ET.SubElement(org, 'Country')
-                # TODO: hent land fra løperobjektet
-                country.text = 'Norway'
-                country.set('code', 'NOR')
-                # </Organisation>
-                # <Result>
-                result = ET.SubElement(person_result, 'Result')
-
-                # TODO: Dette bør skrives om til å bruke Runner metoder så mye som mulig.
-                if hasattr(n, 'card_r') and len(n.card_r.splits) > 2:
-                    xml_child(result, 'StartTime', n.card_r.s_time.isoformat())
-                    xml_child(result, 'FinishTime', n.card_r.f_time.isoformat())
-                    xml_child(result, 'Time', n.totaltime())
-                    if n.status() == 'OK':
-                        # <TimeBehind>
-                        xml_child(result, 'TimeBehind', n.totaltime() - runners_ranked[0].totaltime())
-                        # </TimeBehind>
-                        xml_child(result, 'Position', n.rank(self.runners))
-                        xml_child(result, 'Status', n.status())
-                        # <SplitTime>
-                        # TODO: ta utgangspunkt i løypa, ikke det brikka har stempla
-                        for code, split in zip(n.card_r.controls, n.card_r.splits):
-                            st = ET.SubElement(result, 'SplitTime')
-                            xml_child(st, 'ControlCode', code)
-                            xml_child(st, 'Time', split)
-                            if code == n.res_codes()[-1]:
-                                break
-                        # </SplitTime>
-                    elif n.status() == 'Disqualified':
-                        xml_child(result, 'Status', n.status())
-                        for code, split in zip(n.res_codes(), n.res_splits()):
-                            st = ET.SubElement(result, 'SplitTime')
-                            xml_child(st, 'ControlCode', code)
-                            if split is not None:
-                                xml_child(st, 'Time', split)
-                    else:
-                        xml_child(result, 'Status', n.status())
-                else:
-                    xml_child(result, 'Status', n.status())
-                # </Result>
-            # </PersonResult>
-            # </Class>
-        ET.indent(root, space=' ', level=0)
-        return tree
-
-# The runner object stores all the data specific to a runner.
-
 class Fee:
     def __init__(self, fee_id, name, currency, amount, from_birth_date=None,
                  to_birth_date=None):
@@ -505,21 +391,26 @@ class Fee:
         self.from_birth_date = from_birth_date
         self.to_birth_date = to_birth_date
 
-    def asdict(self):
-        return {
-            'id': self.id,
-            'name': self.name,
-            'currency': self.currency,
-            'amount': self.amount,
-            'from_birth_date': self.from_birth_date,
-            'to_birth_date': self.to_birth_date
-        }
-
 def produce_class_result(event, o_class_name) -> ClassResult:
     o_class = event.get_o_class(o_class_name)
     runners = event.get_runners_in_o_class(o_class_name)
-
+    ok_runners = [i for i in runners if event.get_runner_status(i.id) == 'OK']
+    ok_runners.sort(key=lambda i: event.get_runner_time(i.id))
+    dsq_runners = [i for i in runners if event.get_runner_status(i.id) == 'MissingPunch' or event.get_runner_status(i.id) == 'Disqualified']
+    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, 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,
+                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, 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)
 
 # TODO: Take string instead of file.
 def courses_from_ttime_conf(ttime_file):
@@ -534,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):
@@ -552,96 +443,6 @@ def classes_from_ttime_conf(ttime_file, courses):
                 loops += 1
     return o_classes
 
-def runners_from_xml_entries(xml_file):
-    tree = ET.parse(xml_file)
-    root = tree.getroot()
-
-    url = '{http://www.orienteering.org/datastandard/3.0}'
-    runners = []
-    person_entries = root.findall(f'./{url}PersonEntry')
-    for p_entry in person_entries:
-
-        rid = p_entry[1][0].text
-
-        person = p_entry.find(f'./{url}Person')
-        name = person.find(f'./{url}Name')
-        first = name.find(f'./{url}Given').text
-        last = name.find(f'./{url}Family').text
-
-        organisation = p_entry.find(f'./{url}Organisation')
-        if organisation is not None:
-            club_id = organisation.find(f'./{url}Id').text
-            club_name = organisation.find(f'./{url}Name').text
-            club_name_short = organisation.find(f'./{url}ShortName').text
-            country = organisation.find(f'./{url}Country').attrib['code']
-        else:
-            club_id = club_name = club_name_short = country = None
-
-        class_el = p_entry.find(f'./{url}Class')
-        class_str = class_el.find(f'./{url}Name').text
-
-        fee_id = int(p_entry.find(f'./{url}AssignedFee/{url}Fee/{url}Id').text)
-
-        try:
-            card = int(p_entry.find(f'./{url}ControlCard').text)
-        except AttributeError:
-            card = None
-
-        start_time = None
-        runners.append(Runner(rid, first, last, club=club_name, club_id=club_id,
-                              country=country,card=card, o_class_str=class_str,
-                              start_time=start_time, fee_id=fee_id))
-    return runners
-
-def fees_from_xml_entries(xml_file):
-    tree = ET.parse(xml_file)
-    root = tree.getroot()
-
-    url = '{http://www.orienteering.org/datastandard/3.0}'
-    allfees = root.findall(f'.//{url}Fee')
-    added_ids = []
-    fee_objs = []
-    for fee in allfees:
-        f_id = int(fee.find(f'./{url}Id').text)
-        if f_id not in added_ids:
-            added_ids.append(f_id)
-
-            fee_id = f_id
-            name = fee.find(f'./{url}Name').text
-            currency = fee.find(f'./{url}Amount').attrib['currency']
-            amount = int(fee.find(f'./{url}Amount').text)
-            try:
-                from_birth_date = fee.find(f'./{url}FromDateOfBirth').text
-            except AttributeError:
-                from_birth_date = None
-            try:
-                to_birth_date = fee.find(f'./{url}ToDateOfBirth').text
-            except AttributeError:
-                to_birth_date = None
-
-            fee_objs.append(Fee(fee_id, name, currency, amount,
-                            from_birth_date=from_birth_date, to_birth_date=to_birth_date))
-    return fee_objs
-
-def courses_from_xml(xml_file):
-    tree = ET.parse(xml_file)
-    root = tree.getroot()
-
-    url = '{http://www.orienteering.org/datastandard/3.0}'
-    allcourses = root.findall(f'.//{url}Course')
-    courseobjs = []
-    for c in allcourses:
-        name = c.find(f'./{url}Name').text
-        controls = []
-        allcontrols = c.findall(f'./{url}CourseControl')
-        for n in allcontrols:
-            controls.append(n.find(f'./{url}Control').text)
-        controls.remove('STA1')
-        controls.remove('FIN1')
-        controls = [int(l) for l in controls]
-        courseobjs.append(Course(name, controls))
-    return courseobjs
-
 # Checks if small list is in big list
 def contains(small, big):
     valid = True
@@ -660,17 +461,13 @@ def contains(small, big):
     else:
         return False
 
-def rank_runners(allrunners, o_class):
-    runners = get_runners_in_class(allrunners, o_class)
-    runners_ranked = []
-    for i in runners:
-        if i.status() == 'OK':
-            runners_ranked.append(i)
-    runners_ranked.sort(key=lambda x: x.totaltime())
-    return runners_ranked
+def find_missed_controls(punches, codes):
+        return [i for i in codes if i not in punches]
 
-
-# Used to make creating xml files easier
-def xml_child(parent, tag, content):
-    e = ET.SubElement(parent, tag)
-    e.text = str(content)
+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

@@ -1,22 +1,65 @@
+import datetime
 from fpdf import FPDF
 
-def create_start_list(event, file_path):
-        pdf = FPDF()
+def format_m_s(seconds):
+    if seconds == 0: return ''
+    minutes, seconds = divmod(seconds, 60)
+    return f'{minutes:02}:{seconds:02}'
 
+def create_result_list(event, file_path, o_classes=[]):
+        results = event.get_result(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
-        for runner in event.runners:
-            pdf.multi_cell(col_width, line_height, runner.fullname(), border=1, ln=3, max_line_height=pdf.font_size, align='L')
-            pdf.multi_cell(col_width, line_height, runner.o_class, border=1, ln=3, max_line_height=pdf.font_size)
-            pdf.multi_cell(col_width, line_height, str(runner.card_id), border=1, ln=3, max_line_height=pdf.font_size)
-            if runner.start_time is not None:
-                pdf.multi_cell(col_width, line_height, str(runner.start_time), border=1, ln=3, max_line_height=pdf.font_size)
-            else:
-                pdf.multi_cell(col_width, line_height, '', border=1, ln=3, max_line_height=pdf.font_size)
+
+        for class_result in results:
+            pdf.write(txt=class_result.name)
             pdf.ln(line_height)
+            for runner in class_result.runner_results:
+                if runner.status == 'OK':
+                    pdf.multi_cell(col_width, line_height, str(runner.place), border=1, ln=3, max_line_height=pdf.font_size, align='L')
+                else:
+                    pdf.multi_cell(col_width, line_height, runner.status, border=1, ln=3, max_line_height=pdf.font_size, align='L')
+                pdf.multi_cell(col_width, line_height, runner.fullname(), border=1, ln=3, max_line_height=pdf.font_size, align='L')
+                pdf.multi_cell(col_width, line_height, runner.club, border=1, ln=3, max_line_height=pdf.font_size)
+                if runner.status == 'OK':
+                    pdf.multi_cell(col_width, line_height, format_m_s(runner.total_time), border=1, ln=3, max_line_height=pdf.font_size)
+                else:
+                    pdf.multi_cell(col_width, line_height, '', border=1, ln=3, max_line_height=pdf.font_size)
+                pdf.ln(line_height)
+        pdf.output(file_path)
+
+def create_split_result_list(event, file_path, o_classes=[]):
+        results = event.get_result(o_classes)
+        
+        pdf = FPDF()
+        pdf.add_page(orientation='L')
+        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
+
+        for class_result in results:
+            col_width = 10
+            pdf.write(txt=class_result.name)
+            pdf.ln(line_height)
+            for runner in class_result.runner_results:
+                if runner.status == 'OK':
+                    pdf.multi_cell(5, line_height, str(runner.place), border=1, ln=3, max_line_height=pdf.font_size, align='L')
+                else:
+                    pdf.multi_cell(5, line_height, runner.status, border=1, ln=3, max_line_height=pdf.font_size, align='L')
+                pdf.multi_cell(30, line_height, runner.fullname(), border=1, ln=3, max_line_height=pdf.font_size, align='L')
+                pdf.multi_cell(30, line_height, runner.club, border=1, ln=3, max_line_height=pdf.font_size)
+                if runner.status == 'OK' or runner.status == 'MissingPunch':
+                    for split in runner.splits:
+                        pdf.multi_cell(col_width, line_height, format_m_s(split), border=1, ln=3, max_line_height=pdf.font_size)
+                    else:
+                        pdf.multi_cell(col_width, line_height, '', border=1, ln=3, max_line_height=pdf.font_size)
+                pdf.ln(line_height)
         pdf.output(file_path)
 
 def create_all_invoices(self, filename_prefix):

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

@@ -0,0 +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()

test_files/sc3_23/lenker.txt

@@ -0,0 +1 @@
+https://eventor.orientering.no/Events/Show/18618

test_files/sc3_23/sc3_test.py

@@ -1,13 +1,33 @@
 import sys
 sys.path.insert(0, '../../otime')
 import otime
+import pdf
+import iof_xml
+import file_io
 
-def main():
+def ttime_testing():
     event = otime.Event(0, 'TEEEST', start_time=None, end_time=None,organiser='Tygbe')
     event.read_ttime_cnf('tt.cnf')
     event.read_ttime_db('db.csv')
     event.read_mtr_file('mtr.csv')
-    print(event.get_result())
-    event.create_start_list_pdf('output/result.pdf')
+    pdf.create_split_result_list(event, 'output/result.pdf')
+    iof_xml.create_result_file(event, '/home/trygve/Prosjekter/simple-liveresults/resultater/Resultater.xml')
+    print(event.get_runner_status('1400'))
+    results = event.get_result()
+    print([pdf.format_m_s(i) for i in event.get_runner_splits('17')])
+    print([pdf.format_m_s(i) for i in event.get_card_dump(event.get_runner('17').card_id).splits])
+    file_io.write_config(event, 'output/config.yaml')
+    file_io.write_card_dumps(event, 'output/mtr.yaml')
+    file_io.write_runners_csv(event, 'output/runners.csv')
+    print(file_io.event_from_yaml_and_csv('output/config.yaml', 'output/mtr.yaml', 'output/runners.csv'))
+
+def xml_testing():
+    event = iof_xml.event_from_xml_entries('entries.xml')
+    event.courses = iof_xml.courses_from_xml('course.xml')
+    file_io.write_config(event, 'output/config.yaml')
+    file_io.write_card_dumps(event, 'output/mtr.yaml')
+    file_io.write_runners_csv(event, 'output/runners.csv')
+    print(file_io.event_from_yaml_and_csv('output/config.yaml', 'output/mtr.yaml', 'output/runners.csv'))
+
 if __name__ == '__main__':
-    main()
+    xml_testing()