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

swimstroke/ev3.py

@@ -1,6 +1,6 @@
 from .hy3 import HY3_EVENT_TYPE_CODES, HY3_STROKE_CODES, HY3_STROKE_CODES_SHORT, HY3_EVENT_COURSE_CODES
 import datetime, csv, codecs
-from .util import swimtime_strtoms
+from .util import swimtime_strtoms, try_int
 
 GENDER_CODES = {
     "M":"Men",
@@ -56,16 +56,25 @@ def load(fo):
                     "distance":int(eventinfo_line[8]),
                     "relay":eventinfo_line[4]=="R",
                     "type":HY3_EVENT_TYPE_CODES[eventinfo_line[2]],
+                    "age_from":None,
+                    "age_to":None,
                     "eligibility":[],
                     "entries":[],
                     "num_heats":None
                 }
             meetinfo['events'].append(eventinfo)
-        
+
+        age_from = try_int(eventinfo_line[6])
+        age_to = try_int(eventinfo_line[7])
+        if eventinfo['age_from'] is None or age_from<eventinfo['age_from']:
+            eventinfo['age_from'] = age_from
+        if eventinfo['age_to'] is None or age_to>eventinfo['age_to']:
+            eventinfo['age_to'] = age_to
+
         if eventinfo_line[16].strip():
             eventinfo['eligibility'].append({
-            "age_from":int(eventinfo_line[6]),
-            "age_to":int(eventinfo_line[7]),
+            "age_from":age_from,
+            "age_to":age_to,
             "time_ms":swimtime_strtoms(eventinfo_line[16].strip()),
             "course":"LCM",
             "gendercode":eventinfo_line[5],
@@ -73,8 +82,8 @@ def load(fo):
             })
         if eventinfo_line[18].strip():
             eventinfo['eligibility'].append({
-            "age_from":int(eventinfo_line[6]),
-            "age_to":int(eventinfo_line[7]),
+            "age_from":age_from,
+            "age_to":age_to,
             "time_ms":swimtime_strtoms(eventinfo_line[18].strip()),
             "course":"SCM",
             "gendercode":eventinfo_line[5],
@@ -82,8 +91,8 @@ def load(fo):
             })
         if not (eventinfo_line[16].strip() or eventinfo_line[18].strip()):
             eventinfo['eligibility'].append({
-            "age_from":int(eventinfo_line[6]),
-            "age_to":int(eventinfo_line[7]),
+            "age_from":age_from,
+            "age_to":age_to,
             "time_ms":None,
             "gendercode":eventinfo_line[5],
             "gender":GENDER_CODES[eventinfo_line[5]],

swimstroke/helpers.py

@@ -104,11 +104,14 @@ def build_events_from_entries(meetinfo):
                         "distance":entry['distance'],
                         "relay":entry['relay'],
                         "type":entry.get('event_type',None),
+                        "age_from":entry['event_age_from'],
+                        "age_to":entry['event_age_to'],
                         "eligibility":None,
                         "num_heats":None
                     }
                     event = events_by_key[event_key]
 
+                    # TODO: include age in the name?
                     name = "%s %d %s"%(event['gender'],event['distance'],event['strokeshort'])
                     if entry['relay']:
                         name += " Relay"
@@ -161,7 +164,8 @@ def get_lanes(meetinfo):
     if 'entries' in meetinfo:
         lanes = []
         for entry in meetinfo['entries']:
-            if entry['lane'] is not None and entry['lane'] not in lanes:
+            # if heat is 0, then this isn't a valid lane entry
+            if entry['heat'] is not None and entry['heat']!="0" and entry['lane'] is not None and entry['lane'] not in lanes:
                 lanes.append(entry['lane'])
         lanes.sort()
         return lanes

swimstroke/hy3.py

@@ -58,9 +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
+    default_course_code = None
     while ((record := fo.read(132))):
         line += 1
         try:
@@ -72,10 +72,15 @@ def load(fo):
                 meetinfo['startdate'] = _mmddyyyy_date_to_iso_date(startdate_str)
                 enddate_str   = record[100:108].decode('latin').strip()
                 meetinfo['enddate'] = _mmddyyyy_date_to_iso_date(enddate_str)
+            elif rtype == b'B2':
+                default_course_code = record[98:99].decode('latin').strip()
+                if len(default_course_code)==0:
+                    default_course_code = None
             elif rtype == b"C1":
                 cur_team = {
                     "short_name":record[2:7].decode('latin').strip(),
                     "name":record[7:37].decode('latin').strip(),
+                    "region":record[53:55].decode('latin').strip(), # the State in the USA
                 }
                 # don't add duplicates (some files have them...)
                 if cur_team['short_name'] not in _team_short_names:
@@ -93,10 +98,9 @@ def load(fo):
                 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')
+                if len(swimmer_id)==0:
+                    swimmer_id = f"swimstroke-id-{swimmer_code}-{birthday_str}"
                 swimmer_age = record[97:99].decode('latin').strip()
                 if swimmer_age == "":
                     swimmer_age = None
@@ -155,15 +159,20 @@ def load(fo):
                     seed_time = None
                     seed_time_ms = None
 
+                event_age_from = int(record[22:25].decode('latin').strip())
+                event_age_to = int(record[25:28].decode('latin').strip())
+
                 cur_entry = {
                     "event_index":event_num_str,
                     "event_gendercode":event_gendercode,
                     "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_course":HY3_EVENT_COURSE_CODES[default_course_code] if default_course_code is not None and default_course_code in HY3_EVENT_COURSE_CODES else None,
+                    "event_coursecode":default_course_code,
                     "event_typecode":None,
                     "event_type":"Final", # is this the correct default?
                     "event_date":None,
+                    "event_age_from":event_age_from,
+                    "event_age_to":event_age_to,
                     "heat":None,
                     "heat_number":None,
                     "lane":None,
@@ -218,11 +227,15 @@ def load(fo):
                 event_datestr = record[87:95].decode('latin').strip()
                 cur_entry['event_date'] = _mmddyyyy_date_to_iso_date(event_datestr)
 
-                cur_entry['event_coursecode'] = record[11:12].decode('latin').strip()
-                if cur_entry['event_coursecode'] in HY3_EVENT_COURSE_CODES:
-                    cur_entry['event_course'] = HY3_EVENT_COURSE_CODES[cur_entry['event_coursecode']]
-                else:
-                    logger.warning("no course found? %s",repr(record))
+                # override the default with what the file says                
+                event_coursecode = record[11:12].decode('latin').strip()
+                if len(event_coursecode):
+                    cur_entry['event_coursecode'] = event_coursecode
+                    if cur_entry['event_coursecode'] in HY3_EVENT_COURSE_CODES:
+                        cur_entry['event_course'] = HY3_EVENT_COURSE_CODES[cur_entry['event_coursecode']]
+                    else:
+                        #logger.warning("no course found in record? %s",repr(record))
+                        pass
 
                 # results
                 cur_entry['result_time'] = record[4:11].decode('latin').strip()
@@ -273,6 +286,9 @@ def load(fo):
                     seed_time_ms = None
                     seed_time = None
 
+                event_age_from = int(record[22:25].decode('latin').strip())
+                event_age_to = int(record[25:28].decode('latin').strip())
+
                 cur_entry = {
                     "event_index":event_num_str,
                     "heat":None,
@@ -280,10 +296,12 @@ def load(fo):
                     "lane":None,
                     "event_gendercode":event_gendercode,
                     "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_course":HY3_EVENT_COURSE_CODES[default_course_code] if default_course_code is not None and default_course_code in HY3_EVENT_COURSE_CODES else None,
+                    "event_coursecode":default_course_code,
                     "event_typecode":None,
                     "event_type":"Final", # is this the correct default?
+                    "event_age_from":event_age_from,
+                    "event_age_to":event_age_to,
                     "stroke":HY3_STROKE_CODES[strokecode],
                     "strokeshort":HY3_STROKE_CODES_SHORT[strokecode],
                     "distance":distance,
@@ -330,12 +348,16 @@ def load(fo):
 
                 event_datestr = record[102:110].decode('latin').strip()
                 cur_entry['event_date'] = _mmddyyyy_date_to_iso_date(event_datestr)
-                
-                cur_entry['event_coursecode'] = record[11:12].decode('latin').strip()
-                if cur_entry['event_coursecode'] in HY3_EVENT_COURSE_CODES:
-                    cur_entry['event_course'] = HY3_EVENT_COURSE_CODES[cur_entry['event_coursecode']]
-                else:
-                    logger.warning("no course found in record? %s",repr(record))
+
+                # override the default with what the file says                
+                event_coursecode = record[11:12].decode('latin').strip()
+                if len(event_coursecode):
+                    cur_entry['event_coursecode'] = event_coursecode
+                    if cur_entry['event_coursecode'] in HY3_EVENT_COURSE_CODES:
+                        cur_entry['event_course'] = HY3_EVENT_COURSE_CODES[cur_entry['event_coursecode']]
+                    else:
+                        #logger.warning("no course found in record? %s",repr(record))
+                        pass
 
                 # results
                 cur_entry['result_time'] = record[5:11].decode('latin').strip()

swimstroke/scb.py

@@ -71,6 +71,8 @@ def load(fileobjs):
                     "event_course":None,
                     "event_coursecode":None,
                     "event_type":"Final",
+                    "event_age_from":None,
+                    "event_age_to":None,
                     "heat":str(heat),
                     "heat_number":heat,
                     "lane":lane,

swimstroke/util.py

@@ -1,3 +1,9 @@
+def try_int(numstr):
+    try:
+        return int(numstr)
+    except ValueError:
+        return None
+
 def swimtimefmt(time_ms):
     if time_ms is None:
         return ""

{swimstroke-0.1.7.dist-info → swimstroke-0.1.9.dist-info}/METADATA

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

swimstroke-0.1.9.dist-info/RECORD

@@ -0,0 +1,14 @@
+swimstroke/__init__.py,sha256=HyRSzghNy1qExTdycvl7MsVvwQ7vi3FtqUQbobhepRo,78
+swimstroke/__main__.py,sha256=d0ln2BGuqyjDIB2OOmZEA4lOjPAjHARuzuo1_WomNZU,1212
+swimstroke/ev3.py,sha256=ex3E85naoabIJZ3WbwLnhBYuFsexc-WNjd_KEJshKsg,3885
+swimstroke/helpers.py,sha256=mlEvjs65_a5o9RjHd5l67gM9q-gxXCoC8oITgNYiSn0,6883
+swimstroke/hy3.py,sha256=n-f3zklK_93srPx3EQ97j9ULeekPgrBL43M2_GW2gac,18668
+swimstroke/scb.py,sha256=UEpcPo4ECufoY-rYZrHI7YCQfyEK4X6cgC91ZoEp2DA,4391
+swimstroke/sd3.py,sha256=JMYeTOk66YJInRReB3KMFyB1JKnX69sCHdC2_Ey2ypg,47
+swimstroke/util.py,sha256=AOABVaHL6TMgnlZXeIHHEtVbB_wA7DXACeKVI0IG3vA,1345
+swimstroke/yaml.py,sha256=4qPS58tBF5u2VOn59o-Z2q5xzfpBOw_APZ2ybMrrxKw,6855
+swimstroke-0.1.9.dist-info/licenses/LICENSE,sha256=ua_EyrQ3shMEJAhfgGjSeK_mFf6AIT-QiFG2lQfsntY,1103
+swimstroke-0.1.9.dist-info/METADATA,sha256=TA5ynCa8yPqx90xSdiFRLjOtQZtQIuvVhIXLXrP9znQ,127
+swimstroke-0.1.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+swimstroke-0.1.9.dist-info/top_level.txt,sha256=C15CTf7t6T4k83ycljKbwYVziBgz5vqOBEYdK8Y6FfY,11
+swimstroke-0.1.9.dist-info/RECORD,,

swimstroke-0.1.7.dist-info/RECORD

@@ -1,14 +0,0 @@
-swimstroke/__init__.py,sha256=HyRSzghNy1qExTdycvl7MsVvwQ7vi3FtqUQbobhepRo,78
-swimstroke/__main__.py,sha256=d0ln2BGuqyjDIB2OOmZEA4lOjPAjHARuzuo1_WomNZU,1212
-swimstroke/ev3.py,sha256=Ma1TsRQAop7wQNoeRBdKBZuQyuRpq08OYzdS7dr_llI,3579
-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.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,,