hytek-parser 2.1.0__tar.gz → 2.3.0__tar.gz

{hytek_parser-2.1.0 → hytek_parser-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hytek-parser
-Version: 2.1.0
+Version: 2.3.0
 Summary: Parsers for the files produced by Hytek's Meet Manager.
 Home-page: https://www.github.com/SwimComm/hytek-parser
 License: MIT

{hytek_parser-2.1.0 → hytek_parser-2.3.0}/hytek_parser/__init__.py

@@ -1,4 +1,6 @@
 """A Hytek hy3 file parser."""
+from importlib.metadata import version
+
 from .export_xls import ExportXlsParseError, parse_event_export_xls
 from .hy3 import HY3_LINE_PARSERS
 from .hy3_parser import parse_hy3
@@ -15,4 +17,4 @@ __all__ = [
 ]
 __author__ = "Nino Maruszewski"
 __license__ = "MIT"
-__version__ = "2.1.0"
+__version__ = version(__package__)

{hytek_parser-2.1.0 → hytek_parser-2.3.0}/hytek_parser/hy3/line_parsers/__init__.py

@@ -9,7 +9,7 @@ from .d_swimmer_parsers import d1_parser
 from .e_event_parsers import e1_parser, e2_parser
 from .f_relay_parsers import f1_parser, f2_parser, f3_parser
 from .g_split_parsers import g1_parser
-from .h_dq_parsers import h1_parser
+from .h_dq_parsers import h1_parser, h2_parser
 
 __all__ = ["HY3_LINE_PARSERS"]
 
@@ -38,4 +38,5 @@ HY3_LINE_PARSERS: dict[
     "G1": g1_parser,
     # DQ info
     "H1": h1_parser,
+    "H2": h2_parser,
 }

{hytek_parser-2.1.0 → hytek_parser-2.3.0}/hytek_parser/hy3/line_parsers/b_meet_parsers.py

@@ -33,6 +33,8 @@ def b2_parser(
     meet.masters = extract(line, 94, 2) == "06"
     meet.type_ = select_from_enum(MeetType, extract(line, 97, 2))
     meet.course = select_from_enum(Course, extract(line, 99, 1))
+    meet.notes = extract(line, 3, 45) or None
+    meet.sanction_number = extract(line, 109, 20) or None
 
     file.meet = meet
     return file

{hytek_parser-2.1.0 → hytek_parser-2.3.0}/hytek_parser/hy3/line_parsers/d_swimmer_parsers.py

@@ -26,9 +26,12 @@ def d1_parser(
 
     # previously dropped D1 fields. Capture both per spec.
     # citizenship: cols 113-115 (3 chars). Observed: 'USA' or blank.
-    # unparsed_d1_col_125: col 125 (1 char). Observed: 'N' or blank; semantics unverified.
+    # status: col 125 (1 char). Athlete status; observed 'N' (Normal) or blank.
     swimmer.citizenship = extract(line, 113, 3) or None
-    swimmer.unparsed_d1_col_125 = extract(line, 125, 1) or None
+    swimmer.status = extract(line, 125, 1) or None
+    # class_year: cols 100-101 (2 chars). "Fr"/"So"/"Jr"/"Sr" school
+    # class in HS-meet exports; other data / blank in club exports.
+    swimmer.class_year = extract(line, 100, 2) or None
 
     swimmer.team_code = team_code
 

{hytek_parser-2.1.0 → hytek_parser-2.3.0}/hytek_parser/hy3/line_parsers/e_event_parsers.py

@@ -66,8 +66,9 @@ def e1_parser(
     # Meet Division: col 77-79 in most MM versions, col 92-93 in MM4/MM5-7.0Fa.
     # The two are mutually exclusive; col 77 takes precedence.
     meet_division = extract(line, 77, 3) or extract(line, 92, 2) or None
+    exhibition = extract(line, 84, 1) == "X"
 
-    event.get_or_create_entry(
+    entry = event.get_or_create_entry(
         swimmers=entry_swimmers,
         relay=False,
         event_number=entry_event_number,
@@ -76,6 +77,7 @@ def e1_parser(
         converted_seed_time=entry_converted_seed_time,
         converted_seed_time_course=entry_converted_seed_time_course,
         meet_division=meet_division,
+        exhibition=exhibition,
     )
 
     # Update event

{hytek_parser-2.1.0 → hytek_parser-2.3.0}/hytek_parser/hy3/line_parsers/h_dq_parsers.py

@@ -47,3 +47,31 @@ def h1_parser(
     file.meet.last_event = (event_num, event)
 
     return file
+
+
+def h2_parser(
+    line: str, file: ParsedHytekFile, opts: dict[str, Any]
+) -> ParsedHytekFile:
+    """Parse an H2 line: the specific, human-readable DQ infraction detail.
+
+    Attaches the detail text to whichever DQ slot the preceding H1 populated
+    (finals -> swimoff -> prelim), mirroring h1_parser's resolution. Unlike H1,
+    the H2 2-char code is NOT asserted against the DQ code (it is a stroke/leg
+    sub-classification, not the same DisqualificationCode). No-op if no DQ slot
+    is set.
+    """
+    event_num, event = file.meet.last_event
+    entry = event.last_entry
+
+    detail = extract(line, 5, 124) or None
+
+    if entry.finals_dq_info:
+        entry.finals_dq_info.info_str_detail = detail
+    elif entry.swimoff_dq_info:
+        entry.swimoff_dq_info.info_str_detail = detail
+    elif entry.prelim_dq_info:
+        entry.prelim_dq_info.info_str_detail = detail
+
+    event.last_entry = entry
+    file.meet.last_event = (event_num, event)
+    return file

{hytek_parser-2.1.0 → hytek_parser-2.3.0}/hytek_parser/hy3/schemas.py

@@ -38,8 +38,14 @@ class Swimmer:
 
     # D1 fields previously dropped by the parser
     citizenship: Optional[str] = None
-    # col 125; semantics unverified — name intentionally non-descriptive
-    unparsed_d1_col_125: Optional[str] = None
+    # col 125; athlete status (Hytek MM "Status" field). Raw 1-char code — only
+    # "N" (Normal) or blank observed across ~9.25M records; other GUI statuses
+    # (Impaired/Exhibition/Foreigner/Rookie) never seen in data, so left as a
+    # raw code rather than an enum.
+    status: Optional[str] = None
+    # cols 100-101; "Fr"/"So"/"Jr"/"Sr" school class in HS-meet exports,
+    # other data / blank in club exports.
+    class_year: Optional[str] = None
 
 
 @define
@@ -78,6 +84,7 @@ class DisqualificationInfo:
 
     code: DisqualificationCode
     info_str: Optional[str] = None
+    info_str_detail: Optional[str] = None
 
 
 @define(init=False)
@@ -165,6 +172,7 @@ class EventEntry:
     # or numeric ('0'/'1'/'2'/'3'). Stored at cols 77-79 in most MM versions,
     # cols 92-93 in MM4/MM5-7.0Fa (read with col-77 precedence).
     meet_division: Optional[str] = None
+    exhibition: bool = False
 
     def __init__(
         self,
@@ -178,6 +186,7 @@ class EventEntry:
         relay_team_id: Optional[str] = None,
         relay_swim_team_code: Optional[str] = None,
         meet_division: Optional[str] = None,
+        exhibition: bool = False,
     ) -> None:
         self.swimmers = swimmers
         self.relay = relay
@@ -189,6 +198,7 @@ class EventEntry:
         self.relay_team_id = relay_team_id
         self.relay_swim_team_code = relay_swim_team_code
         self.meet_division = meet_division
+        self.exhibition = exhibition
 
         for course in ("prelim", "swimoff", "finals"):
             setattr(self, f"{course}_time", None)
@@ -277,6 +287,7 @@ class Event:
         relay_team_id: Optional[str] = None,
         relay_swim_team_code: Optional[str] = None,
         meet_division: Optional[str] = None,
+        exhibition: bool = False,
     ) -> EventEntry:
         """Get an event entry or create one if needed."""
         entry = EventEntry(
@@ -290,6 +301,7 @@ class Event:
             relay_team_id=relay_team_id,
             relay_swim_team_code=relay_swim_team_code,
             meet_division=meet_division,
+            exhibition=exhibition,
         )
         if self.entries and self.entries[-1].same_swimmer_entry_as(entry):
             # P/F entries always listed together: a swimmer (individuals) or a
@@ -336,6 +348,12 @@ class Meet:
     swimmers: dict[int, Swimmer]
     events: dict[str, Event]
 
+    # Extended info (optional; populated by later parser stages). Kept at the
+    # end of the field block (not next to `facility`/`country`) because attrs
+    # forbids a defaulted field preceding the non-default fields above.
+    sanction_number: Optional[str] = None
+    notes: Optional[str] = None
+
     # Bookeeping
     _last_team: tuple[str, Team] = field(default=None)
     _last_event: tuple[str, Event] = field(default=None)

{hytek_parser-2.1.0 → hytek_parser-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hytek-parser"
-version = "2.1.0"
+version = "2.3.0"
 description = "Parsers for the files produced by Hytek's Meet Manager."
 license = "MIT"
 authors = ["Nino Maruszewski <nino.maruszewski@hotmail.com>"]