italics update

Author: lovelaced

scripts/update.py

@@ -2,16 +2,16 @@
 # -*- coding: utf-8 -*-
 """
 Archive one-or-many public Matrix rooms.
-Produces per-room archives (HTML + plaintext) under  archive/<slug>/
-and a nice responsive landing page at /index.html
+Creates   archive/<slug>/{index.html, room_log.txt}
+and a root index.html listing all rooms.
 """
 
-# ─────────── std-lib ───────────
+# ─── std-lib ──────────────────────────────────────────────────────────
 import os, sys, json, subprocess, shlex, hashlib, colorsys, logging, re, html
 import collections, pathlib, urllib.parse
 from datetime import datetime, timezone
 
-# ══════════ CONFIG ═════════════
+# ═══════════ CONFIG ═══════════════════════════════════════════════════
 HS        = os.environ["MATRIX_HS"]
 USER_ID   = os.environ["MATRIX_USER"]
 TOKEN     = os.environ["MATRIX_TOKEN"]
@@ -28,16 +28,20 @@
 logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
 os.environ["NIO_LOG_LEVEL"] = "error"
 
-# ═════ matrix-commander creds ══
+# ═══════════ matrix-commander creds ═══════════════════════════════════
 cred_file = pathlib.Path("mc_creds.json")
 store_dir = pathlib.Path("store"); store_dir.mkdir(exist_ok=True)
 if not cred_file.exists():
     cred_file.write_text(json.dumps({
-        "homeserver":HS,"user_id":USER_ID,"access_token":TOKEN,
-        "device_id":"GH","default_room":ROOMS[0]}))
+        "homeserver":   HS,
+        "user_id":      USER_ID,
+        "access_token": TOKEN,
+        "device_id":    "GH",
+        "default_room": ROOMS[0],
+    }))
 CRED = ["--credentials", str(cred_file), "--store", str(store_dir)]
 
-# ═════ helpers ═════
+# ═══════════ helpers ══════════════════════════════════════════════════
 def run(cmd, timeout=None) -> str:
     res = subprocess.run(cmd, text=True, capture_output=True, timeout=timeout)
     if res.returncode:
@@ -46,12 +50,11 @@ def run(cmd, timeout=None) -> str:
 
 def json_lines(blob:str):
     for ln in blob.splitlines():
-        ln=ln.strip()
-        if ln and ln[0] in "{[":         # crude but fast
+        if ln and ln[0] in "{[":
             try: yield json.loads(ln)
             except json.JSONDecodeError: pass
 
-when      = lambda ev: datetime.utcfromtimestamp(ev["origin_server_ts"]/1000)
+when      = lambda e: datetime.utcfromtimestamp(e["origin_server_ts"]/1000)
 nice_user = lambda u: u.lstrip("@").split(":",1)[0]
 slug      = lambda s: urllib.parse.quote(s, safe="").replace("%","_")
 
@@ -61,132 +64,122 @@ def rich_color(uid:str) -> str:
     r,g,b = colorsys.hls_to_rgb(h,l,s)
     return f"#{int(r*255):02x}{int(g*255):02x}{int(b*255):02x}"
 
-# ═════ simple markdown-ish formatting ═════
+# ─── lightweight markdown-ish rendering ───────────────────────────────
 _re_mdlink  = re.compile(r'\[([^\]]+?)\]\((https?://[^\s)]+)\)')
 _re_rawurl  = re.compile(r'(?<!["\'>])(https?://[^\s<]+)')
 _re_fence   = re.compile(r'```(\w+)?\n([\s\S]*?)```', re.MULTILINE)
 _re_inline  = re.compile(r'`([^`\n]+?)`')
-_re_italic  = re.compile(r'(?<!\w)\*([^\s*][^*]*?)\*(?!\w)')  # *text*
+# italics only if *text* is surrounded by whitespace / line edges
+_re_italic  = re.compile(r'(?<!\S)\*([^*\n]+?)\*(?!\S)')
 
-def md_links(t:str)->str:
-    t=_re_mdlink.sub(lambda m:f'<a href="{m.group(2)}" target="_blank" rel="noopener">{m.group(1)}</a>',t)
-    return _re_rawurl.sub(lambda m:f'<a href="{m.group(0)}" target="_blank" rel="noopener">{m.group(0)}</a>',t)
+def md_links(txt:str)->str:
+    txt=_re_mdlink.sub(lambda m:f'<a href="{m.group(2)}" target="_blank" rel="noopener">{m.group(1)}</a>',txt)
+    return _re_rawurl.sub(lambda m:f'<a href="{m.group(0)}" target="_blank" rel="noopener">{m.group(0)}</a>',txt)
 
 def fmt_body(body:str)->str:
-    # first split out ``` fenced blocks
-    parts, pos = [],0
+    """escape → code-block → inline-code → links → italics"""
+    out, pos = [], 0
     for f in _re_fence.finditer(body):
-        parts.append(("txt", body[pos:f.start()]))
-        parts.append(("fence", f))
-        pos = f.end()
-    parts.append(("txt", body[pos:]))
-
-    out=[]
-    for kind, chunk in parts:
-        if kind=="fence":
-            lang=chunk.group(1) or ""
-            code=html.escape(chunk.group(2))
-            out.append(f'<pre><code class="{lang}">{code}</code></pre>')
-            continue
-        # inline code
-        seg=chunk
-        p=0
-        for ic in _re_inline.finditer(seg):
-            out.append(md_links(html.escape(seg[p:ic.start()])))
-            out.append(f"<code>{html.escape(ic.group(1))}</code>")
-            p=ic.end()
-        tail=md_links(html.escape(seg[p:]))
-        # italics (after escaping!)
-        tail=_re_italic.sub(r'<em>\1</em>',tail)
-        out.append(tail)
+        # preceding normal text
+        out.append(md_links(_re_italic.sub(r'<em>\1</em>',
+                   html.escape(body[pos:f.start()]))))
+        lang=f.group(1) or ""
+        out.append(f"<pre><code class='{lang}'>{html.escape(f.group(2))}</code></pre>")
+        pos=f.end()
+    tail = html.escape(body[pos:])
+    # inline code inside tail
+    seg_parts=[]
+    p=0
+    for ic in _re_inline.finditer(tail):
+        seg_parts.append(md_links(_re_italic.sub(r'<em>\1</em>', tail[p:ic.start()])))
+        seg_parts.append(f"<code>{html.escape(ic.group(1))}</code>")
+        p=ic.end()
+    seg_parts.append(md_links(_re_italic.sub(r'<em>\1</em>', tail[p:])))
+    out.append("".join(seg_parts))
     return "".join(out)
 
-# ═════ archiver core ═════
+# ═══════════ archiver ═════════════════════════════════════════════════
 def archive(room:str):
-    logging.info("room %s",room)
-    cred=json.loads(cred_file.read_text());cred["room_id"]=cred["default_room"]=room
-    cred_file.write_text(json.dumps(cred))
+    logging.info("room %s", room)
+    # update creds
+    data=json.loads(cred_file.read_text()); data.update(room_id=room, default_room=room)
+    cred_file.write_text(json.dumps(data))
 
-    rdir=pathlib.Path("archive")/slug(room);rdir.mkdir(parents=True,exist_ok=True)
+    rdir=pathlib.Path("archive")/slug(room); rdir.mkdir(parents=True, exist_ok=True)
     for cmd in (["--room-join",room],["--room",room,"--listen","once"]):
         try: run(["matrix-commander",*CRED,*cmd])
         except subprocess.CalledProcessError: pass
 
     title=room
     try:
-        info=next(json_lines(run(["matrix-commander",*CRED,"--room",room,"--get-room-info","--output","json"])),{})
+        meta=next(json_lines(run(["matrix-commander",*CRED,"--room",room,"--get-room-info","--output","json"])),{})
         for k in ("room_display_name","room_name","canonical_alias","room_alias"):
-            if info.get(k): title=info[k];break
-    except Exception as e:
-        logging.warning("   room-info failed: %s",e)
+            if meta.get(k): title=meta[k];break
+    except: pass
 
-    blob=run(["matrix-commander",*CRED,"--room",room,*{
-        "all":["--listen","all","--listen-self"],
-        "tail":["--listen","tail","--tail",TAIL_N,"--listen-self"],
-        "once":["--listen","once","--listen-self"]}[LISTEN_MODE],"--output","json"],
-        timeout=TIMEOUT_S if LISTEN_MODE=="all" else None)
+    listen_args={"all":["--listen","all","--listen-self"],
+                 "tail":["--listen","tail","--tail",TAIL_N,"--listen-self"],
+                 "once":["--listen","once","--listen-self"]}[LISTEN_MODE]
+    blob=run(["matrix-commander",*CRED,"--room",room,*listen_args,"--output","json"],
+              timeout=TIMEOUT_S if LISTEN_MODE=="all" else None)
 
-    originals,edits={},{}
+    originals, edits = {}, {}
     for j in json_lines(blob):
         ev=j.get("source",j)
-        if ev.get("type")!="m.room.message":continue
-        c,rel=ev["content"],ev["content"].get("m.relates_to",{})
+        if ev.get("type")!="m.room.message": continue
+        c, rel = ev["content"], ev["content"].get("m.relates_to",{})
         if rel.get("rel_type")=="m.replace" or "m.new_content" in c:
             edits[rel.get("event_id")] = ev
         else:
-            originals[ev["event_id"]]=ev
-    for eid,msg in originals.items():
+            originals[ev["event_id"]] = ev
+
+    for eid, msg in originals.items():
         if eid in edits:
-            rep=edits[eid]
-            new=rep["content"].get("m.new_content",{}).get("body") or rep["content"].get("body","")
-            msg["content"]["body"]=new
-            msg["_edited"]=True
+            rep   = edits[eid]
+            new   = rep["content"].get("m.new_content",{}).get("body") \
+                 or rep["content"].get("body","")
+            msg["content"]["body"] = new
+            msg["_edited"] = True
 
     evs=list(originals.values())
     if not evs: return title
-    evs.sort(key=when)   # chronological
+    evs.sort(key=when)
 
-    # threading map
+    # threading
     byid={e["event_id"]:e for e in evs}
     threads=collections.defaultdict(list)
     for e in evs:
         rel=e["content"].get("m.relates_to",{})
-        if rel.get("rel_type")=="m.thread":
-            threads[rel["event_id"]].append(e["event_id"])
-    roots=[e for e in evs if e["event_id"] not in {c for ls in threads.values() for c in ls}]
+        if rel.get("rel_type")=="m.thread": threads[rel["event_id"]].append(e["event_id"])
+    roots=[e for e in evs if e["event_id"] not in {c for v in threads.values() for c in v}]
 
-    # plaintext
+    # plain-text
     stamp=datetime.utcnow().strftime("%Y-%m-%d %H:%M UTC")
     txt=[f"# room: {title}",f"# exported: {stamp}"]
     def add_txt(ev,lvl):
         body=ev["content"].get("body","")
         if ev.get("_edited"): body+=" [edited]"
-        txt.append(f"{'  '*lvl}{'↳ ' if lvl else ''}"
-                   f"{when(ev).strftime('%Y-%m-%d %H:%M')} "
+        txt.append(f"{'  '*lvl}{'↳ ' if lvl else ''}{when(ev).strftime('%Y-%m-%d %H:%M')} "
                    f"{nice_user(ev['sender'])}: {body}")
     for r in roots:
         add_txt(r,0)
-        for cid in sorted(threads[r["event_id"]],key=lambda c:when(byid[c])):
-            add_txt(byid[cid],1)
+        for cid in threads[r["event_id"]]: add_txt(byid[cid],1)
 
     # html
     last=datetime.utcnow().strftime("%Y-%m-%d %H:%M UTC")
     h=[
-        "<!doctype html><meta charset=utf-8><meta name='viewport' content='width=device-width,initial-scale=1'>",
+        "<!doctype html><meta charset=utf-8><meta name=viewport content='width=device-width,initial-scale=1'>",
         f"<title>{html.escape(title)} – archive</title>",
         "<style>",
         "body{margin:0 auto;max-width:75ch;font:15px/1.55 system-ui,"
         "-apple-system,'Segoe UI',Helvetica,Arial,sans-serif;background:#141414;color:#e6e6e6;padding:2rem}",
         ".msg{white-space:pre-wrap;margin:0.3em 0}",
-        ".reply{margin-left:2ch}",
-        ".edited{opacity:0.75;font-style:italic}",
-        "pre{background:#1e1e1e;padding:0.6em;border-radius:4px;overflow:auto}",
+        ".reply{margin-left:2ch}.edited{opacity:.7;font-style:italic}",
+        "pre{background:#1e1e1e;padding:.6em;border-radius:4px;overflow:auto}",
         "code{font-family:ui-monospace,monospace}",
-        ".u{font-weight:600}",
-        "time{color:#888}",
+        ".u{font-weight:600}time{color:#888}",
         "a{color:#9cf;text-decoration:none}",
-        "em{font-style:italic}",    # our italics
-        "i,em:not(.allow){font-style:normal}",  # neutralise stray <em>/<i>
+        "i,em{font-style:normal} em{font-style:italic}",
         "@media(max-width:480px){body{padding:1rem;font-size:14px}pre{font-size:13px}}",
         "</style>",
         f"<h1>{html.escape(title)}</h1>",
@@ -201,42 +194,28 @@ def add_html(ev,lvl):
                  f"{fmt_body(ev['content'].get('body',''))}</div>")
     for r in roots:
         add_html(r,0)
-        for cid in sorted(threads[r["event_id"]],key=lambda c:when(byid[c])):
-            add_html(byid[cid],1)
+        for cid in threads[r["event_id"]]: add_html(byid[cid],1)
 
     (rdir/"room_log.txt").write_text("\n".join(txt)+"\n",encoding="utf-8")
     (rdir/"index.html").write_text("\n".join(h)+"\n",encoding="utf-8")
-    logging.info("   written → %s",rdir)
     return title
 
-# ═════ main ═════
+# ═══════════ MAIN ═════════════════════════════════════════════════════
 pathlib.Path("archive").mkdir(exist_ok=True)
 (pathlib.Path("archive/index.html")).unlink(missing_ok=True)
 
 landing=[]
 for rid in ROOMS:
-    try:
-        title=archive(rid)
-        landing.append((title,rid,slug(rid)))
+    try: landing.append((archive(rid), rid, slug(rid)))
     except Exception as exc:
-        logging.error("‼ failed for %s – %s",rid,exc)
+        logging.error("‼ failed for %s – %s", rid, exc)
 
 landing.sort(key=lambda t:t[0].lower())
 ul="\n".join(f"<li><a href='archive/{s}/index.html'>{html.escape(t)}</a>"
-             f"<br><small>{html.escape(r)}</small></li>"
-             for t,r,s in landing)
+             f"<br><small>{html.escape(r)}</small></li>" for t,r,s in landing)
 
 pathlib.Path("index.html").write_text(
     "\n".join([
-        "<!doctype html><meta charset=utf-8><meta name='viewport' content='width=device-width,initial-scale=1'>",
-        "<title>Archived rooms</title>",
-        "<style>",
-        "body{margin:0 auto;max-width:65ch;font:16px/1.55 system-ui,"
-        "-apple-system,'Segoe UI',Helvetica,Arial,sans-serif;background:#141414;color:#e6e6e6;padding:2rem}",
-        "a{color:#9cf;text-decoration:none}@media(max-width:480px){body{padding:1rem;font-size:15px}}",
-        "</style>",
-        "<h1>Archived rooms</h1><ul>",ul,"</ul>"
-    ])+"\n",encoding="utf-8")
-
-logging.info("root index.html regenerated ✓")
+        "<!doctype html><meta charset=utf-8><meta name=viewport content='width=device-width,initial-scale=1'>",
+        "<title