Småforbedringer

otime/__main__.py

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

otime/cli.py

@@ -2,13 +2,19 @@ import argparse
 import file_io
 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
 
 # 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 = 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='./',
@@ -19,14 +25,18 @@ def main():
     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')
 
     args = parser.parse_args()
+
+    if not args.xml_path:
+        args.xml_path = args.dir + '/output'
+
     match args.command:
         case 'init':
             init_dir(args.dir, args.entries_file, args.courses_file)
         case 'run':
-            run(args.port, args.dir)
+            run(args.port, args.dir, args.xml_path)
 
 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
@@ -36,16 +46,24 @@ def init_dir(project_dir, entries_xml_file, courses_xml_file):
     
     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')
 
-def run(port='/dev/ttyUSB0', dir='./'):
+    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 = dir + '/config.yaml'
-    mtr_path = dir + '/mtr.yaml'
-    csv_path = dir + '/runners.csv'
+    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:
             mtr.read_until(expected=b'\xFF\xFF\xFF\xFF')
@@ -58,16 +76,30 @@ def run(port='/dev/ttyUSB0', dir='./'):
                 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(55)
                 inspect(status)
 
 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:
-        return f'{runner.fullname()}, {runner.o_class}, {runner.club}, {event.get_runner_status(runner.id)}, {event.get_runner_time(runner.id)}'
-    else:
+    if runner is None:
         return 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! 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]'
 
 if __name__ == '__main__':
     main()

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)

otime/otime.py

@@ -94,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')
@@ -182,7 +182,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):
         self.id = runner_id
         self.first = first
         self.last = last
@@ -268,13 +268,17 @@ class Event:
         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):
             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_time(self, id):
         runner = self.get_runner(id)
         card_dump = self.get_card_dump(runner.card_id)
@@ -331,7 +335,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))
@@ -379,11 +383,11 @@ 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) 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)
 

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

requirements.txt

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