cli.py

@@ -4,7 +4,6 @@ import otime
 import argparse
 import datetime
 from rich import print
-from rich import inspect
 from rich.console import Console
 from rich.columns import Columns
 from rich.table import Table
@@ -54,7 +53,7 @@ def print_class_result(runners, o_class):
     for i in runners_ok:
         #if i.status() == 'OK':
         	pos += 1
-        	table.add_row(str(pos)+'.',i.fullname(), i.club, str(datetime.timedelta(seconds=i.totaltime())))
+        	table.add_row(str(pos)+'.',i.fullname(), i.status(), str(datetime.timedelta(seconds=i.totaltime())))
 
     console = Console()
     console.print(table)
@@ -105,12 +104,6 @@ def main():
     show_runners.add_argument('--ttdb', required=True, help='ttime database file')
     show_runners.add_argument('--mtr', required=True, help='mtr csv file')
 
-    show_runner = subparsers.add_parser('show_runner', help='show a table of runners')
-    show_runner.add_argument('--ttcnf', required=True, help='ttime configuration file')
-    show_runner.add_argument('--ttdb', required=True, help='ttime database file')
-    show_runner.add_argument('--mtr', required=True, help='mtr csv file')
-    show_runner.add_argument('--runner', required=True, help='Which runner to print')
-
     show_runners = subparsers.add_parser('show_result', help='show a table of runners')
     show_runners.add_argument('--ttcnf', required=True, help='ttime configuration file')
     show_runners.add_argument('--ttdb', required=True, help='ttime database file')
@@ -136,35 +129,21 @@ def main():
         runner_list = otime.ttime_db_to_class(args.ttdb, o_classes)
         otime.ttime_mtr_to_class(args.mtr, runner_list)
         print_runners(runner_list)
-    elif args.command == 'show_runner':
+    if args.command == 'show_result':
-        courses = otime.courses_from_ttime_conf(args.ttcnf)
-        o_classes = otime.classes_from_ttime_conf(args.ttcnf, courses)
-        runner_list = otime.ttime_db_to_class(args.ttdb, o_classes)
-        otime.ttime_mtr_to_class(args.mtr, runner_list)
-        for n in runner_list:
-            if args.runner == n.fullname():
-                inspect(n)
-                break
-        else:
-            print('Runner not found. Use full name.')
-
-
-    elif args.command == 'show_result':
         courses = otime.courses_from_ttime_conf(args.ttcnf)
         o_classes = otime.classes_from_ttime_conf(args.ttcnf, courses)
         runner_list = otime.ttime_db_to_class(args.ttdb, o_classes)
         otime.ttime_mtr_to_class(args.mtr, runner_list)
         for n in o_classes:
             if args.o_class_str == n.name:
-                sel_classes = [n]
+                o_class = n
                 break
         else:
-            sel_classes = o_classes
+            print('Class not found')
-        for o_class in sel_classes:
+        if args.splits:
-            if args.splits:
+            print_class_splits(runner_list, o_class)
-                print_class_splits(runner_list, o_class)
+        else:
-            else:
+            print_class_result(runner_list, o_class)
-                print_class_result(runner_list, o_class)
     elif args.command == 'show_classes':
         courses = otime.courses_from_ttime_conf(args.ttcnf)
         o_classes = otime.classes_from_ttime_conf(args.ttcnf, courses)
@@ -172,7 +151,7 @@ def main():
         otime.ttime_mtr_to_class(args.mtr, runner_list)
         print_o_classes(o_classes)
 
-    elif args.command == 'create_xml':
+    if args.command == 'create_xml':
         courses = otime.courses_from_ttime_conf(args.ttcnf)
         o_classes = otime.classes_from_ttime_conf(args.ttcnf, courses)
         runner_list = otime.ttime_db_to_class(args.ttdb, o_classes)

otime.py

@@ -37,22 +37,27 @@ class runner:
     def res_splits(self):
         control_map = self.check_codes()
         splits = []
+        lastn = 0
         for n in control_map:
-            splits.append(self.splits[n])
+            if n != lastn+1:
+                splits.append(self.splits[n])
+            else:
+                # Dette må testes ordentlig seinere!
+                gap = n - lastn
+                split = 0
+                for i in range(gap):
+                    split += self.splits[n-gap]
+                splits.append(split)
         return splits
 class course:
     def __init__(self, name, codes):
         self.name = name
         self.codes = codes
-    def __repr__(self):
-        return f'name({self.name})'
 
 class o_class:
     def __init__(self, name, course):
         self.name = name
         self.course = course
-    def __repr__(self):
-        return f'name({self.name})'
 
 def courses_from_ttime_conf(ttime_file = 'sc_2021_ttime/ttime.cnf.txt'):
     courses = []
@@ -120,7 +125,7 @@ def ttime_db_to_class(ttime_file, o_class_list=[]):
         eventorid = row[0]
         country = ''
         name = row[2].split(',')
-        first = name[1].strip()
+        first = name[1]
         last = name[0]
         try:
             club = row[4]

xml_results_gui.py

@@ -1,148 +0,0 @@
-import sys
-import gi
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-from gi.repository import Gtk, Adw
-
-import otime
-
-class MainWindow(Gtk.ApplicationWindow):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.set_default_size(500, 300)
-        self.set_title("ttime xml resultat generator")
-
-        self.box1 = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
-        self.box1.set_halign(Gtk.Align.CENTER)
-        self.box2 = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.mclamp = Adw.Clamp()
-        self.box1.append(self.mclamp)
-        self.mclamp.set_child(self.box2)
-
-
-        self.mainlist = Gtk.ListBox()
-        self.mainlist.set_selection_mode(Gtk.SelectionMode.NONE)
-        self.mainlist.set_margin_top(16)
-        self.mainlist.set_margin_bottom(8)
-        self.mainlist.get_style_context().add_class('boxed-list')
-
-        self.set_child(self.box1)
-        self.box2.append(self.mainlist)
-
-        self.cnf_row = Adw.ActionRow()
-        self.cnf_row.set_title('tTime konfigurasjons-fil')
-        self.cnf_row.set_subtitle('Ingen fil valgt')
-        self.mainlist.append(self.cnf_row)
-        self.cnf_btn_box = Gtk.Box()
-        self.cnf_f_btn = Gtk.Button(label='tTime konfigurasjon')
-        self.cnf_f_btn.set_valign(Gtk.Align.CENTER)
-        self.cnf_f_btn.set_icon_name("document-open-symbolic")
-        self.cnf_btn_box.append(self.cnf_f_btn)
-        self.cnf_row.add_suffix(self.cnf_btn_box)
-        self.cnf_f_dialog = Gtk.FileChooserNative.new(title="Velg konfigurasfila",
-                                                     parent=self, action=Gtk.FileChooserAction.OPEN)
-        self.cnf_f_dialog.connect("response", self.sel_cnf)
-        self.cnf_f_btn.connect("clicked", self.show_cnf_dialog)
-
-        self.db_row = Adw.ActionRow()
-        self.db_row.set_title('tTime database-fil')
-        self.db_row.set_subtitle('Ingen fil valgt')
-        self.mainlist.append(self.db_row)
-        self.db_btn_box = Gtk.Box()
-        self.db_f_btn = Gtk.Button(label='tTime database')
-        self.db_f_btn.set_valign(Gtk.Align.CENTER)
-        self.db_f_btn.set_icon_name("document-open-symbolic")
-        self.db_btn_box.append(self.db_f_btn)
-        self.db_row.add_suffix(self.db_btn_box)
-        self.db_f_dialog = Gtk.FileChooserNative.new(title="Velg databasefila",
-                                                     parent=self, action=Gtk.FileChooserAction.OPEN)
-        self.db_f_dialog.connect("response", self.sel_db)
-        self.db_f_btn.connect("clicked", self.show_db_dialog)
-
-
-        self.mtr_row = Adw.ActionRow()
-        self.mtr_row.set_title('MTR fil')
-        self.mtr_row.set_subtitle('Ingen fil valgt')
-        self.mainlist.append(self.mtr_row)
-        self.mtr_btn_box = Gtk.Box()
-        self.mtr_f_btn = Gtk.Button(label='mtr')
-        self.mtr_f_btn.set_valign(Gtk.Align.CENTER)
-        self.mtr_f_btn.set_icon_name("document-open-symbolic")
-        self.mtr_btn_box.append(self.mtr_f_btn)
-        self.mtr_row.add_suffix(self.mtr_btn_box)
-        self.mtr_f_dialog = Gtk.FileChooserNative.new(title="Velg mtr fila",
-                                                     parent=self, action=Gtk.FileChooserAction.OPEN)
-        self.mtr_f_dialog.connect("response", self.sel_mtr)
-        self.mtr_f_btn.connect("clicked", self.show_mtr_dialog)
-
-        self.save_btn = Gtk.Button(label="Generer xml fil")
-        self.save_btn.set_halign(Gtk.Align.CENTER)
-        self.save_btn.get_style_context().add_class('suggested-action')
-        self.box2.append(self.save_btn)
-        self.save_dialog = Gtk.FileChooserNative.new(title="lagre xml resultat fil",
-                                                     parent=self, action=Gtk.FileChooserAction.SAVE)
-        self.save_dialog.connect("response", self.save_xml)
-        self.save_btn.connect("clicked", self.show_save_dialog)
-
-
-    def show_cnf_dialog(self, button):
-        self.cnf_f_dialog.show()
-    def show_db_dialog(self, button):
-        self.db_f_dialog.show()
-    def show_mtr_dialog(self, button):
-        self.mtr_f_dialog.show()
-    def show_save_dialog(self, button):
-        self.save_dialog.show()
-
-    def sel_cnf(self, dialog, response):
-        print('test')
-        if response == Gtk.ResponseType.ACCEPT:
-            file = dialog.get_file()
-            filename = file.get_path()
-            self.cnf_row.set_subtitle(filename)
-            global ttime_cnf_file
-            ttime_cnf_file = filename  # Here you could handle opening or saving the file
-
-    def sel_db(self, dialog, response):
-        if response == Gtk.ResponseType.ACCEPT:
-            file = dialog.get_file()
-            filename = file.get_path()
-            self.db_row.set_subtitle(filename)
-            global ttime_db_file
-            ttime_db_file = filename  # Here you could handle opening or saving the file
-    def sel_mtr(self, dialog, response):
-        if response == Gtk.ResponseType.ACCEPT:
-            file = dialog.get_file()
-            filename = file.get_path()
-            self.mtr_row.set_subtitle(filename)
-            global mtr_file
-            mtr_file = filename
-    def save_xml(self, dialog, response):
-        print(ttime_cnf_file, ttime_db_file, mtr_file)
-        if response == Gtk.ResponseType.ACCEPT:
-            file = dialog.get_file()
-            filename = file.get_path()
-            courses = otime.courses_from_ttime_conf(ttime_cnf_file)
-            o_classes = otime.classes_from_ttime_conf(ttime_cnf_file, courses)
-            runners = otime.ttime_db_to_class(ttime_db_file, o_classes)
-            otime.ttime_mtr_to_class(mtr_file, runners)
-            otime.gen_xml_result(runners, o_classes).write(filename)
-
-class MyApp(Adw.Application):
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.connect('activate', self.on_activate)
-
-    def on_activate(self, app):
-        self.win = MainWindow(application=app)
-        self.win.present()
-
-ttime_cnf_file = ''
-ttime_db_file = ''
-mtr_file = ''
-
-def main():
-	app = MyApp(application_id='me.trygve.gtktest')
-	app.run(sys.argv)
-if __name__ == '__main__':
-    main()