.gitignore

@@ -1,6 +1,5 @@
 result
 .direnv
-.vscode/*
 
 *.pdf
 addresses.csv
@@ -12,6 +11,5 @@ cache/
 __pycache__/
 
 options.json
-secrets.json
 next_serial.txt
 mailer_id.txt

cards_4x6.typ

@@ -1,23 +0,0 @@
-#{
-  set page(width: 6in, height: 4in, margin: 0em)
-
-  import "common.typ"
-
-  let options = json("options.json")
-  let cards = options.cards
-  let args = options.args
-
-  let content_fn = if args.no_content {
-    _ => []
-  } else {
-    import "content/content.typ"
-    content.content
-  }
-
-  for (idx, card) in cards.enumerate() {
-    if idx != 0 {
-      pagebreak()
-    }
-    common.postcard_content(100%, 100%, content_fn, card)
-  }
-}

cards_a6_lettersheet.typ

@@ -1,12 +0,0 @@
-#{
-  set page("us-letter", margin: 0em)
-
-  import "common.typ"
-
-  let options = json("options.json")
-  let cards = options.cards
-  let args = options.args
-
-  common.card_sheets(148mm, 105mm, 1in/16, args, cards)
-
-}

common.typ

@@ -38,18 +38,17 @@
     place(
       top + left,
       dy: height - 1in/8,
-      dx: 0.05in,
       block(
         width: 100%,
         height: 1in/8,
         align(
-          top + left,
+          top + center,
           text(font: "USPSIMBCompact", size: 12pt, card.imb)
         )
       )
     )
   }
-  if card.avatar != none {
+  if card.avatar != "" {
     place_avatar(text_height, card)
   }
 }
@@ -116,7 +115,7 @@
   let content_fn = if args.no_content {
     _ => []
   } else {
-    import "cache/content/content.typ"
+    import "content/content.typ"
     content.content
   }
 

format.py

@@ -2,29 +2,14 @@
 import argparse
 import base64
 import csv
-import hashlib
 import json
 import os
-import pathlib
 import string
 import typing
-import urllib.parse
 import xml.etree.ElementTree as ET
 import requests
 import imb
 
-from pathlib import Path
-from typing import TypedDict
-
-# A lot of stuff needs to be in the same directory, just chdir
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-
-
-def cache_dir() -> Path:
-    cache = Path("cache")
-    cache.mkdir(exist_ok=True)
-    return cache
-
 
 def iso_code(s: str) -> str:
     if len(s) != 2:
@@ -35,87 +20,43 @@ def iso_code(s: str) -> str:
     return s
 
 
-def get_discord_avatar(
-    url: urllib.parse.ParseResult, secrets: dict[str, str]
-) -> typing.Optional[str]:
-    try:
-        uid = url.path
-        token = secrets["discord_token"]
-        user_info = requests.get(
-            f"https://discord.com/api/users/{uid}",
-            headers={"Authorization": f"Bot {token}"},
-        ).json()
-        avatar_hash = user_info["avatar"]
-        return f"https://cdn.discordapp.com/avatars/{uid}/{avatar_hash}.png?size=4096"
-    except KeyError:
-        return None
-
-
-def get_fedi_avatar(
-    url: urllib.parse.ParseResult, secrets: dict[str, str]
-) -> typing.Optional[str]:
-    try:
-        mastodon_api = secrets["mastodon_api"]
-        user_info = requests.get(
-            f"{mastodon_api}/api/v1/accounts/lookup", params={"acct": url.path}
-        ).json()
-        avatar_url = user_info["avatar_static"]
-        return avatar_url
-    except KeyError:
-        return None
-
-
-def get_orig_avatar(
-    url: str, basename: str, secrets: dict[str, str]
-) -> typing.Optional[bytes]:
-    url_parts = urllib.parse.urlparse(url)
-    if url_parts.scheme == "fedi":
-        real_url = get_fedi_avatar(url_parts, secrets)
-    elif url_parts.scheme == "discord":
-        real_url = get_discord_avatar(url_parts, secrets)
-    else:
-        real_url = url
-
-    if real_url is None:
-        return None
-
-    img_file = cache_dir() / basename
-
-    if img_file.exists():
-        with img_file.open("rb") as infile:
+def get_orig_avatar(url: str, name: str) -> typing.Optional[bytes]:
+    if not os.path.exists("cache"):
+        os.mkdir("cache")
+    if os.path.exists("cache/" + name):
+        with open("cache/" + name, "rb") as infile:
             return infile.read()
-    result = requests.get(real_url)
-    if not result.ok:
-        return None
-    with img_file.open("wb") as outfile:
-        outfile.write(result.content)
-    return result.content
+    result = requests.get(url)
+    if result.ok:
+        with open("cache/" + name, "wb") as outfile:
+            outfile.write(result.content)
+        return result.content
+    return None
 
 
-def get_avatar(url: str, secrets: dict[str, str]) -> str | None:
-    basename = hashlib.sha256(url.encode("utf-8")).hexdigest()
-    file_path = cache_dir() / f"{basename}.svg"
-    if file_path.exists():
-        return str(file_path)
-    avatar_raster = get_orig_avatar(url, basename, secrets)
+def get_avatar(url: str) -> str:
+    name = url.split("?")[0].split("/")[-1]
+    if os.path.exists(f"cache/{name}.svg"):
+        return f"cache/{name}.svg"
+    avatar_raster = get_orig_avatar(url, name)
     if avatar_raster is None:
-        return None
+        return ""
 
-    svg_text = f"""<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    svg_text = f"""<svg viewBox="0 0 480 480" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
         <clipPath id="circle">
-            <circle cx="256" cy="256" r="256" />
+            <circle cx="240" cy="240" r="240" />
         </clipPath>
-        <image width="512" height="512" clip-path="url(#circle)"
+        <image width="480" height="480" clip-path="url(#circle)"
             xlink:href="data:;base64,{base64.b64encode(avatar_raster).decode("utf-8")}" />
     </svg>"""
 
-    with open(file_path, "w") as svgfile:
+    with open(f"cache/{name}.svg", "w") as svgfile:
         svgfile.write(svg_text)
-    return str(file_path)
+    return f"cache/{name}.svg"
 
 
 def get_country_name(
-    root: ET.ElementTree, destination: str, alt: str | None = None
+    root: ET.ElementTree, destination: str, alt=None
 ) -> typing.Optional[str]:
     elements = root.findall(
         f"./localeDisplayNames/territories/territory[@type='{destination.upper()}']"
@@ -166,84 +107,52 @@ parser.add_argument(
     help="CSV file containing addresses",
 )
 
-parser.add_argument(
-    "-i",
-    "--content-path",
-    default="content",
-    type=str,
-    help="Directory containing content files",
-)
-
 parser.add_argument(
     "-n",
     "--no-content",
     action="store_true",
-    help="Skip content, e.g. to make postcard back labels",
+    help="Skip content, e.g. to make postcard back labels"
 )
 
-parser.add_argument(
-    "-d", "--dont-compile", action="store_true", help="Don't compile to output.pdf"
-)
-
-parser.add_argument("-w", "--watch", action="store_true", help="Watch input files")
-
 args = parser.parse_args()
 
-cldr_root = ET.parse(
+root = ET.parse(
     f"{os.getenv('CLDR_ROOT')}/share/unicode/cldr/common/main/{args.language}.xml"
 )
 
 csvfile = open(args.address_file)
 rows = csv.DictReader(csvfile)
 
-with open("secrets.json") as secrets_file:
-    secrets = json.load(secrets_file)
-
 current_serial = imb.get_first_serial()
-mid = secrets.get("mailer_id")
+mid = int(open("mailer_id.txt").read().strip())
 
 
-class Card(TypedDict):
-    address: str
-    avatar: str | None
-    row: dict[str, str]
-    imb: str
-
-
-cards: list[Card] = []
+cards = []
 for row in rows:
     if row["Address"] == "":
         continue
 
-    if row["Country"].lower() == args.origin:
-        country = []
-    else:
-        name = get_country_name(cldr_root, row["Country"])
-        assert name is not None
-        country = [name.upper()]
+    country = (
+        []
+        if row["Country"].lower() == args.origin
+        else [get_country_name(root, row["Country"]).upper()]
+    )
 
     address = row["Address"].split("\n") + country
 
     if row.get("Avatar", "") != "":
-        avatar = get_avatar(row["Avatar"], secrets)
+        avatar = get_avatar(row["Avatar"])
     else:
         avatar = None
 
-    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
-if not os.path.exists("cache"):
-    os.mkdir("cache")
-p = pathlib.Path("cache/content")
-p.unlink(missing_ok=True)
-p.symlink_to(args.content_path)
+    cards += [
+        {
+            "address": "\n".join(address),
+            "avatar": avatar,
+            "row": row,
+            "imb": "",
+        }
+    ]
 
 cards = cards * args.count
 
@@ -251,7 +160,7 @@ serial = imb.get_first_serial()
 if args.origin == "us":
     for card in cards:
         dpc = card["row"].get("DPC", "")
-        if dpc != "" and mid is not None:
+        if dpc != "":
             card["imb"] = imb.generate(
                 0, 310, mid, serial, dpc.replace(" ", "").replace("-", "")
             )
@@ -266,21 +175,3 @@ with open("options.json", "w") as options:
             "cards": cards,
         },
     )
-
-if args.dont_compile:
-    exit()
-
-font_paths = os.getenv("TYPST_FONT_PATHS")
-assert font_paths is not None
-
-os.execlp(
-    "typst",
-    "typst",
-    "watch" if args.watch else "compile",
-    "--font-path",
-    args.content_path,
-    "--font-path",
-    font_paths,
-    args.template,
-    "output.pdf",
-)

labels_dymo.typ

@@ -14,7 +14,7 @@
       top + left,
       dx: 1in/16,
       dy: 1in/16,
-      common.address_block(3in, 1in, card)
+      common.address_block(2.5in, 1in, card)
     )
   }
 }