swimstroke 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

swimstroke/helpers.py

@@ -70,56 +70,80 @@ def _event_key_from_entry(entry):
     return event_prefix+"-"+event_str
 
 def get_events(meetinfo):
-    teams_by_short_name = {}
-    events_by_key = {}
-    for team in meetinfo['teams']:
-        swimmers_by_code = {}
-        teams_by_short_name[team['short_name']] = team
-        for swimmer in team['swimmers']:
-            assert swimmer['swimmer_code'] not in swimmers_by_code
-            swimmers_by_code[swimmer['swimmer_code']] = swimmer
-        for entry in team['entries']:
-            event_key = _event_key_from_entry(entry)
-            if event_key not in events_by_key:
-                events_by_key[event_key] = {
-                    "event":entry['event_str'],
-                    "event_number":int(entry['event']),
-                    "date":entry['event_date'],
-                    "gender":entry['event_gender'],
-                    "gendercode":entry['event_gendercode'],
-                    "course":entry['event_course'],
-                    "coursecode":entry['event_coursecode'],
-                    "stroke":entry['stroke'],
-                    "strokeshort":entry['strokeshort'],
-                    "distance":entry['distance'],
-                    "relay":entry['relay'],
-                    "type":entry['event_type'],
-                    "entries":[],
-                    "num_heats":None
-                }
-                event = events_by_key[event_key]
-                name = "%s %d %s"%(event['gender'],event['distance'],event['strokeshort'])
-                if entry['relay']:
-                    name += " Relay"
-                event['name'] = name
+    if 'teams' in meetinfo:
+        teams_by_short_name = {}
+        events_by_key = {}
+        for team in meetinfo['teams']:
+            swimmers_by_code = {}
+            teams_by_short_name[team['short_name']] = team
+            for swimmer in team['swimmers']:
+                assert swimmer['swimmer_code'] not in swimmers_by_code
+                swimmers_by_code[swimmer['swimmer_code']] = swimmer
+            for entry in team['entries']:
+                event_key = _event_key_from_entry(entry)
+                if event_key not in events_by_key:
+                    events_by_key[event_key] = {
+                        "event":entry['event_str'],
+                        "event_number":int(entry['event']),
+                        "date":entry['event_date'],
+                        "gender":entry['event_gender'],
+                        "gendercode":entry['event_gendercode'],
+                        "course":entry['event_course'],
+                        "coursecode":entry['event_coursecode'],
+                        "stroke":entry['stroke'],
+                        "strokeshort":entry['strokeshort'],
+                        "distance":entry['distance'],
+                        "relay":entry['relay'],
+                        "type":entry['event_type'],
+                        "entries":[],
+                        "num_heats":None
+                    }
+                    event = events_by_key[event_key]
+                    name = "%s %d %s"%(event['gender'],event['distance'],event['strokeshort'])
+                    if entry['relay']:
+                        name += " Relay"
+                    event['name'] = name
+
+                entry = entry.copy()
+                entry['swimmers'] = [swimmers_by_code[s] for s in entry['swimmer_codes']]
 
-            entry = entry.copy()
-            entry['swimmers'] = [swimmers_by_code[s] for s in entry['swimmer_codes']]
+                events_by_key[event_key]['entries'].append(entry)
+                if entry['heat'] is not None:
+                    if events_by_key[event_key]['num_heats'] is None or \
+                            events_by_key[event_key]['num_heats']<entry['heat_number']:
+                        events_by_key[event_key]['num_heats'] = entry['heat_number']
 
-            events_by_key[event_key]['entries'].append(entry)
-            if entry['heat'] is not None:
-                if events_by_key[event_key]['num_heats'] is None or \
-                        events_by_key[event_key]['num_heats']<entry['heat_number']:
-                    events_by_key[event_key]['num_heats'] = entry['heat_number']
+        return [events_by_key[event_key] for event_key in sorted([event_key for event_key in events_by_key.keys()])]
+    elif 'events' in meetinfo:
+        return meetinfo['events']
+    else:
+        raise ValueError("meetinfo doesn't have entries or events keys")
 
-    events = [events_by_key[event_key] for event_key in sorted([event_key for event_key in events_by_key.keys()])]
-    return events
+def populate_heats(event):
+    event['heats'] = []
+    heats_by_key = {}
+    for entry in event['entries']:
+        if entry['heat'] is not None:
+            if entry['heat_number'] not in heats_by_key:
+                heats_by_key[entry['heat_number']] = {
+                    "heat":entry['heat'],
+                    "heat_number":entry['heat_number'],
+                    "entries":[]
+                }
+            heats_by_key[entry['heat_number']]['entries'].append(entry)
+    for heat_num in sorted([hnum for hnum in heats_by_key.keys()]):
+        heats_by_key[heat_num]['entries'].sort(key=lambda e:e['lane'])
+        event['heats'].append(heats_by_key[heat_num])
+    return event
 
 def get_lanes(meetinfo):
-    lanes = []
-    for team in meetinfo['teams']:
-        for entry in team['entries']:
-            if entry['lane'] is not None and entry['lane'] not in lanes:
-                lanes.append(entry['lane'])
-    lanes.sort()
-    return lanes
+    if 'teams' in meetinfo:
+        lanes = []
+        for team in meetinfo['teams']:
+            for entry in team['entries']:
+                if entry['lane'] is not None and entry['lane'] not in lanes:
+                    lanes.append(entry['lane'])
+        lanes.sort()
+        return lanes
+    else:
+        raise ValueError("meetinfo doesn't have entries")

swimstroke/hy3.py

@@ -109,11 +109,11 @@ def load(fo):
                     #print("couldn't convert event_num, leaving as string",event_num_str)
                     event_num = None
 
-                event_coursecode = record[50:51].decode('latin').strip()
-                if event_coursecode in HY3_EVENT_COURSE_CODES:
-                    event_course = HY3_EVENT_COURSE_CODES[event_coursecode]
+                seed_coursecode = record[50:51].decode('latin').strip()
+                if seed_coursecode in HY3_EVENT_COURSE_CODES:
+                    seed_course = HY3_EVENT_COURSE_CODES[seed_coursecode]
                 else:
-                    event_course = None
+                    seed_course = None
 
                 #print("event #",event_num)
                 # I'm not 100% sure this is the seed time field.
@@ -131,8 +131,8 @@ def load(fo):
                     "event_str":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":event_course,
-                    "event_coursecode":event_coursecode,
+                    "event_course":None,
+                    "event_coursecode":None,
                     "heat":None,
                     "heat_number":None,
                     "lane":None,
@@ -140,6 +140,8 @@ def load(fo):
                     "strokeshort":HY3_STROKE_CODES_SHORT[strokecode],
                     "distance":distance,
                     "seed_time":seed_time,
+                    "seed_course":seed_course,
+                    "seed_coursecode":seed_coursecode,
                     "seed_time_ms":seed_time_ms,
                     "seed_time_str":swimtimefmt(seed_time_ms),
                     "swimmer_codes":[cur_swimmer['swimmer_code']],
@@ -162,6 +164,12 @@ def load(fo):
                 cur_entry['event_datestr'] = record[87:95].decode('latin').strip()
                 cur_entry['event_date'] = _mmddyyyy_date_to_iso_date(cur_entry['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:
+                    print("no course?",record)
+
                 # results
                 cur_entry['result_time'] = record[5:11].decode('latin').strip()
                 if cur_entry['result_time'] == "" and cur_entry['result_time']!="0.00":
@@ -198,11 +206,11 @@ def load(fo):
                     #print("couldn't convert event_num, leaving as string",event_num_str)
                     event_num = None
 
-                event_coursecode = record[50:51].decode('latin').strip()
-                if event_coursecode in HY3_EVENT_COURSE_CODES:
-                    event_course = HY3_EVENT_COURSE_CODES[event_coursecode]
+                seed_coursecode = record[50:51].decode('latin').strip()
+                if seed_coursecode in HY3_EVENT_COURSE_CODES:
+                    seed_course = HY3_EVENT_COURSE_CODES[seed_coursecode]
                 else:
-                    event_course = None
+                    seed_course = None
 
                 # I'm not 100% sure this is the seed time field.
                 # there are other time fields and I don't have a
@@ -222,12 +230,14 @@ 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":event_course,
-                    "event_coursecode":event_coursecode,
+                    "event_course":None,
+                    "event_coursecode":None,
                     "stroke":HY3_STROKE_CODES[strokecode],
                     "strokeshort":HY3_STROKE_CODES_SHORT[strokecode],
                     "distance":distance,
                     "seed_time":seed_time,
+                    "seed_course":seed_course,
+                    "seed_coursecode":seed_coursecode,
                     "seed_time_ms":seed_time_ms,
                     "seed_time_str":swimtimefmt(seed_time_ms),
                     "relay":True,
@@ -253,6 +263,12 @@ def load(fo):
                 cur_entry['event_datestr'] = record[102:110].decode('latin').strip()
                 cur_entry['event_date'] = _mmddyyyy_date_to_iso_date(cur_entry['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:
+                    print("no course?",record)
+
                 # results
                 cur_entry['result_time'] = record[5:11].decode('latin').strip()
                 if cur_entry['result_time'] == "" and cur_entry['result_time']!="0.00":

{swimstroke-0.0.1.dist-info → swimstroke-0.0.3.dist-info}/METADATA

@@ -1,5 +1,5 @@
 Metadata-Version: 2.1
 Name: swimstroke
-Version: 0.0.1
+Version: 0.0.3
 License-File: LICENSE
 

{swimstroke-0.0.1.dist-info → swimstroke-0.0.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
 swimstroke/__init__.py,sha256=HTxCVaw1TLgpHMH8guB3hHYQ80cX6_fSEoPT_hz2Y8w,23
 swimstroke/__main__.py,sha256=XtPUjZM3ZTd_fEMmgZBqFlkp65eqXXcVWTXmQR9PF_A,657
 swimstroke/ev3.py,sha256=P5IkzYCqAH3E5ZzhJMyFztxo0PE4_-wmwIyOsDkagws,3793
-swimstroke/helpers.py,sha256=fyvNQ-62_2TgvK-CAf0M7Qcdg_XeIQb1w7aikP2qY_o,4815
-swimstroke/hy3.py,sha256=ajbPWd_uEANQ6sclf5ZOwOJ8XeWbAZTrvRO2BofhnIA,12231
+swimstroke/helpers.py,sha256=HgdD5bPzPZXHRWQANyha_n0oloZFPpjZ4pccd_4ICDE,5945
+swimstroke/hy3.py,sha256=Exs_cjsISZqOGUBaowhOQrspL_lcGvcWbESQ6CI8ZZc,13053
 swimstroke/scb.py,sha256=cC-rhzRvKpq60ux7MHm0ylj16qc21ZqhUBLQqxdJMQI,86
 swimstroke/sd3.py,sha256=JMYeTOk66YJInRReB3KMFyB1JKnX69sCHdC2_Ey2ypg,47
 swimstroke/util.py,sha256=s7cBEfHsdbYuID3bH2bAnw72zYHC2A4LroSf8iTH74o,586
 swimstroke/yaml.py,sha256=JMYeTOk66YJInRReB3KMFyB1JKnX69sCHdC2_Ey2ypg,47
-swimstroke-0.0.1.dist-info/LICENSE,sha256=ua_EyrQ3shMEJAhfgGjSeK_mFf6AIT-QiFG2lQfsntY,1103
-swimstroke-0.0.1.dist-info/METADATA,sha256=oHe4_t5QSZM8sGOyFW_mHwl9Crakiu1twQS_NN33A1Y,77
-swimstroke-0.0.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-swimstroke-0.0.1.dist-info/top_level.txt,sha256=C15CTf7t6T4k83ycljKbwYVziBgz5vqOBEYdK8Y6FfY,11
-swimstroke-0.0.1.dist-info/RECORD,,
+swimstroke-0.0.3.dist-info/LICENSE,sha256=ua_EyrQ3shMEJAhfgGjSeK_mFf6AIT-QiFG2lQfsntY,1103
+swimstroke-0.0.3.dist-info/METADATA,sha256=WgM6E9-UJM8e95NVtSxzEAA6LjkIwmA6-lYvbBXkHBk,77
+swimstroke-0.0.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+swimstroke-0.0.3.dist-info/top_level.txt,sha256=C15CTf7t6T4k83ycljKbwYVziBgz5vqOBEYdK8Y6FfY,11
+swimstroke-0.0.3.dist-info/RECORD,,