swimstroke 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

swimstroke/helpers.py

@@ -52,8 +52,10 @@ def _event_key_from_event(event):
         event_prefix="A"
     elif event['type']=='Prelim':
         event_prefix="B"
-    elif event['type']=="Final":
+    elif event['type']=='Semi':
         event_prefix="C"
+    elif event['type']=="Final":
+        event_prefix="D"
 
     # pad some 0s on the event_str to make a lexicographic sort possible
     event_str = event['index']
@@ -68,8 +70,10 @@ def _event_key_from_entry(entry):
         event_prefix="A"
     elif entry['event_type']=='Prelim':
         event_prefix="B"
-    elif entry['event_type']=="Final":
+    elif entry['event_type']=="Semi":
         event_prefix="C"
+    elif entry['event_type']=="Final":
+        event_prefix="D"
 
     # pad some 0s on the event_str to make a lexicographic sort possible
     event_str = entry['event_index']

swimstroke/hy3.py

@@ -35,6 +35,7 @@ HY3_EVENT_COURSE_CODES = {
 }
 HY3_EVENT_TYPE_CODES = {
     "P":"Prelim",
+    "S":"Semi",
     "F":"Final",
 }
 
@@ -57,7 +58,9 @@ def load(fo):
     cur_entry = None
     cur_team = None
     _swimmer_code_to_ids = {}
+    _swimmer_id_generator = 0
     _team_short_names = set()
+    already_e2_submitted = False
     while ((record := fo.read(132))):
         line += 1
         try:
@@ -88,6 +91,11 @@ def load(fo):
                 swimmer_code = record[4:4+SWIMMER_CODE_LENGTH].decode('latin').lower() # don't strip, padding is part of the key
                 swimmer_gendercode = record[2:3].decode('latin')
                 swimmer_id = record[69:81].decode('latin').strip()
+                # swimmer ids are not mandatory! So we need to account for if they
+                # are not used in a file
+                if len(swimmer_id)==0:
+                    swimmer_id = f"swimstroke-id-{_swimmer_id_generator}"
+                    _swimmer_id_generator += 1
                 birthday_str = record[88:96].decode('latin')
                 swimmer_age = record[97:99].decode('latin').strip()
                 if swimmer_age == "":
@@ -114,6 +122,8 @@ def load(fo):
                     _swimmer_code_to_ids[swimmer_code] = swimmer_id
 
             elif rtype == b'E1': # individual entry record
+                already_e2_submitted = False
+
                 strokecode = record[21:22].decode('latin')
                 #print("stroke",HY3_STROKE_CODES[strokecode])
                 distance = int(record[15:21].decode('latin'))
@@ -151,6 +161,7 @@ def load(fo):
                     "event_gender":HY3_EVENT_GENDER_CODES[event_gendercode] if event_gendercode in HY3_EVENT_GENDER_CODES else "Unknown",
                     "event_course":None,
                     "event_coursecode":None,
+                    "event_typecode":None,
                     "event_type":"Final", # is this the correct default?
                     "event_date":None,
                     "heat":None,
@@ -165,6 +176,8 @@ def load(fo):
                     "seed_time_ms":seed_time_ms,
                     "seed_time_str":swimtimefmt(seed_time_ms),
                     "swimmer_ids":[cur_swimmer['swimmer_id']],
+                    "result_time_ms":None,
+                    "result_time_str":None,
                     "relay":False,
                     "dq":False,
                     "points":None,
@@ -182,8 +195,17 @@ def load(fo):
                 entries.append(cur_entry)
 
             elif rtype == b'E2': # continuation of an entry
+                # there can be multiple E2 lines per E1 which are multiple entries in each event (usually for prelim,semis,finals)
+                # we should probably make the seed time for semis be the prelim result time. and the result time for finals be the
+                # semis result time. TODO!
+
+                if already_e2_submitted: # we need to duplicate the entry and add it to the list
+                    cur_entry = cur_entry.copy()
+                    entries.append(cur_entry)
+                already_e2_submitted = True
 
                 event_type = record[2:3].decode('latin').strip()
+                cur_entry['event_typecode'] = event_type
                 if event_type in HY3_EVENT_TYPE_CODES:
                     cur_entry['event_type'] = HY3_EVENT_TYPE_CODES[event_type]
                 else:
@@ -260,6 +282,8 @@ def load(fo):
                     "event_gender":HY3_EVENT_GENDER_CODES[event_gendercode] if event_gendercode in HY3_EVENT_GENDER_CODES else "Unknown",
                     "event_course":None,
                     "event_coursecode":None,
+                    "event_typecode":None,
+                    "event_type":"Final", # is this the correct default?
                     "stroke":HY3_STROKE_CODES[strokecode],
                     "strokeshort":HY3_STROKE_CODES_SHORT[strokecode],
                     "distance":distance,
@@ -268,6 +292,8 @@ def load(fo):
                     "seed_coursecode":seed_coursecode,
                     "seed_time_ms":seed_time_ms,
                     "seed_time_str":swimtimefmt(seed_time_ms),
+                    "result_time_ms":None,
+                    "result_time_str":None,
                     "relay":True,
                     "teamname":relayname,
                     "swimmer_codes":[],
@@ -287,7 +313,9 @@ def load(fo):
                 entries.append(cur_entry)
 
             elif rtype == b'F2':
+                # TODO: update this in case relays have prelims, semis, final (as per E2 records above)
                 event_type = record[2:3].decode('latin').strip()
+                cur_entry['event_typecode'] = event_type
                 if event_type in HY3_EVENT_TYPE_CODES:
                     cur_entry['event_type'] = HY3_EVENT_TYPE_CODES[event_type]
                 else:

swimstroke-0.1.7.dist-info/METADATA

@@ -0,0 +1,6 @@
+Metadata-Version: 2.4
+Name: swimstroke
+Version: 0.1.7
+License-File: LICENSE
+Requires-Dist: PyYAML>=6.0.1
+Dynamic: license-file

{swimstroke-0.1.5.dist-info → swimstroke-0.1.7.dist-info}/RECORD

@@ -1,14 +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=v74U9SnSVhrvYdJLZO0kqZcPJHruKo8eiJaZRtXh0uc,6478
-swimstroke/hy3.py,sha256=_nQfsv94TEGrQWQN1IeusWo13AfhJih0xZyQuYgWI2Y,15667
+swimstroke/helpers.py,sha256=0yCYNSnnr_DBHU3ROTFHiEkb2q-OXO6iRe-dFE0G7iI,6598
+swimstroke/hy3.py,sha256=DZ0zsHEnm29SdggLs9jY6GEIDMipiqt6SEZFLcI3uHs,17169
 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=4qPS58tBF5u2VOn59o-Z2q5xzfpBOw_APZ2ybMrrxKw,6855
-swimstroke-0.1.5.dist-info/LICENSE,sha256=ua_EyrQ3shMEJAhfgGjSeK_mFf6AIT-QiFG2lQfsntY,1103
-swimstroke-0.1.5.dist-info/METADATA,sha256=RQEpoOMg2wk4z4r22Fhst3314HLCSDSqpn8kQvOgR6k,107
-swimstroke-0.1.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-swimstroke-0.1.5.dist-info/top_level.txt,sha256=C15CTf7t6T4k83ycljKbwYVziBgz5vqOBEYdK8Y6FfY,11
-swimstroke-0.1.5.dist-info/RECORD,,
+swimstroke-0.1.7.dist-info/licenses/LICENSE,sha256=ua_EyrQ3shMEJAhfgGjSeK_mFf6AIT-QiFG2lQfsntY,1103
+swimstroke-0.1.7.dist-info/METADATA,sha256=Y5_ktlCffb8IT8rbqEGihsIE_a1Fud-I8qood6yrYO4,127
+swimstroke-0.1.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+swimstroke-0.1.7.dist-info/top_level.txt,sha256=C15CTf7t6T4k83ycljKbwYVziBgz5vqOBEYdK8Y6FfY,11
+swimstroke-0.1.7.dist-info/RECORD,,

{swimstroke-0.1.5.dist-info → swimstroke-0.1.7.dist-info}/WHEEL

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

swimstroke-0.1.5.dist-info/METADATA

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