swimstroke 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

swimstroke/__main__.py

@@ -1,11 +1,13 @@
 import sys
 from .helpers import load, populate_events_entries, populate_heats
 from .util import swimtimefmt
+import logging
+logging.basicConfig(level=logging.INFO)
 
 for filename in sys.argv[1:]:
     print(filename)
     meetinfo = load(filename)
-    #print(repr(meetinfo.))
+    #print(repr(meetinfo.keys()))
 
     populate_events_entries(meetinfo)
     for event in meetinfo['events']:
@@ -17,7 +19,7 @@ for filename in sys.argv[1:]:
         for entry in event['entries']:
             #print(repr(entry))
             if entry['relay']:
-                print(" * relay - ",entry['heat'],entry['lane'],entry['teamname'],', '.join([e['name'] for e in entry['swimmers']]),entry['event_type'])
+                print(" * relay - ",entry['heat'],entry['lane'],entry['teamname'],', '.join([e['name'] for e in entry['swimmers']]),entry['event_type'],"** DISQUALIFIED **" if entry['dq'] else "")
             else:
-                print(" * ",entry['heat'],entry['lane'],entry['swimmers'][0]['name'],swimtimefmt(entry['seed_time_ms']),entry['event_type'])
+                print(" * ",entry['heat'],entry['lane'],entry['swimmers'][0]['name'],swimtimefmt(entry['seed_time_ms']),entry['event_type'],"** DISQUALIFIED **" if entry['dq'] else "")
 

swimstroke/hy3.py

@@ -1,4 +1,6 @@
 from .util import *
+import logging
+logger = logging.getLogger(__name__)
 
 HY3_STROKE_CODES = {
     "A":"Freestyle",
@@ -50,7 +52,6 @@ def load(fo):
     teams = meetinfo['teams']
     swimmers = meetinfo['swimmers']
     entries = meetinfo['entries']
-    rtypes = {}
     line = 0
     cur_swimmer = None
     cur_entry = None
@@ -118,7 +119,7 @@ def load(fo):
                 distance = int(record[15:21].decode('latin'))
                 event_gendercode = record[14:15].decode('latin')
                 if event_gendercode not in HY3_EVENT_GENDER_CODES:
-                    print("unknown gender code",event_gendercode)
+                    logger.warning("unknown gender code %s",event_gendercode)
                 #print("distance",repr(record[67:71]))
                 #print("event #",record[72:76])
                 event_num_str = record[38:42].decode('latin').strip()
@@ -161,7 +162,19 @@ def load(fo):
                     "seed_time_str":swimtimefmt(seed_time_ms),
                     "swimmer_ids":[cur_swimmer['swimmer_id']],
                     "relay":False,
+                    "dq":False,
+                    "points":None,
+                    "place":None,
+                    "splits":None,
                 }
+
+                points = record[62:68].decode('latin').strip()
+                if points:
+                    points = float(points)
+                else:
+                    points = None
+                cur_entry['points'] = points
+
                 entries.append(cur_entry)
 
             elif rtype == b'E2': # continuation of an entry
@@ -183,7 +196,7 @@ def load(fo):
                 if cur_entry['event_coursecode'] in HY3_EVENT_COURSE_CODES:
                     cur_entry['event_course'] = HY3_EVENT_COURSE_CODES[cur_entry['event_coursecode']]
                 else:
-                    print("no course?",record)
+                    logger.warning("no course found? %s",repr(record))
 
                 # results
                 cur_entry['result_time'] = record[4:11].decode('latin').strip()
@@ -193,6 +206,8 @@ def load(fo):
                 else:
                     cur_entry['result_time_ms'] = int(cur_entry['result_time'].replace('.',''),10)*10
 
+                cur_entry['dq'] = (record[12:13].decode('latin') == "Q")
+
                 place = record[31:33].decode('latin').strip()
                 if place == "":
                     cur_entry['place'] = None
@@ -251,8 +266,20 @@ def load(fo):
                     "seed_time_str":swimtimefmt(seed_time_ms),
                     "relay":True,
                     "teamname":relayname,
-                    "swimmer_codes":[]
+                    "swimmer_codes":[],
+                    "dq":False,
+                    "points":None,
+                    "place":None,
+                    "splits":None,
                 }
+
+                points = record[62:68].decode('latin').strip()
+                if points:
+                    points = float(points)
+                else:
+                    points = None
+                cur_entry['points'] = points
+
                 entries.append(cur_entry)
 
             elif rtype == b'F2':
@@ -276,7 +303,7 @@ def load(fo):
                 if cur_entry['event_coursecode'] in HY3_EVENT_COURSE_CODES:
                     cur_entry['event_course'] = HY3_EVENT_COURSE_CODES[cur_entry['event_coursecode']]
                 else:
-                    print("no course?",record)
+                    logger.warning("no course found in record? %s",repr(record))
 
                 # results
                 cur_entry['result_time'] = record[5:11].decode('latin').strip()
@@ -286,6 +313,8 @@ def load(fo):
                 else:
                     cur_entry['result_time_ms'] = int(cur_entry['result_time'].replace('.',''),10)*10
 
+                cur_entry['dq'] = (record[12:13].decode('latin') == "Q")
+
                 place = record[31:33].decode('latin').strip()
                 if place == "":
                     cur_entry['place'] = None
@@ -293,7 +322,7 @@ def load(fo):
                     cur_entry['place'] = int(place,10)
 
             elif rtype == b'F3':
-                # load swimmers (could be more or less than 4! FIXME)
+                # load swimmers for the relay
                 swimmercodes = []
                 for swimmerposn in [4,17,30,43,56,69,82,95]:
                     swimmercode = record[swimmerposn:swimmerposn+SWIMMER_CODE_LENGTH].decode('latin').lower()
@@ -301,11 +330,19 @@ def load(fo):
                         swimmercodes.append(swimmercode)
                 cur_entry['swimmer_codes'] = swimmercodes
 
-            if rtype not in rtypes:
-                rtypes[rtype]=0
-            rtypes[rtype] = rtypes[rtype]+1
+            elif rtype == b'G1':
+                if cur_entry['splits'] is None:
+                    cur_entry['splits'] = []
+                for startidx in range(3,112,11):
+                    laps = record[startidx:startidx+2].decode('latin').strip()
+                    if not laps:
+                        break # no more splits
+                    laps = int(laps)
+                    splittime = record[startidx+2:startidx+10].decode('latin').strip()
+                    splittime = int(splittime.replace('.',''))*10 # convert to ms
+                    cur_entry['splits'].append((laps*25,splittime))
         except:
-            print("exception on line",line)
+            logger.exception("exception on line %d data %s", line, repr(record))
             raise
 
     # Make a mapping for all entries to swimmer IDs (which are more unique and useful than the swimmer codes)

swimstroke/scb.py

@@ -86,6 +86,7 @@ def load(fileobjs):
                     "place":None,
                     "swimmer_ids":[cur_swimmer['swimmer_id']],
                     "relay":False,
+                    "dq":False,
                 }
                 entries.append(entry)
     teams = [value for _,value in teams.items()] # convert to array

{swimstroke-0.1.1.dist-info → swimstroke-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swimstroke
-Version: 0.1.1
+Version: 0.1.3
 License-File: LICENSE
 Requires-Dist: PyYAML >=6.0.1
 

swimstroke-0.1.3.dist-info/RECORD

@@ -0,0 +1,14 @@
+swimstroke/__init__.py,sha256=HyRSzghNy1qExTdycvl7MsVvwQ7vi3FtqUQbobhepRo,78
+swimstroke/__main__.py,sha256=d0ln2BGuqyjDIB2OOmZEA4lOjPAjHARuzuo1_WomNZU,1212
+swimstroke/ev3.py,sha256=Ma1TsRQAop7wQNoeRBdKBZuQyuRpq08OYzdS7dr_llI,3579
+swimstroke/helpers.py,sha256=QA_GTUqVM7mYa_-n33e2AymBv76faV9_IGsNsv78GPw,6523
+swimstroke/hy3.py,sha256=KwhRFHS0T81NrvWF22ek9kdiCWbN4bHJViPqVIV4HO8,15500
+swimstroke/scb.py,sha256=ow-T4Ou6jC7PQdphARncM7T0hIzj20prD-C9JVBU6Y8,4307
+swimstroke/sd3.py,sha256=JMYeTOk66YJInRReB3KMFyB1JKnX69sCHdC2_Ey2ypg,47
+swimstroke/util.py,sha256=5Xfvfngv9T47U_7gddiPw80pHtTAlhomW40JUGDS2iI,1244
+swimstroke/yaml.py,sha256=KEZcsiMsq7TtWyxzZ06dzSm-oXJbipfKOybNNPmK8xE,6900
+swimstroke-0.1.3.dist-info/LICENSE,sha256=ua_EyrQ3shMEJAhfgGjSeK_mFf6AIT-QiFG2lQfsntY,1103
+swimstroke-0.1.3.dist-info/METADATA,sha256=66Ae9c2E2yBYG4tbRiEGpy6vhDgOmY1p2bjASjuqvA8,107
+swimstroke-0.1.3.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+swimstroke-0.1.3.dist-info/top_level.txt,sha256=C15CTf7t6T4k83ycljKbwYVziBgz5vqOBEYdK8Y6FfY,11
+swimstroke-0.1.3.dist-info/RECORD,,

{swimstroke-0.1.1.dist-info → swimstroke-0.1.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (70.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

swimstroke-0.1.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-swimstroke/__init__.py,sha256=HyRSzghNy1qExTdycvl7MsVvwQ7vi3FtqUQbobhepRo,78
-swimstroke/__main__.py,sha256=US-YR52wKJIZrr2KiCgZOwhALJM_8w_wPw7cUFA1HVQ,1063
-swimstroke/ev3.py,sha256=Ma1TsRQAop7wQNoeRBdKBZuQyuRpq08OYzdS7dr_llI,3579
-swimstroke/helpers.py,sha256=QA_GTUqVM7mYa_-n33e2AymBv76faV9_IGsNsv78GPw,6523
-swimstroke/hy3.py,sha256=9bTkI5vnkgwUfnma58TUYvzt82R1HsznIZU9u_rf4fw,13992
-swimstroke/scb.py,sha256=CYiYKe2HFpG43Ty2LA1Bdgk6mJSyheFw2Q_8_vWrf-E,4275
-swimstroke/sd3.py,sha256=JMYeTOk66YJInRReB3KMFyB1JKnX69sCHdC2_Ey2ypg,47
-swimstroke/util.py,sha256=5Xfvfngv9T47U_7gddiPw80pHtTAlhomW40JUGDS2iI,1244
-swimstroke/yaml.py,sha256=KEZcsiMsq7TtWyxzZ06dzSm-oXJbipfKOybNNPmK8xE,6900
-swimstroke-0.1.1.dist-info/LICENSE,sha256=ua_EyrQ3shMEJAhfgGjSeK_mFf6AIT-QiFG2lQfsntY,1103
-swimstroke-0.1.1.dist-info/METADATA,sha256=NWo41UNywuO4QggFH8HZyhZQry4lwHzcpNDqLRfl3Wc,107
-swimstroke-0.1.1.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-swimstroke-0.1.1.dist-info/top_level.txt,sha256=C15CTf7t6T4k83ycljKbwYVziBgz5vqOBEYdK8Y6FfY,11
-swimstroke-0.1.1.dist-info/RECORD,,