format.py

@@ -238,9 +238,7 @@ if args.address_file.suffix == ".csv":
     csv_filename = args.address_file
 elif args.address_file.suffix == ".ods":
     # https://help.libreoffice.org/latest/en-US/text/shared/guide/csv_params.html
-    export_options = (
-        "csv:Text - txt - csv (StarCalc):"
-        + ",".join(  # Magic CSV export string
+    export_options = "csv:Text - txt - csv (StarCalc):" + ",".join(  # Magic CSV export string
         [
             str(ord(",")),  # Field Separator
             str(ord('"')),  # Text Delimiter
@@ -256,7 +254,6 @@ elif args.address_file.suffix == ".ods":
             "-1",  # Export sheets - all sheets => -1
         ]
     )
-    )
     result = subprocess.run(
         [
             "libreoffice",
@@ -273,19 +270,6 @@ elif args.address_file.suffix == ".ods":
 else:
     raise Exception("Unknown file type for --address-file")
 
-
-class CSVRow(TypedDict):
-    Name: str
-    Address: str
-    DPC: str
-    Country: str
-    Design: str
-    Type: str
-    Personalization: str
-    Avatar: str | None
-    US: str
-
-
 csvfile = open(csv_filename)
 rows = csv.DictReader(csvfile)
 
@@ -299,13 +283,12 @@ mid = secrets.get("mailer_id")
 class Card(TypedDict):
     address: str
     avatar: Path | None
-    row: CSVRow
+    row: dict[str, str]
     imb: str
 
 
 cards: list[Card] = []
 for row in rows:
-    row = CSVRow(**row)
     if row["Address"] == "":
         continue
 
@@ -318,19 +301,18 @@ for row in rows:
 
     address = row["Address"].split("\n") + country
 
-    if (avatar_url := row.get("Avatar", "")) != "":
-        avatar = get_avatar(avatar_url, secrets)  # type: ignore
+    if row.get("Avatar", "") != "":
+        avatar = get_avatar(row["Avatar"], secrets)
     else:
         avatar = None
 
-    cards.append(
-        {
+    card: Card = {
         "address": "\n".join(address),
         "avatar": avatar,
         "row": row,
         "imb": "",
     }
-    )
+    cards.append(card)
 
 # Typst can't access files outside the project root, except through a symlink
 # Create one in cache to use here