pendify 0.1.5__tar.gz → 0.1.6__tar.gz

{pendify-0.1.5/src/pendify.egg-info → pendify-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pendify
-Version: 0.1.5
+Version: 0.1.6
 Summary: Pairs this PC with a phone account by a QR on a loopback page and sends it two kinds of alerts.
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/ElkinDev/PendiFy
@@ -28,7 +28,7 @@ Pulsa Windows + R, pega esta línea completa y pulsa Enter. También sirve en Po
 
     powershell -NoExit -NoProfile -ExecutionPolicy Bypass -Command "ri ~\pendify-install.ps1 -ea 0; irm https://raw.githubusercontent.com/ElkinDev/PendiFy/main/install.ps1 -OutFile ~\pendify-install.ps1; ~\pendify-install.ps1"
 
-La línea guarda el instalador como `pendify-install.ps1` en tu carpeta de usuario y lo ejecuta desde ahí; puedes borrar ese archivo cuando termine.
+La línea guarda el instalador como `pendify-install.ps1` en tu carpeta de usuario y lo ejecuta desde ahí; puedes borrar ese archivo cuando termine. Si PendiFy ya está abierto, la línea instala la versión nueva y la copia nueva reemplaza a la anterior por sí sola.
 
 La ventana queda abierta al terminar para que leas el resultado; ciérrala cuando acabe.
 
@@ -93,7 +93,7 @@ Press Windows + R, paste this whole line and press Enter. It also works in Power
 
     powershell -NoExit -NoProfile -ExecutionPolicy Bypass -Command "ri ~\pendify-install.ps1 -ea 0; irm https://raw.githubusercontent.com/ElkinDev/PendiFy/main/install.ps1 -OutFile ~\pendify-install.ps1; ~\pendify-install.ps1"
 
-The line saves the installer as `pendify-install.ps1` in your user folder and runs it from there; you can delete that file when it is done.
+The line saves the installer as `pendify-install.ps1` in your user folder and runs it from there; you can delete that file when it is done. If PendiFy is already open, the line installs the new version and the new copy replaces the older one by itself.
 
 The window stays open at the end so you can read the result; close it when it is done.
 

{pendify-0.1.5 → pendify-0.1.6}/README.md

@@ -12,7 +12,7 @@ Pulsa Windows + R, pega esta línea completa y pulsa Enter. También sirve en Po
 
     powershell -NoExit -NoProfile -ExecutionPolicy Bypass -Command "ri ~\pendify-install.ps1 -ea 0; irm https://raw.githubusercontent.com/ElkinDev/PendiFy/main/install.ps1 -OutFile ~\pendify-install.ps1; ~\pendify-install.ps1"
 
-La línea guarda el instalador como `pendify-install.ps1` en tu carpeta de usuario y lo ejecuta desde ahí; puedes borrar ese archivo cuando termine.
+La línea guarda el instalador como `pendify-install.ps1` en tu carpeta de usuario y lo ejecuta desde ahí; puedes borrar ese archivo cuando termine. Si PendiFy ya está abierto, la línea instala la versión nueva y la copia nueva reemplaza a la anterior por sí sola.
 
 La ventana queda abierta al terminar para que leas el resultado; ciérrala cuando acabe.
 
@@ -77,7 +77,7 @@ Press Windows + R, paste this whole line and press Enter. It also works in Power
 
     powershell -NoExit -NoProfile -ExecutionPolicy Bypass -Command "ri ~\pendify-install.ps1 -ea 0; irm https://raw.githubusercontent.com/ElkinDev/PendiFy/main/install.ps1 -OutFile ~\pendify-install.ps1; ~\pendify-install.ps1"
 
-The line saves the installer as `pendify-install.ps1` in your user folder and runs it from there; you can delete that file when it is done.
+The line saves the installer as `pendify-install.ps1` in your user folder and runs it from there; you can delete that file when it is done. If PendiFy is already open, the line installs the new version and the new copy replaces the older one by itself.
 
 The window stays open at the end so you can read the result; close it when it is done.
 

{pendify-0.1.5 → pendify-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pendify"
-version = "0.1.5"
+version = "0.1.6"
 description = "Pairs this PC with a phone account by a QR on a loopback page and sends it two kinds of alerts."
 readme = "README.md"
 license = "MIT"

{pendify-0.1.5 → pendify-0.1.6}/src/pendify/__main__.py

@@ -10,7 +10,10 @@
 The page and the watcher stop together on Ctrl+C, on Ctrl+Break, on the page's quit button and on the quit of
 the icon by the clock, which remove the run file and exit 0. One instance per config folder: a second start
 opens the running page and exits 0, and one made while that program is still closing after its quit waits for
-it to end and starts. A restart the page asks for («Reiniciar ahora», once a newer version is installed, or the
+it to end and starts. A start of a newer version over a running older copy replaces it: the older copy is asked to
+stop through its page's /replace with the run file's secret, or ended by its pid when it has no secret or its page
+does not answer, and this start then claims the run file as a first one does. A restart the page asks for
+(«Reiniciar ahora», once a newer version is installed, or the
 icon's «Reiniciar para actualizar») starts a new copy once the run file is released: without --quiet, so its page
 opens, and with the --dry, --data-dir, --worker and --client-lockfile of this one.
 Where no console is attached (a pythonw start), the line a start ends on is also shown in a
@@ -18,12 +21,15 @@ message box. `--data-dir`, `--worker` and `--client-lockfile` are the
 test overrides, loopback only, so a test run reads neither the profile, the Worker nor the client's files.
 """
 import argparse
+import http.client
 import os
 import signal
 import subprocess
 import sys
 import threading
 import time
+import urllib.parse
+import urllib.request
 import webbrowser
 from pathlib import Path
 
@@ -46,6 +52,16 @@ PAGE_NOT_KNOWN_LINE = ("already running: the page of the program that runs is no
 CLAIM_FAILED_LINE = "cannot start: the run file cannot be replaced: {path}"
 FOLDER_FAILED_LINE = "cannot start: the config folder cannot be written: {path}"
 RESTART_FAILED_LINE = "cannot restart: the new copy did not start; start the program again"
+# The line a start that replaced an older copy shows, in the page's language: the older copy's version, «desconocida»
+# or "unknown" for a record with none, then this one's.
+REPLACED_LINES = {"es": "Se reemplazó la copia anterior ({old}) por esta ({new}).",
+                  "en": "The older copy ({old}) was replaced by this one ({new})."}
+UNKNOWN_VERSION = {"es": "desconocida", "en": "unknown"}
+# The line a start prints when the older copy it would replace cannot be ended, in the page's language, with the
+# system's reason.
+CLOSE_REFUSED_LINES = {"es": "No se pudo cerrar la copia anterior: {reason}",
+                       "en": "The older copy could not be closed: {reason}"}
+REPLACE_TIMEOUT_SECONDS = 5.0  # the replace post to the older copy's page
 _MB_ICONINFORMATION = 0x40
 _MB_SETFOREGROUND = 0x10000
 # The restart's new copy: no console, its own process group, out of this one's.
@@ -181,6 +197,65 @@ def _restart(args, spawn, show, opens_page):
     return 0
 
 
+def _replaces(holder):
+    """True when this copy is newer than `holder`, a live holder that is not closing: X.Y.Z compared as tuples of
+    ints, and a holder with no version, as an older copy writes its record, older than any. A copy whose own version
+    is not X.Y.Z replaces nothing."""
+    if update._parts(update.RUNNING_VERSION) is None:
+        return False
+    return holder["version"] is None or update.newer(update.RUNNING_VERSION, holder["version"])
+
+
+def _ask_replace(holder):
+    """True when the holder's page answered 202 to POST /replace with the run file's secret; False for any other
+    answer, none, or no port."""
+    if holder["port"] is None:
+        return False
+    request = urllib.request.Request(f"http://{page.ADDRESS}:{holder['port']}/replace", method="POST",
+                                     data=urllib.parse.urlencode({"secret": holder["secret"]}).encode())
+    opener = urllib.request.build_opener(urllib.request.ProxyHandler({}))  # a loopback address never goes through one
+    try:
+        with opener.open(request, timeout=REPLACE_TIMEOUT_SECONDS) as answer:
+            return answer.status == 202
+    except (OSError, http.client.HTTPException):  # a refusal (urllib.error.HTTPError), no answer in time, a broken one
+        return False
+
+
+def _kept_language(store):
+    """The page's language before the page is made, with no browser to ask: the kept choice, else Spanish, as the
+    icon's words. A config file that cannot be read gives Spanish: the choice only words one line."""
+    try:
+        return store.read_lang() or page.language(None)
+    except (OSError, ValueError):
+        return page.language(None)
+
+
+def _replace(run, holder, terminate, store):
+    """The older `holder` dealt with, then the run file claimed again: (the claim's answer, `holder` when this start
+    replaced it, else None). It is asked through its page's /replace; with no secret in its record or no 202 from its
+    page, `terminate` is asked to end it by its pid, which it does only for the process its record names
+    (runfile.terminate):
+    - a 202, or ended: once the run file no longer names it as a live process within CLOSING_WAIT_SECONDS, its file
+      gone or left stale by its death, the file is claimed; a holder still alive then is handed back as it was read;
+    - not-ours: the pid names another process now, so the file is stale: evicted while it still holds that record,
+      then claimed as a first start claims it;
+    - refused: the reason printed on one line and the file waited for as long, since the pid may be dying under
+      another start's terminate, then claimed again: a holder that still stands is read afresh, never the snapshot."""
+    if holder["secret"] is None or not _ask_replace(holder):
+        answer = terminate(holder["pid"], holder["started"], run.path)
+        if answer == runfile.NOT_OURS:
+            run.evict(holder)
+            return run.claim(), holder
+        if answer == runfile.REFUSED:
+            reason = answer.error.strerror or answer.error
+            print(CLOSE_REFUSED_LINES[_kept_language(store)].format(reason=reason), flush=True)
+            run.wait_released(holder, CLOSING_WAIT_SECONDS)
+            return run.claim(), None
+    if run.wait_released(holder, CLOSING_WAIT_SECONDS):
+        return run.claim(), holder
+    return holder, None
+
+
 def _ready_version(updater):
     """The version an install made ready, for the icon's item; None in any other state."""
     seen = updater.snapshot()
@@ -188,14 +263,19 @@ def _ready_version(updater):
 
 
 def _serve(args, store, base, timeout, opener, stop, delay, beep, show, clock, sleep, autostart, tray, updater,
-           spawn):
+           spawn, terminate):
     # A quiet start is the system's, at logon: it never opens the browser, and a start that ends well shows no box.
     calm = (lambda line: None) if args.quiet else show
     run = runfile.RunFile(store.path.parent, clock=clock, sleep=sleep)
+    replaced = None  # the record of the older copy this start replaced
     try:
         holder = run.claim()
         if holder is not None and holder["closing"] and run.wait_released(holder, CLOSING_WAIT_SECONDS):
             holder = run.claim()  # the closing copy let its file go: this start claims it as a first one does
+        # A running older copy is replaced (_replace); a holder that still stands after it keeps the road below,
+        # its page opened.
+        if holder is not None and not holder["closing"] and _replaces(holder):
+            holder, replaced = _replace(run, holder, terminate, store)
     except runfile.FolderNotWritable as refused:
         return _ends(FOLDER_FAILED_LINE.format(path=refused.filename), 1, show)
     except OSError:
@@ -231,6 +311,7 @@ def _serve(args, store, base, timeout, opener, stop, delay, beep, show, clock, s
 
         pairing_page = page.PairingPage(state, watch=watch.snapshot, on_quit=quit_page, on_pause=watch.pause,
                                         on_resume=watch.resume, autostart=autostart, events=watch.events)
+        pairing_page.run = run  # its /replace answers the secret the publish below writes
         url = pairing_page.start()
         # The update's rounds on their own thread (update.py), built once the page serves; its restart is the
         # page's quit, after the flag read below once the run file is free; pip's output goes to the config folder.
@@ -249,6 +330,12 @@ def _serve(args, store, base, timeout, opener, stop, delay, beep, show, clock, s
             if mode != update.OFF:
                 updating.start()
             run.publish(pairing_page.port)
+            if replaced is not None:  # in the page's language, as the icon's words; a box never holds the start
+                lang = pairing_page.language_of(None)
+                line = REPLACED_LINES[lang].format(old=replaced["version"] or UNKNOWN_VERSION[lang],
+                                                   new=update.RUNNING_VERSION)
+                print(line, flush=True)
+                threading.Thread(target=calm, args=(line,), daemon=True).start()
             print(f"page: {url}", flush=True)
             if not args.quiet and not opener(url):  # a start by a person opens the page, linked or not
                 print("open the address above in a browser", flush=True)
@@ -292,13 +379,14 @@ def _break_as_interrupt():
 
 def main(argv=None, *, opener=webbrowser.open, stop=None, timeout=worker.TIMEOUT_SECONDS, delay=None,
          beep=alert.beep, box=_message_box, autostart=None, console=_console_attached, clock=time.monotonic,
-         sleep=time.sleep, tray=Tray, updater=update.Updater, spawn=subprocess.Popen):
+         sleep=time.sleep, tray=Tray, updater=update.Updater, spawn=subprocess.Popen, terminate=runfile.terminate):
     """`beep`, `box` and `autostart` are the seams of the sound, of the message box and of the start with Windows
     (the per-user Run value when None): a test run passes silent ones and a fake. `console` says whether a printed
     line reaches anybody; `clock` and `sleep` time the run file's re-reads. `tray` makes the icon by the clock, the
     seam a test run fills with a fake, so no test shows a real icon. `updater` makes the update and `spawn` starts
     the restart's new copy, the seams a test run fills with fakes, so no test reaches PyPI, runs pip or starts a
-    copy."""
+    copy. `terminate` ends an older copy by its pid when it cannot be asked to stop, the seam every test run fakes, so
+    no test ends a process."""
     args = _arguments(sys.argv[1:] if argv is None else argv)
     store = config.ConfigStore(getattr(args, "data_dir", None) or config.default_base_dir())
     base = getattr(args, "worker", worker.BASE_URL)
@@ -314,7 +402,7 @@ def main(argv=None, *, opener=webbrowser.open, stop=None, timeout=worker.TIMEOUT
         try:
             return _serve(args, store, base, timeout, opener, stop or threading.Event(),
                           delay or watcher.accept_delay, beep, show, clock, sleep,
-                          autostart if autostart is not None else Autostart(), tray, updater, spawn)
+                          autostart if autostart is not None else Autostart(), tray, updater, spawn, terminate)
         finally:
             if previous is not None:
                 signal.signal(signal.SIGBREAK, previous)

{pendify-0.1.5 → pendify-0.1.6}/src/pendify/page.py

@@ -8,6 +8,7 @@ nothing from any origin; no request line and no body is ever logged.
 import hmac
 import html
 import json
+import random
 import secrets
 import sys
 import threading
@@ -49,9 +50,9 @@ WORDS = {
         "intro": "Este programa envía sus avisos a tu cuenta de Pendi. Para eso, este PC tiene que quedar enlazado "
                  "con tu cuenta.",
         "code_label": "Clave de este PC:",
-        "qr_for": "Escanea este código con Pendi para recibir en el teléfono las notificaciones de este PC: cuando "
-                  "empieza la partida o cuando se acepta la cola.",
-        "qr_mask": "Código oculto",
+        "qr_for": "ESCANEA ESTE CÓDIGO QR con tu teléfono para recibir notificaciones cuando empiece la partida y "
+                  "se acepte la cola.",
+        "qr_press": "Pulsa Mostrar el código",
         "show_code": "Mostrar el código",
         "hide_code": "Ocultar el código",
         "mask": "Clave oculta",
@@ -141,9 +142,9 @@ WORDS = {
         "intro": "This program sends its alerts to your Pendi account. For that, this PC has to be linked to your "
                  "account.",
         "code_label": "This PC's key:",
-        "qr_for": "Scan this code with Pendi to get this PC's notifications on your phone: when the match starts or "
-                  "the queue is accepted.",
-        "qr_mask": "Hidden code",
+        "qr_for": "SCAN THIS QR CODE with your phone to get notifications when the match starts and the queue is "
+                  "accepted.",
+        "qr_press": "Press Show the code",
         "show_code": "Show the code",
         "hide_code": "Hide the code",
         "mask": "Key hidden",
@@ -332,6 +333,9 @@ _STYLE = (":root{color-scheme:light dark;" + _LIGHT + "}\n"
           "button:focus-visible{outline:2px solid var(--brand);outline-offset:2px}\n"
           "form[action='/check'] button,form[action='/relink'] button{width:100%;background:var(--brand);"
           "color:var(--on-brand)}\n"
+          # The form under the QR and the linked page's relink form keep the card «Actividad»'s rhythm (OR-106): from
+          # 880 px the key's card leaves for its column, and form{margin:0} alone left each flush under «Este PC».
+          "form[action='/check'],form[action='/relink']{margin-top:16px}\n"
           "form[action='/forget'] button{background:transparent;border-color:var(--line);color:var(--danger)}\n"
           "form[action='/quit'] button{padding-inline:16px;background:transparent;color:var(--ink2)}\n"
           ".more{display:grid;gap:16px;margin-top:32px}\n"
@@ -424,6 +428,18 @@ _STYLE += ("@media (min-width:880px){.page{max-width:max(1040px,85vw)}\n"
            '.key-card:has(.key[data-shown="false"]) .modules{visibility:hidden}\n'
            '.key-card:has(.key[data-shown="true"]) .qr-mask{visibility:hidden}\n'
            ".qr-for{margin:0}\n"
+           # The label with impact (OR-105, the pfmask mockup): the #state linked block's recipe, stretched to the
+           # card, the owner's leading capitals as its lead line and the rest under it. The masks over the QR (OR-104,
+           # qr.MASKS): the board's two tokens, and the instruction as plain text in the outline token over a halo in
+           # the masks' own ground, qr.GROUND, with no plate.
+           ".key-card .qr-for{justify-self:stretch;padding:16px 20px;border-radius:12px;background:var(--tonal);"
+           "color:var(--on-tonal);font-size:16px;line-height:24px;font-weight:500}\n"
+           ".key-card .qr-for b{display:block;margin:0 0 2px;font-size:20px;line-height:28px;font-weight:600;"
+           "letter-spacing:.02em}\n"
+           ".qm-1{fill:var(--brand)}.qm-2{fill:var(--tonal)}\n"
+           f".qm-say{{fill:var(--px-line);stroke:{qr.GROUND};stroke-width:10px;stroke-linejoin:round;"
+           "paint-order:stroke;font:600 28px system-ui,sans-serif;text-anchor:middle;dominant-baseline:central}"
+           ".qm-board{font-size:32px}\n"
            ".mask{display:flex;align-items:flex-end;gap:10px}\n"
            ".mask .grp{display:flex;align-items:flex-end;gap:2px}\n"
            ".mask svg{display:block;flex:none}\n"
@@ -670,6 +686,19 @@ _NOSCRIPT_STYLE = ('.key[data-shown="false"] .code,.key-card:has(.key[data-shown
                    '{visibility:visible}.mask,.qr-mask,.reveal{display:none}')
 
 
+def _lead(sentence):
+    """The QR label's leading capitals and the rest (OR-105): the words before the first one that holds a lower-case
+    letter, and the words from it. The tables keep the owner's sentence as one string; the page draws the capitals
+    as the label's lead line."""
+    words = sentence.split(" ")
+    for i, word in enumerate(words):
+        if any(letter.islower() for letter in word):
+            if i == 0:
+                break
+            return " ".join(words[:i]), " ".join(words[i:])
+    raise ValueError(f"the label holds no leading capitals followed by lower-case words: {sentence!r}")
+
+
 def _mask(words):
     """The mask over the key, three groups of the four heads, named for a screen reader. `words` are escaped."""
     return f'<span class="mask" role="img" aria-label="{words["mask"]}">{_MASK_GROUP * 3}</span>'
@@ -765,7 +794,7 @@ def _switch(words, token, lang):
 
 class PairingPage:
     def __init__(self, state, watch=None, on_quit=None, on_pause=None, on_resume=None, autostart=None, events=None,
-                 updater=None):
+                 updater=None, mask=None):
         """`watch` answers the watcher's snapshot; without it the page shows no watcher line. `on_quit` stops
         the program; without it the page shows no quit button and /quit is no route. `on_pause` and `on_resume`
         pause and resume the watcher; without them /pause and /resume are no routes. `autostart` is the start
@@ -775,7 +804,10 @@ class PairingPage:
         events, oldest first; with it /state carries the log's lines and the page draws them in the card «Actividad»,
         without it no log key and no card. `updater` is the update (update.py), set by main once the page serves;
         with it /state carries its state, the page draws its line under the state line, and /update and /restart
-        are routes; without it none of them."""
+        are routes; without it none of them. `mask` is the QR's mask, one of qr.MASKS; without it the page picks one
+        here, once, at random (the standard random module: a cosmetic pick), so each start, a fresh install's first
+        included, shows the bust or the board, and every render of this page draws the same one (owner 2026-10-02
+        12:4x)."""
         self.state = state
         self.watch = watch
         self.on_quit = on_quit
@@ -783,6 +815,8 @@ class PairingPage:
         self.autostart = autostart if autostart is not None and autostart.available else None
         self.events = events
         self.updater = updater
+        self.mask = mask if mask is not None else random.choice(qr.MASKS)
+        self.run = None  # the RunFile main hands the page: /replace answers its secret once published
         self.token = secrets.token_urlsafe(32)
         self.server = None
         self.port = None
@@ -937,16 +971,18 @@ class PairingPage:
             link.append(log_card)
         if secret is not None:
             modules = qr.encode(qr.pairing_address(secret).encode("ascii")).modules
-            drawn = qr.scene_svg(modules, plate_almena.PLATE_DATA_URI, labelledby="qr-for", mask=words["qr_mask"])
+            drawn = qr.scene_svg(modules, plate_almena.PLATE_DATA_URI, labelledby="qr-for", mask=self.mask,
+                                 mask_words=words["qr_press"])
             if drawn is None:  # the scene is drawn for version 3 only
-                drawn = qr.svg(modules, labelledby="qr-for", mask=words["qr_mask"])
+                drawn = qr.svg(modules, labelledby="qr-for", mask=self.mask, mask_words=words["qr_press"])
+            lead, rest = _lead(words["qr_for"])
             link += [# The code is hidden until asked (owner 2026-10-02): the QR's modules under their pixelated
                      # mask and the key's text under its heads until its person presses the reveal, a real button
                      # whose label says what a press does, with the label of what the QR is for over it, the QR's
                      # one sentence and its name; _SCRIPT hides both again 60 s after a show. The drawings stay.
                      f'<figure class="key-card">{drawn}<p class="key" data-shown="false"><span class="key-label">'
                      f'{words["code_label"]}</span> <span class="key-val">{_mask(words)}<span class="code" id="code">'
-                     f'{codes.display(secret)}</span></span></p><p class="qr-for" id="qr-for">{words["qr_for"]}</p>'
+                     f'{codes.display(secret)}</span></span></p><p class="qr-for" id="qr-for"><b>{lead}</b> {rest}</p>'
                      f'<button type="button" class="reveal" '
                      f'aria-controls="code" data-show="{words["show_code"]}" data-hide="{words["hide_code"]}">'
                      f'{words["show_code"]}</button>{_PARTY}</figure>',
@@ -1188,6 +1224,8 @@ def _handler(page):
             routes += ("/resume",) if page.on_resume is not None else ()
             routes += ("/autostart",) if page.autostart is not None else ()
             routes += ("/update", "/restart") if page.updater is not None else ()
+            replace_secret = page.run.secret if page.run is not None else None
+            routes += ("/replace",) if page.on_quit is not None and replace_secret is not None else ()
             if path not in routes:
                 return self._refuse(404)
             if length is None:  # chunked or absent is 411, anything but plain digits 400
@@ -1200,6 +1238,17 @@ def _handler(page):
             except ValueError:  # more fields than any form of the page has
                 return self._refuse(400)
             form = {key: values[0] for key, values in fields.items()}
+            if path == "/replace":
+                # A newer copy started over this one (__main__.py): it has no page token, so the run file's secret is
+                # its check; then the stop of «Salir», answered first as /quit is.
+                if not hmac.compare_digest(form.get("secret", "").encode(), replace_secret.encode()):
+                    return self._refuse(403)
+                try:
+                    closing = "Cerrando" if page.language_of(self.headers.get("Accept-Language")) == "es" else "Closing"
+                    self._send(202, "text/plain; charset=utf-8", closing)
+                finally:
+                    page.on_quit()
+                return
             if not hmac.compare_digest(form.get("token", "").encode(), page.token.encode()):
                 return self._refuse(403)
             if path == "/quit":

{pendify-0.1.5 → pendify-0.1.6}/src/pendify/qr.py

@@ -223,22 +223,82 @@ def penalty(modules):
             + 10 * (abs(dark * 2 - total) * 10 // total))
 
 
-# The mask over the pairing QR's modules (owner 2026-10-02 10:3x): one pixelated figure, the same for every key and
-# drawn from no module of any, a 7 by 7 mosaic laid over the symbol. F is a finder's corner (svg() draws the finder
-# there as the real one is; the scene's plate holds its own), # a dark block, + a mid block, . a light block, each in
-# the drawing's own colours.
-_MASK_ART = ("FF.#+FF",
-             "FF#.#FF",
-             "+#..##.",
-             "#.#+..#",
-             ".#.#+#.",
-             "FF+..#.",
-             "FF.#+.#")
+# The two masks over the pairing QR's modules (owner 2026-10-02 12:4x, ledger OR-104, lane pfmaskimpl), one picked at
+# random by the page once per start: the bust, a helmeted bust in left profile of 32 by 32 blocks (the pfmask design
+# lane's bust.py, options A and C of mockups/pendify-qr-mask-2026-10-02.html), and the board, 8 by 8 flat cells in
+# the page's --brand and --tonal (option B). Each lies on one GROUND path over the whole symbol, finders and timing
+# included, so no finder, module or grid shows through, and each carries the instruction as plain text (the owner's
+# correction: both with option C's words). Neither is drawn from any module of any key.
+MASKS = ("bust", "board")
+# The bust's blocks as bust.py prints them: '.' empty, 'o' the outline in the theme's --px-line (class "pl", as the
+# party's sprites), the rest the party's colours, page._FIGURE_COLOURS: v d l the helmet, y a the plume, h s the plates.
+_BUST = ("................................",
+         "................................",
+         "................................",
+         "..............ooooo.............",
+         ".............oyyyyyoy...........",
+         "............oyaaaaayyy..........",
+         "............oaayyyyaayy.........",
+         "............ooyyyyyyaayy........",
+         ".........ooodvoooyyyyaao........",
+         ".......oodvvvlvo.ooyyyaao.......",
+         "......odvvvvddlvo..ooyyayo......",
+         ".....oddvddddddlvo...ooaoo......",
+         ".....ooooodddddvvo.....o........",
+         ".....odddddddddvvo..............",
+         ".....ooooooodddddvo.............",
+         ".....odvvvvvoooddvvo............",
+         "....odddddddvo.ooddvooooooo.....",
+         "....oddddddddvo..oddvvoshhhoo...",
+         "....odddddddldvo.ooooossssshho..",
+         ".....oddddddddvooshhhhsssssss...",
+         "......oddddddddossssssssssss....",
+         ".....oooodooooossssoooooooo.....",
+         "......hhhoshhhhsssosssssss......",
+         ".......sshsssssssssssssss.......",
+         "........ssssssssssssssss........",
+         ".........ssssssssssssss.........",
+         "..........oooooooooooo..........",
+         "...........ssssssssss...........",
+         "............ssssssss............",
+         ".............ssssss.............",
+         "..............ssss..............",
+         "...............ss...............")
+_BUST_COLOURS = {"v": "#6D28D9", "d": "#40277C", "l": "#C3B1F7", "y": "#FBBE3C", "a": "#A5510B", "h": "#ECE8F6",
+                 "s": "#A79FC2"}
+_BUST_CELL = 10.5      # one block in plate units: 5.25 px in the page's 288 px box, 8.75 px at 480
+_BUST_SAY_ROW = 23.6   # the bust's row the instruction sits on: its lower band, the chest's upper plate
+_BOARD = 8             # the board's cells a side
+
+
+def _bust_paths():
+    """The bust as the page's _paths() draws a pixel drawing: one path per colour, one closed run per row."""
+    runs = {}
+    for y, row in enumerate(_BUST):
+        x = 0
+        while x < len(row):
+            if row[x] == ".":
+                x += 1
+                continue
+            start = x
+            while x < len(row) and row[x] == row[start]:
+                x += 1
+            runs.setdefault(row[start], []).append(f"M{start} {y}h{x - start}v1h-{x - start}z")
+    return "".join(f'<path class="pl" d="{"".join(d)}"/>' if key == "o" else
+                   f'<path fill="{_BUST_COLOURS[key]}" d="{"".join(d)}"/>' for key, d in runs.items())
+
+
+def _mask_named(mask, words):
+    """A mask is one of MASKS and is drawn with its words; anything else is refused, never drawn as another."""
+    if mask not in MASKS:
+        raise ValueError(f"no such mask: {mask!r}; the masks are {MASKS}")
+    if words is None:
+        raise ValueError(f"the mask {mask!r} is drawn with its words")
 
 
-def _mask_blocks():
-    """The mosaic's blocks as (column, row, tone), the finders' corners left out."""
-    return [(c, r, tone) for r, line in enumerate(_MASK_ART) for c, tone in enumerate(line) if tone != "F"]
+def _say(words, x, y, board):
+    """The instruction on a mask: plain svg text in the page's .qm-say rule (no plate, no box, no corner)."""
+    return f'<text class="qm-say{" qm-board" if board else ""}" x="{x:.1f}" y="{y:.1f}">{words}</text>'
 
 
 def _finder(x, y):
@@ -248,17 +308,31 @@ def _finder(x, y):
             f'<rect x="{x + 2}" y="{y + 2}" width="3" height="3" rx="1" fill="{_QR_INK}"/>')
 
 
-def _flat_mask(n, q, name):
-    """svg()'s mask: the three finders and the mosaic's blocks over the n by n symbol, named for a screen reader."""
-    step = n / len(_MASK_ART)
-    fill = {"#": _QR_INK, "+": _QR_RING, ".": _QR_TILE}
-    blocks = "".join(f'<rect x="{q + c * step:.2f}" y="{q + r * step:.2f}" width="{step:.2f}" height="{step:.2f}" '
-                     f'fill="{fill[tone]}"/>' for c, r, tone in _mask_blocks())
-    finders = "".join(_finder(left + q, top + q) for top, left in ((0, 0), (0, n - 7), (n - 7, 0)))
-    return f'<g class="qr-mask" role="img" aria-label="{name}" shape-rendering="crispEdges">{finders}{blocks}</g>'
-
-
-def svg(modules, labelledby=None, mask=None):
+def _flat_mask(n, q, mask, words):
+    """svg()'s mask, the scene's laid on the flat symbol: one GROUND path over the n by n symbol, finders included,
+    then the bust's 32 blocks fitted to it or the board's 8 by 8 cells, and the words placed as the scene places
+    them, in the scene's own units scaled to this box, so the page's one .qm-say rule draws both."""
+    side = n + 2 * q
+    ground = f'<path fill="{GROUND}" d="M{q} {q}h{n}v{n}h-{n}z"/>'
+    if mask == "bust":
+        art = (f'<g transform="translate({q} {q}) scale({n / len(_BUST):.6g})" shape-rendering="crispEdges">'
+               f"{_bust_paths()}</g>")
+        row = _BUST_SAY_ROW * n / len(_BUST)
+    else:
+        step = n / _BOARD
+        cells = {1: "", 2: ""}
+        for r in range(_BOARD):
+            for c in range(_BOARD):
+                cells[1 + (r + c) % 2] += f"M{q + c * step:.6g} {q + r * step:.6g}h{step:.6g}v{step:.6g}h-{step:.6g}z"
+        art = f'<path class="qm-1" d="{cells[1]}"/><path class="qm-2" d="{cells[2]}"/>'
+        row = n / 2
+    unit = VIEW / side
+    say = _say(words, (q + n / 2) * unit, (q + row) * unit, mask == "board")
+    return (f'<g class="qr-mask" role="img" aria-label="{words}">{ground}{art}'
+            f'<g transform="scale({side / VIEW:.6g})">{say}</g></g>')
+
+
+def svg(modules, labelledby=None, mask=None, mask_words=None):
     """An inline SVG of the symbol on a white tile that keeps a four-module quiet zone, one unit per module.
 
     The grid is the encoder's; only how a module is painted changes. A dark data module is a 0.88 dot with
@@ -268,9 +342,12 @@ def svg(modules, labelledby=None, mask=None):
     corner centre inside the arc only while its radius is under 0.5*sqrt(2)/(sqrt(2)-1), about 1.707.
 
     Every module, finders and alignment patterns included, is drawn in one group, class "modules", over the tile.
-    Given `mask`, the escaped name of the mask for a screen reader, a second group, class "qr-mask", draws the
-    constant pixelated figure in the same place and size (_flat_mask); the page's rules show one of the two.
+    Given `mask`, one of MASKS, and `mask_words`, the escaped instruction drawn on it and its name for a screen
+    reader, a second group, class "qr-mask", draws that mask over the symbol (_flat_mask); the page's rules show one
+    of the two.
     """
+    if mask is not None:
+        _mask_named(mask, mask_words)
     n, q = len(modules), QUIET_ZONE
     side = n + 2 * q
     finders = ((0, 0), (0, n - 7), (n - 7, 0))
@@ -300,7 +377,7 @@ def svg(modules, labelledby=None, mask=None):
                    f'<rect x="{x + 2}" y="{y + 2}" width="1" height="1" rx=".3" fill="{_QR_INK}"/>')
     out.append("</g>")
     if mask is not None:
-        out.append(_flat_mask(n, q, mask))
+        out.append(_flat_mask(n, q, mask, mask_words))
     out.append("</svg>")
     return "".join(out)
 
@@ -401,7 +478,7 @@ def _runs(cells):
     return out
 
 
-def scene_svg(modules, plate_data_uri, labelledby=None, uid="q", mask=None):
+def scene_svg(modules, plate_data_uri, labelledby=None, uid="q", mask=None, mask_words=None):
     """The pairing QR as the scene: the plate image under a group of polygons. None when the symbol is not version 3,
     and the caller draws svg() instead.
 
@@ -413,8 +490,11 @@ def scene_svg(modules, plate_data_uri, labelledby=None, uid="q", mask=None):
     near kerb clips it all.
 
     All that a key changes is one group, class "modules"; the plate is drawn before it and outside it. Given `mask`,
-    the escaped name of the mask for a screen reader, a second group, class "qr-mask", lays the constant pixelated
-    figure flat on the symbol under the same kerb: its blocks only, since the plate holds the finders."""
+    one of MASKS, and `mask_words`, the escaped instruction and the mask's name for a screen reader, a second group,
+    class "qr-mask", lays that mask flat on the symbol under the same kerb, over one GROUND path that covers the whole
+    symbol, the plate's finders and timing included, with the words over it."""
+    if mask is not None:
+        _mask_named(mask, mask_words)
     n = len(modules)
     if n != MODULES:
         return None
@@ -460,12 +540,24 @@ def scene_svg(modules, plate_data_uri, labelledby=None, uid="q", mask=None):
 
     veil = ""
     if mask is not None:
-        step = n / len(_MASK_ART)
-        fill = {"#": INK, "+": FACE_U, ".": GROUND}
-        blocks = {tone: "".join(area(c * step, r * step, (c + 1) * step, (r + 1) * step, 0.0)
-                                for c, r, t in _mask_blocks() if t == tone) for tone in fill}
-        veil = (f'<g class="qr-mask" role="img" aria-label="{mask}" clip-path="url(#{uid}k)">'
-                + "".join(f'<path fill="{fill[tone]}" d="{blocks[tone]}"/>' for tone in fill if blocks[tone]) + "</g>")
+        cx, cy = _pt(s0 + n / 2, s0 + n / 2, 0.0)       # the symbol's centre
+        if mask == "bust":
+            gx, gy = cx - len(_BUST) / 2 * _BUST_CELL, cy - len(_BUST) / 2 * _BUST_CELL
+            art = (f'<g transform="translate({gx:.2f} {gy:.2f}) scale({_BUST_CELL})" shape-rendering="crispEdges">'
+                   f"{_bust_paths()}</g>")
+            say = _say(mask_words, cx, gy + _BUST_SAY_ROW * _BUST_CELL, False)
+        else:
+            step = n / _BOARD
+            cells = {1: "", 2: ""}
+            for r in range(_BOARD):
+                for c in range(_BOARD):
+                    cells[1 + (r + c) % 2] += area(c * step, r * step, (c + 1) * step, (r + 1) * step, 0.0)
+            art = f'<path class="qm-1" d="{cells[1]}"/><path class="qm-2" d="{cells[2]}"/>'
+            say = _say(mask_words, cx, cy, True)
+        # the drawing lies on the field under the kerb's clip, the ground path first; the words are laid over the
+        # scene, never clipped
+        veil = (f'<g class="qr-mask" role="img" aria-label="{mask_words}"><g clip-path="url(#{uid}k)">'
+                f'<path fill="{GROUND}" d="{area(0, 0, n, n, 0.0)}"/>{art}</g>{say}</g>')
     dot = _poly([((du - dv) * AX, (du + dv) * AY) for du, dv in _OCTAGON])   # one dot, centred on 0 0
     dots = {True: [], False: []}
     for r in range(n):