pendify 0.1.4__tar.gz → 0.1.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pendify
-Version: 0.1.4
+Version: 0.1.5
 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
@@ -49,11 +49,13 @@ Si Windows responde que no encuentra `python`, usa `py` en su lugar: `py -m pip
 
 Así no se crean los accesos directos en el Escritorio ni en el menú Inicio, y el inicio con Windows queda en el interruptor de la página. Para actualizar, pulsa «Salir» en la página, ejecuta otra vez la misma línea de pip y vuelve a iniciarlo. Para quitarlo, apaga primero el interruptor «Iniciar con Windows» en la página, pulsa «Salir» y después ejecuta `python -m pip uninstall pendify`. La configuración en `%APPDATA%\pendify`, con el enlace con el teléfono, se queda; puedes borrar esa carpeta a mano.
 
+El programa revisa PyPI cada seis horas y, cuando hay una versión más nueva, la instala en segundo plano. La página ofrece entonces «Reiniciar ahora» para empezar a usarla. Para apagarlo, inícialo con `--no-update` o escribe `"update": "off"` en `%APPDATA%\pendify\config.json`. Las actualizaciones automáticas se instalan para tu usuario (--user).
+
 ### Enlazar
 
 Al iniciarse, el navegador abre una página local con un código QR. Escanéalo con la cámara del teléfono: se abre la app Pendi y te pide confirmar el enlace. La página muestra cuando el enlace quedó hecho.
 
-El código QR y la clave se muestran durante un minuto al pulsar «Mostrar el código» y luego se ocultan de nuevo.
+El código QR y la clave están ocultos; se muestran durante un minuto al pulsar «Mostrar el código», y la página dice para qué sirve el código.
 
 El botón de arriba a la derecha cambia entre el tema claro y el oscuro, y el programa guarda la elección para la próxima vez.
 
@@ -112,11 +114,13 @@ If Windows answers that `python` was not found, use `py` in its place: `py -m pi
 
 This way leaves no shortcut on the Desktop or in the Start menu, and the start with Windows is the switch on the page. To update, press «Quit» on the page, run the same pip line again and start it again. To remove it, first turn off the «Start with Windows» switch on the page, press «Quit», then run `python -m pip uninstall pendify`. The configuration in `%APPDATA%\pendify`, with the link to the phone, stays; you can delete that folder by hand.
 
+The program checks PyPI every six hours and, when a newer version exists, installs it in the background. The page then offers «Restart now» to start using it. To turn this off, start it with `--no-update` or write `"update": "off"` in `%APPDATA%\pendify\config.json`. Automatic updates install for your user (--user).
+
 ### Link
 
 When it starts, the browser opens a local page with a QR code. Scan it with the phone's camera: the Pendi app opens and asks you to confirm the link. The page shows when the link is done.
 
-The QR code and the key show for a minute when «Show the code» is pressed, and then hide again.
+The QR code and the key are hidden; they show for a minute when «Show the code» is pressed, and the page says what the code is for.
 
 The button at the top right switches between the light and the dark theme, and the program keeps the choice for the next time.
 

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

@@ -33,11 +33,13 @@ Si Windows responde que no encuentra `python`, usa `py` en su lugar: `py -m pip
 
 Así no se crean los accesos directos en el Escritorio ni en el menú Inicio, y el inicio con Windows queda en el interruptor de la página. Para actualizar, pulsa «Salir» en la página, ejecuta otra vez la misma línea de pip y vuelve a iniciarlo. Para quitarlo, apaga primero el interruptor «Iniciar con Windows» en la página, pulsa «Salir» y después ejecuta `python -m pip uninstall pendify`. La configuración en `%APPDATA%\pendify`, con el enlace con el teléfono, se queda; puedes borrar esa carpeta a mano.
 
+El programa revisa PyPI cada seis horas y, cuando hay una versión más nueva, la instala en segundo plano. La página ofrece entonces «Reiniciar ahora» para empezar a usarla. Para apagarlo, inícialo con `--no-update` o escribe `"update": "off"` en `%APPDATA%\pendify\config.json`. Las actualizaciones automáticas se instalan para tu usuario (--user).
+
 ### Enlazar
 
 Al iniciarse, el navegador abre una página local con un código QR. Escanéalo con la cámara del teléfono: se abre la app Pendi y te pide confirmar el enlace. La página muestra cuando el enlace quedó hecho.
 
-El código QR y la clave se muestran durante un minuto al pulsar «Mostrar el código» y luego se ocultan de nuevo.
+El código QR y la clave están ocultos; se muestran durante un minuto al pulsar «Mostrar el código», y la página dice para qué sirve el código.
 
 El botón de arriba a la derecha cambia entre el tema claro y el oscuro, y el programa guarda la elección para la próxima vez.
 
@@ -96,11 +98,13 @@ If Windows answers that `python` was not found, use `py` in its place: `py -m pi
 
 This way leaves no shortcut on the Desktop or in the Start menu, and the start with Windows is the switch on the page. To update, press «Quit» on the page, run the same pip line again and start it again. To remove it, first turn off the «Start with Windows» switch on the page, press «Quit», then run `python -m pip uninstall pendify`. The configuration in `%APPDATA%\pendify`, with the link to the phone, stays; you can delete that folder by hand.
 
+The program checks PyPI every six hours and, when a newer version exists, installs it in the background. The page then offers «Restart now» to start using it. To turn this off, start it with `--no-update` or write `"update": "off"` in `%APPDATA%\pendify\config.json`. Automatic updates install for your user (--user).
+
 ### Link
 
 When it starts, the browser opens a local page with a QR code. Scan it with the phone's camera: the Pendi app opens and asks you to confirm the link. The page shows when the link is done.
 
-The QR code and the key show for a minute when «Show the code» is pressed, and then hide again.
+The QR code and the key are hidden; they show for a minute when «Show the code» is pressed, and the page says what the code is for.
 
 The button at the top right switches between the light and the dark theme, and the program keeps the choice for the next time.
 

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pendify"
-version = "0.1.4"
+version = "0.1.5"
 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.4 → pendify-0.1.5}/src/pendify/__main__.py

@@ -4,12 +4,15 @@
     python -m <package> --dry        the same, but the watcher never accepts: it alerts at the queue pop
     python -m <package> --quiet      the same, started by the system at logon: no browser, and no message box
                                      unless the start fails
+    python -m <package> --no-update  the same, with no check of PyPI for a newer version (update.py)
     python -m <package> ping <kind>  one alert with the stored pair, one fixed line per answer
 
 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.
+it to end and starts. 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
 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.
@@ -17,13 +20,14 @@ test overrides, loopback only, so a test run reads neither the profile, the Work
 import argparse
 import os
 import signal
+import subprocess
 import sys
 import threading
 import time
 import webbrowser
 from pathlib import Path
 
-from . import alert, client, config, page, pairing, runfile, watcher, worker
+from . import alert, client, config, page, pairing, runfile, update, watcher, worker
 from .autostart import Autostart
 from .tray import Tray
 
@@ -41,8 +45,12 @@ PAGE_NOT_KNOWN_LINE = ("already running: the page of the program that runs is no
                        "moment to open it")
 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"
 _MB_ICONINFORMATION = 0x40
 _MB_SETFOREGROUND = 0x10000
+# The restart's new copy: no console, its own process group, out of this one's.
+_DETACHED_PROCESS = 0x00000008
+_CREATE_NEW_PROCESS_GROUP = 0x00000200
 # The icon by the clock's picture: pendify.ico beside the modules, the file install.ps1 points the shortcuts at.
 ICON_PATH = Path(__file__).with_name("pendify.ico")
 
@@ -82,6 +90,8 @@ def _arguments(argv):
     parser.add_argument("--dry", action="store_true", help="watch and alert, but never accept")
     parser.add_argument("--quiet", action="store_true",
                         help="a start by the system: no browser, and no message box for a start that ends well")
+    parser.add_argument("--no-update", action="store_true",
+                        help="no check of PyPI for a newer version in this run")
     commands = parser.add_subparsers(dest="command")
     ping = commands.add_parser("ping", parents=[common], help="send one alert with the stored pair")
     ping.add_argument("kind", choices=worker.KINDS)
@@ -154,7 +164,31 @@ def _ends(line, code, show):
     return code
 
 
-def _serve(args, store, base, timeout, opener, stop, delay, beep, show, clock, sleep, autostart, tray):
+def _restart(args, spawn, show, opens_page):
+    """The restart asked for, once the run file is free: a new copy of this program, detached and with no console,
+    which claims the run file as a first start does. One that opens its page, as every restart asked today does,
+    goes without --quiet; one that does not keeps this run's --quiet. This run's --dry, --data-dir, --worker and
+    --client-lockfile go with it either way."""
+    command = [sys.executable, "-m", __package__] + (["--quiet"] if args.quiet and not opens_page else [])
+    command += ["--dry"] if args.dry else []
+    for option in ("data_dir", "worker", "client_lockfile"):
+        if hasattr(args, option):  # the parser's SUPPRESS: present only when this run was given it
+            command += ["--" + option.replace("_", "-"), str(getattr(args, option))]
+    try:
+        spawn(command, creationflags=_DETACHED_PROCESS | _CREATE_NEW_PROCESS_GROUP, close_fds=True)
+    except OSError:
+        return _ends(RESTART_FAILED_LINE, 1, show)
+    return 0
+
+
+def _ready_version(updater):
+    """The version an install made ready, for the icon's item; None in any other state."""
+    seen = updater.snapshot()
+    return seen["version"] if seen["state"] == update.READY else None
+
+
+def _serve(args, store, base, timeout, opener, stop, delay, beep, show, clock, sleep, autostart, tray, updater,
+           spawn):
     # 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)
@@ -179,7 +213,9 @@ def _serve(args, store, base, timeout, opener, stop, delay, beep, show, clock, s
         opener(f"http://{page.ADDRESS}:{port}/")
         show(ALREADY_RUNNING_LINE)
         return 0
+    updating = None
     try:
+        mode = update.OFF if args.no_update else store.read_update()
         state = pairing.PairingState(store, lambda secret: worker.check(secret, base=base, timeout=timeout))
         watch, alerter = _watcher(args, store, state, base, timeout, stop, delay, beep)
 
@@ -196,14 +232,22 @@ 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)
         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.
+        updating = updater(update.RUNNING_VERSION, mode, restart=quit_page, folder=store.path.parent)
+        pairing_page.updater = updating
         # The icon by the clock, under --quiet as well: the way to stop a copy the Run key started. Its words are
         # the page's, in the language the page resolves with no browser to ask: the kept choice, else Spanish.
         icon = tray(url, on_open=lambda: opener(url), on_pause=watch.pause, on_resume=watch.resume,
                     on_quit=quit_page, paused=lambda: watch.paused,
-                    words=lambda: page.WORDS[pairing_page.language_of(None)], icon_path=ICON_PATH)
+                    words=lambda: page.WORDS[pairing_page.language_of(None)], icon_path=ICON_PATH,
+                    # «Reiniciar para actualizar a X» once an install is ready, the page's own restart
+                    update_ready=lambda: _ready_version(updating), on_restart=updating.restart)
         watching = threading.Thread(target=watch.run, daemon=True)
         try:
             icon.start()
+            if mode != update.OFF:
+                updating.start()
             run.publish(pairing_page.port)
             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
@@ -217,6 +261,7 @@ def _serve(args, store, base, timeout, opener, stop, delay, beep, show, clock, s
             pass
         finally:
             stop.set()
+            updating.close()  # the restart gate shuts at the quit
             # First, so a start made while this one stops waits for it instead of opening a closing page: Ctrl+C
             # and Ctrl+Break are marked only here, and the page's quit, marked already, is marked again.
             try:
@@ -228,8 +273,13 @@ def _serve(args, store, base, timeout, opener, stop, delay, beep, show, clock, s
             alerter.flush(STOP_SECONDS)
             pairing_page.close()
             icon.close()
+            # An install under way is waited for before the run file goes, so a quit does not end this copy while
+            # pip swaps the files; past the bound pip goes on alone, its output in a file.
+            updating.wait(update.INSTALL_JOIN_SECONDS)
     finally:
         run.release()
+    if updating is not None and updating.restart_requested.is_set():
+        return _restart(args, spawn, show, updating.restart_opens_page)
     return 0
 
 
@@ -242,11 +292,13 @@ 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):
+         sleep=time.sleep, tray=Tray, updater=update.Updater, spawn=subprocess.Popen):
     """`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."""
+    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."""
     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)
@@ -262,7 +314,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)
+                          autostart if autostart is not None else Autostart(), tray, updater, spawn)
         finally:
             if previous is not None:
                 signal.signal(signal.SIGBREAK, previous)

{pendify-0.1.4 → pendify-0.1.5}/src/pendify/config.py

@@ -1,6 +1,7 @@
 """The config file: the secret and the link id, under the user's profile (design P1, P6), and the page's theme
 choice when there is one (light or dark; the system's choice is no key), and its language choice when there is one
-(es or en; with none the page follows the browser).
+(es or en; with none the page follows the browser), and the update's mode when one is written there by hand
+(auto, notify or off; with none, auto).
 
 The file is `<base>/<folder>/config.json`, where the base is %APPDATA% in a real run and is injected
 everywhere else, so no test touches the real profile. A write goes to a temp file in the same folder
@@ -30,6 +31,10 @@ THEMES = ("light", "dark")
 SYSTEM_THEME = "system"
 # The language switch's choices; with no key the page follows the browser's language.
 LANGS = ("es", "en")
+# The update's modes (update.py), written by hand as the key "update": auto checks PyPI and installs in the
+# background, notify checks only, off never checks. With no key, or a foreign value, auto.
+UPDATE_MODES = ("auto", "notify", "off")
+DEFAULT_UPDATE = "auto"
 # _write's default: the stored theme and language choices are kept.
 _KEEP = object()
 
@@ -92,6 +97,11 @@ class ConfigStore:
         and cannot be read raises ConfigError, as read_theme() does; a missing, corrupt or foreign value is None."""
         return _choice(self._stored(), "lang", LANGS)
 
+    def read_update(self):
+        """The update's mode, auto, notify or off; auto when the file holds none or a foreign one. A file that is
+        there and cannot be read raises ConfigError, as read_theme() does."""
+        return _choice(self._stored(), "update", UPDATE_MODES) or DEFAULT_UPDATE
+
     def set_theme(self, choice):
         """The theme button's choice written beside the pair: light or dark kept, system kept as no key. Any
         other value is refused and nothing is written. Answers the stored choice, None for the system's."""
@@ -176,17 +186,19 @@ class ConfigStore:
 
     def _write(self, pairing, theme=_KEEP, lang=_KEEP):
         """The pair, and the theme and language choices: each stored one kept unless set_theme or set_lang passes
-        its own."""
+        its own. The update's mode, written by hand, is kept as it is stored."""
         folder = self.path.parent
-        if theme is _KEEP or lang is _KEEP:
-            stored = self._stored()
-            theme = _choice(stored, "theme", THEMES) if theme is _KEEP else theme
-            lang = _choice(stored, "lang", LANGS) if lang is _KEEP else lang
+        stored = self._stored()
+        theme = _choice(stored, "theme", THEMES) if theme is _KEEP else theme
+        lang = _choice(stored, "lang", LANGS) if lang is _KEEP else lang
+        update = _choice(stored, "update", UPDATE_MODES)
         values = {"secret": pairing.secret, "linkId": pairing.link_id}
         if theme is not None:
             values["theme"] = theme
         if lang is not None:
             values["lang"] = lang
+        if update is not None:
+            values["update"] = update
         data = json.dumps(values).encode("utf-8")
         try:
             folder.mkdir(parents=True, exist_ok=True)

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

@@ -15,7 +15,7 @@ import time
 import urllib.parse
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 
-from . import codes, config, icon, plate_almena, qr
+from . import codes, config, icon, plate_almena, qr, update
 
 ADDRESS = "127.0.0.1"
 MAX_FORM_BYTES = 4096
@@ -48,8 +48,10 @@ WORDS = {
         "title": "Avisos de este PC",
         "intro": "Este programa envía sus avisos a tu cuenta de Pendi. Para eso, este PC tiene que quedar enlazado "
                  "con tu cuenta.",
-        "scan": "Escanea este código con la cámara del teléfono donde tienes tu cuenta y confirma el enlace.",
         "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",
         "show_code": "Mostrar el código",
         "hide_code": "Ocultar el código",
         "mask": "Clave oculta",
@@ -125,13 +127,23 @@ WORDS = {
         "stopped": "El programa se detuvo: ya no vigila el cliente del juego ni envía avisos.",
         "start_again": "Para volver a iniciarlo, abre el acceso directo del Escritorio o ejecuta "
                        "pythonw -m pendify (o python -m pendify para verlo en una consola).",
+        "update_available": "Hay una versión nueva: {version}",
+        "update_install": "Actualizar",
+        "update_installing": "Instalando la versión {version}…",
+        "update_ready": "Actualización lista: {version}. Se aplica al reiniciar.",
+        "update_restart": "Reiniciar ahora",
+        "update_failed": "No se pudo instalar la versión {version}",
+        "update_restarting": "Reiniciando. La página nueva se abre en unos segundos.",
+        "update_tray_restart": "Reiniciar para actualizar a {version}",
     },
     "en": {
         "title": "Alerts from this PC",
         "intro": "This program sends its alerts to your Pendi account. For that, this PC has to be linked to your "
                  "account.",
-        "scan": "Scan this code with the camera of the phone that holds your account and confirm the link.",
         "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",
         "show_code": "Show the code",
         "hide_code": "Hide the code",
         "mask": "Key hidden",
@@ -207,6 +219,14 @@ WORDS = {
         "stopped": "The program stopped: it no longer watches the game client or sends alerts.",
         "start_again": "To start it again, open the shortcut on the Desktop or run pythonw -m pendify "
                        "(or python -m pendify to see it in a console).",
+        "update_available": "A new version is out: {version}",
+        "update_install": "Update",
+        "update_installing": "Installing version {version}…",
+        "update_ready": "Update ready: {version}. It applies on restart.",
+        "update_restart": "Restart now",
+        "update_failed": "Version {version} could not be installed",
+        "update_restarting": "Restarting. The new page opens in a few seconds.",
+        "update_tray_restart": "Restart to update to {version}",
     },
 }
 
@@ -264,10 +284,9 @@ _STYLE = (":root{color-scheme:light dark;" + _LIGHT + "}\n"
           '#state[data-shown="falsetrue"]{background:var(--danger-bg);color:var(--on-danger-bg)}\n'
           '#state[data-shown="falsetrue"]::before{background:none;border:2px solid currentColor}\n'
           "#watch{margin:12px 0 0;max-width:40rem;font-size:14px;line-height:20px;color:var(--ink2)}\n"
-          ".scan{margin:24px 0 16px;max-width:40ch}\n"
           ".note{margin:12px 0 0;font-size:14px;line-height:20px;color:var(--ink2)}\n"
           ".note.warn{color:var(--danger)}\n"
-          ".key-card{display:grid;justify-items:center;gap:16px;margin:0 0 16px;padding:20px;border-radius:16px;"
+          ".key-card{display:grid;justify-items:center;gap:16px;margin:24px 0 16px;padding:20px;border-radius:16px;"
           "background:var(--card);border:1px solid var(--hair);box-shadow:var(--shadow)}\n"
           ".qr{display:block;width:100%;max-width:288px;height:auto;border-radius:12px;"
           "box-shadow:0 0 0 1px var(--hair)}\n"
@@ -378,7 +397,7 @@ _STYLE = (":root{color-scheme:light dark;" + _LIGHT + "}\n"
 # keyframes inside the reduced-motion guard with the rules that run them.
 # Width: 85 % of the window at every desktop width, never narrower than 1040 px, no upper cap; the code's column grows
 # with the window and the code with it, up to 480 px. Column 1 is one measure: two tracks and a 24 px gutter, every
-# block spans both and the boxes lose their 40rem cap, while the two paragraphs keep theirs (.intro 46ch, .scan 40ch).
+# block spans both and the boxes lose their 40rem cap, while the intro keeps its own (.intro 46ch).
 # From a 1600 px window «Este PC» and «Actividad» share one row, a track each, as the two panels of the fold do; dense
 # placement draws the log card beside «Este PC» while the markup keeps its order, so the narrow page is unchanged.
 _STYLE += ("@media (min-width:880px){.page{max-width:max(1040px,85vw)}\n"
@@ -392,12 +411,19 @@ _STYLE += ("@media (min-width:880px){.page{max-width:max(1040px,85vw)}\n"
            ".key-card .qr{max-width:480px}}\n"
            "@media (min-width:1600px){.link:has(>.pc):has(>.log-card)>.pc{grid-column:1;align-content:start}\n"
            ".link:has(>.pc):has(>.log-card)>.log-card{grid-column:3;margin-top:24px}}\n"
-           # The code is shown; the key sits under the mask until «Mostrar el código» (the script sets data-shown).
+           # The code is hidden until asked (owner 2026-10-02, after his 2026-10-01 ruling to show it): the key and
+           # the QR's modules stay hidden until «Mostrar el código», the modules masked by a pixelated figure as the
+           # key is by its heads (the script sets data-shown on the key; the card's rules swap both from it); the
+           # drawings, the plate and the party with their moves, are always visible (owner 2026-10-02 10:3x). The
+           # label over the reveal is the QR's one sentence and its accessible name.
            ".key{justify-items:center;text-align:center}\n"
            ".key-val{display:grid;place-items:center;min-height:32px}\n"
            ".key-val>*{grid-area:1/1}\n"
            '.key[data-shown="false"] .code{visibility:hidden}\n'
            '.key[data-shown="true"] .mask{visibility:hidden}\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"
            ".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"
@@ -483,20 +509,37 @@ _STYLE += ("@media (min-width:880px){.page{max-width:max(1040px,85vw)}\n"
 # a page that draws the switch only, against the switch as it was rendered (defaultChecked, from enabled(), the read
 # /state answers, so a reload cannot loop, and a poll landing between a change and its post's answer cannot reload
 # the page under the post); the language too, against the one the page was drawn in (<html lang>), so a second tab
-# or another browser turns to a language chosen with the switch; says so when the program is gone.
+# or another browser turns to a language chosen with the switch; and the update's state and version, against the
+# ones the page was drawn with (data-update, served only beside an updater), so the update's line is drawn again
+# as it moves; says so when the program is gone.
 # While the program is gone the state line's data-shown is a value no style rule names, so the look of what the page
 # showed (the linked page's check mark) never sits beside the closed sentence; an answer puts the load value back.
 _SCRIPT = ("const s=document.getElementById('state');const w=document.getElementById('watch');"
-           "const shown=s.dataset.shown;const paused=s.dataset.paused;const lang=document.documentElement.lang;"
+           "const shown=s.dataset.shown;const paused=s.dataset.paused;const upd=s.dataset.update;"
+           "const lang=document.documentElement.lang;"
            "const sw=document.querySelector('input[name=autostart]');"
            # The card «Actividad»'s list is a tab stop only while its lines are taller than its box, read at load and
            # after each insert (the design review's open item 3: a stop on a list that does not scroll is dead).
            "const g=document.querySelector('.log');function tabStop(){if(g.scrollHeight>g.clientHeight)"
            "g.setAttribute('tabindex','0');else g.removeAttribute('tabindex');}if(g)tabStop();"
-           "setInterval(()=>fetch('/state').then(r=>r.json()).then(j=>{s.textContent=j.text;s.dataset.shown=shown;"
+           # The restart (pfupd round 2): «Reiniciar ahora» posted by the script, its answer, the restart's words,
+           # drawn in place of the state line; once asked, a poll that answers changes nothing and one that fails
+           # keeps the line. A page drawn while «Actualizar»'s install runs carries the words (data-restarting), so the
+           # restart that follows reads the same, and a poll that finds it ready draws them at once instead of
+           # reloading a page that is stopping.
+           "const follows=s.dataset.restarting!==undefined;let asked=false;"
+           "function restarting(t){asked=true;s.textContent=t;s.dataset.shown='closed';}"
+           "const rf=document.querySelector('form[action=\"/restart\"]');"
+           "if(rf)rf.addEventListener('submit',e=>{e.preventDefault();"
+           "fetch('/restart',{method:'POST',body:new URLSearchParams(new FormData(rf))})"
+           ".then(r=>r.ok?r.text():Promise.reject(r.status)).then(t=>{restarting(t);}).catch(()=>{});});"
+           "setInterval(()=>fetch('/state').then(r=>r.json()).then(j=>{if(asked)return;"
+           "if(follows&&j.update&&j.update.state==='ready'){restarting(s.dataset.restarting);return;}"
+           "s.textContent=j.text;s.dataset.shown=shown;"
            "if(w&&j.watchText)w.textContent=j.watchText;"
            "if(String(j.showCode)+String(j.relinkOffered)!==shown||(paused!==undefined&&String(j.paused)!==paused)"
-           "||j.lang!==lang||(sw&&j.autostart!==undefined&&String(j.autostart)!==String(sw.defaultChecked)))"
+           "||j.lang!==lang||(upd!==undefined&&j.update&&j.update.state+' '+(j.update.version||'')!==upd)"
+           "||(sw&&j.autostart!==undefined&&String(j.autostart)!==String(sw.defaultChecked)))"
            "location.reload();"
            # The log's lines above the highest seq the card has drawn go on top, oldest first so the newest ends
            # first, built as elements with their text (never as markup); the card keeps the last 50, as the ring
@@ -507,7 +550,8 @@ _SCRIPT = ("const s=document.getElementById('state');const w=document.getElement
            "const x=document.createElement('span');if(l.warn)x.className='warn';x.textContent=l.text;"
            "li.append(t,x);o.insertBefore(li,o.firstChild);last=l.seq;}g.dataset.seq=String(last);"
            "while(o.children.length>50)o.lastElementChild.remove();tabStop();}})"
-           ".catch(()=>{s.textContent=s.dataset.closed;s.dataset.shown='closed';}),5000);"
+           ".catch(()=>{if(asked)return;s.textContent=follows?s.dataset.restarting:s.dataset.closed;"
+           "s.dataset.shown='closed';}),5000);"
            # The key shows for a minute: the reveal sets data-shown on the key, which swaps the mask for the code, and
            # flips its own label; 60 s after a show the key is masked again; one timer, cleared on every press, so a
            # hide by hand leaves none running. The sheet's function is named showKey here, since the script's first
@@ -619,9 +663,11 @@ _MASK_GROUP = ('<span class="grp">' + "".join('<svg class="mx" viewBox="0 0 8 8"
                                               for rows in _HEADS) + "</span>")
 
 
-# With scripts blocked the reveal does nothing, so the key reads as it did before the mask: the code shown, the mask
-# and the reveal gone. The code's rule repeats the mask's own selector and comes later, so it wins.
-_NOSCRIPT_STYLE = '.key[data-shown="false"] .code{visibility:visible}.mask,.reveal{display:none}'
+# With scripts blocked the reveal does nothing, so the key reads as it did before the mask: the code and the QR's
+# modules shown, the key's mask, the QR's mask and the reveal gone. Each rule repeats its hiding rule's own selector
+# and comes later, so it wins.
+_NOSCRIPT_STYLE = ('.key[data-shown="false"] .code,.key-card:has(.key[data-shown="false"]) .modules'
+                   '{visibility:visible}.mask,.qr-mask,.reveal{display:none}')
 
 
 def _mask(words):
@@ -718,7 +764,8 @@ 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):
+    def __init__(self, state, watch=None, on_quit=None, on_pause=None, on_resume=None, autostart=None, events=None,
+                 updater=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
@@ -726,13 +773,16 @@ class PairingPage:
         it. Beside a watcher the page draws the card «Este PC» after the watcher line: the pause, or the resume while
         paused, and the switch of the start with Windows where it is available. `events` answers the watcher's
         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."""
+        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."""
         self.state = state
         self.watch = watch
         self.on_quit = on_quit
         self.on_pause, self.on_resume = on_pause, on_resume
         self.autostart = autostart if autostart is not None and autostart.available else None
         self.events = events
+        self.updater = updater
         self.token = secrets.token_urlsafe(32)
         self.server = None
         self.port = None
@@ -840,6 +890,8 @@ class PairingPage:
             answer["autostart"] = self.autostart.enabled()
         if self.events is not None:
             answer["log"] = self._log_lines(self.events(), lang)
+        if self.updater is not None:
+            answer["update"] = self.updater.snapshot()
         return answer
 
     def render(self, lang):
@@ -850,14 +902,25 @@ class PairingPage:
         token = html.escape(self.token)
         # Beside a watcher the state line carries the pause it was rendered with, which the poll compares.
         paused = "" if seen is None else f' data-paused="{str(_paused(seen)).lower()}"'
+        # Beside an updater it carries the update's state and version as well, read once for the line below.
+        updated = self.updater.snapshot() if self.updater is not None else None
+        updating = "" if updated is None else (f' data-update="{updated["state"]} '
+                                                f'{html.escape(updated["version"] or "")}"')
+        # While «Actualizar»'s install runs in notify mode, and once it reads ready, the restart follows by itself:
+        # the state line carries its words, which the script draws once the program is gone.
+        follows = (updated is not None and self.updater.mode == update.NOTIFY
+                   and updated["state"] in (update.INSTALLING, update.READY))
+        restarting = f' data-restarting="{words["update_restarting"]}"' if follows else ""
         # What this is and what to do, with the QR card beside it on a wide window; the two other roads in one fold
         # under it; the credit opens the top bar, and the quit sits at the foot, only beside a quit. The title row reads
         # the program's name, its sentence under it.
         link = [f'<div class="title-row"><img alt="" width="32" height="32" src="{ICON_URI}"><h1>{NAME}</h1>'
                 f"</div>", f'<p class="tagline">{words["title"]}</p>', f'<p class="intro">{words["intro"]}</p>',
                 f'<p id="state" role="status" data-shown="{str(snapshot["showCode"]).lower()}'
-                f'{str(snapshot["relinkOffered"]).lower()}"{paused} data-closed="{words["state_closed"]}">'
+                f'{str(snapshot["relinkOffered"]).lower()}"{paused}{updating}{restarting} '
+                f'data-closed="{words["state_closed"]}">'
                 f'{words[_state_word(snapshot, seen)]}</p>']
+        link += self._update_line(words, token, updated)
         if snapshot["configFailed"]:
             link.append(f'<p class="note warn">{words["config_failed"]}</p>')
         if seen is not None:
@@ -874,16 +937,17 @@ 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="scan")
+            drawn = qr.scene_svg(modules, plate_almena.PLATE_DATA_URI, labelledby="qr-for", mask=words["qr_mask"])
             if drawn is None:  # the scene is drawn for version 3 only
-                drawn = qr.svg(modules, labelledby="scan")
-            link += [f'<p class="scan" id="scan">{words["scan"]}</p>',
-                     # The code is shown (owner 2026-10-01); the key's text sits under the mask until its person
-                     # presses the reveal, a real button whose label says what a press does; _SCRIPT masks the key
-                     # again 60 s after a show.
+                drawn = qr.svg(modules, labelledby="qr-for", mask=words["qr_mask"])
+            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><button type="button" class="reveal" '
+                     f'{codes.display(secret)}</span></span></p><p class="qr-for" id="qr-for">{words["qr_for"]}</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>',
                      _form("check", token, f'<button type="submit">{words["check"]}</button>')]
@@ -930,6 +994,33 @@ class PairingPage:
                 f"</style><noscript><style>{_NOSCRIPT_STYLE}</style></noscript><script>{_THEME_READ}</script></head>"
                 f"<body>{body}<script>{_SCRIPT}</script></body></html>")
 
+    def _update_line(self, words, token, seen):
+        """The update's line under the state line and its one button, by state: a version seen in notify mode with
+        «Actualizar», a version ready in either mode with «Reiniciar ahora», an install under way alone, a failed one
+        with pip's last line in its title; nothing for none, nor for a version auto mode is about to install.
+        `words` are escaped already."""
+        if seen is None:
+            return []
+        state, version = seen["state"], html.escape(seen["version"] or "")
+        if state == update.AVAILABLE and self.updater.mode == update.NOTIFY:
+            key, button = "update_available", ("update", "update_install")
+        elif state == update.READY:
+            key, button = "update_ready", ("restart", "update_restart")
+        elif state == update.INSTALLING:
+            key, button = "update_installing", None
+        elif state == update.FAILED:
+            key, button = "update_failed", None
+        else:
+            return []
+        failed = state == update.FAILED
+        title = f' title="{html.escape(seen["error"] or "")}"' if failed else ""
+        drawn = [f'<p id="update" class="note{" warn" if failed else ""}"{title}>'
+                 f'{words[key].format(version=version)}</p>']
+        if button is not None:
+            action, label = button
+            drawn.append(_form(action, token, f'<button type="submit">{words[label]}</button>'))
+        return drawn
+
     def _card(self, words, token, paused):
         """The card «Este PC» (placement A, frames A1 to A6): the pause form, or the resume form while paused, then,
         where the start with Windows is available, its switch under a hairline, checked when the Run value exists.
@@ -1096,6 +1187,7 @@ def _handler(page):
             routes += ("/pause",) if page.on_pause is not None else ()
             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 ()
             if path not in routes:
                 return self._refuse(404)
             if length is None:  # chunked or absent is 411, anything but plain digits 400
@@ -1119,6 +1211,19 @@ def _handler(page):
                 finally:
                     page.on_quit()
                 return
+            if path == "/restart":
+                # «Reiniciar ahora», posted by the page's script: answered before the stop, as /quit is, with the
+                # restart's words, which the script draws in place of the state line and keeps once the program is
+                # gone, while the new copy starts and opens its own page; the flag, then the quit.
+                try:
+                    self._send(200, "text/plain; charset=utf-8",
+                               WORDS[page.language_of(self.headers.get("Accept-Language"))]["update_restarting"])
+                finally:
+                    page.updater.restart()
+                return
+            if path == "/update":  # «Actualizar» in notify mode; in any other mode or state nothing is installed
+                page.updater.request_install()
+                return self._send(303, "text/plain; charset=utf-8", "", (("Location", "/"),))
             if path == "/theme":  # the page's script posts it and reads no page back
                 outcome = page.set_theme(form.get("theme", ""))
                 if outcome == "refused":

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

@@ -223,7 +223,42 @@ def penalty(modules):
             + 10 * (abs(dark * 2 - total) * 10 // total))
 
 
-def svg(modules, labelledby=None):
+# 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.#+.#")
+
+
+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 _finder(x, y):
+    """A finder as svg() draws it: a violet 7 by 7 ring, a white 5 by 5 separator and a 3 by 3 eye."""
+    return (f'<rect x="{x}" y="{y}" width="7" height="7" rx="1.5" fill="{_QR_RING}"/>'
+            f'<rect x="{x + 1}" y="{y + 1}" width="5" height="5" rx="1.4" fill="{_QR_TILE}"/>'
+            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):
     """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
@@ -231,6 +266,10 @@ def svg(modules, labelledby=None):
     eye; each alignment pattern a 5 by 5 ring, its 3 by 3 gap and its centre. Every rounded corner is small
     enough that each module's centre, where a reader samples, keeps the module's colour: a 7 by 7 ring keeps its
     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.
     """
     n, q = len(modules), QUIET_ZONE
     side = n + 2 * q
@@ -251,17 +290,17 @@ def svg(modules, labelledby=None):
     label = f' aria-labelledby="{labelledby}"' if labelledby else ""
     out = [f'<svg class="qr" viewBox="0 0 {side} {side}" role="img"{label}>',
            f'<rect width="{side}" height="{side}" rx="1.5" fill="{_QR_TILE}"/>',
-           f'<g fill="{_QR_INK}">{dots}</g>']
+           f'<g class="modules"><g fill="{_QR_INK}">{dots}</g>']
     for top, left in finders:
-        x, y = left + q, top + q
-        out.append(f'<rect x="{x}" y="{y}" width="7" height="7" rx="1.5" fill="{_QR_RING}"/>'
-                   f'<rect x="{x + 1}" y="{y + 1}" width="5" height="5" rx="1.4" fill="{_QR_TILE}"/>'
-                   f'<rect x="{x + 2}" y="{y + 2}" width="3" height="3" rx="1" fill="{_QR_INK}"/>')
+        out.append(_finder(left + q, top + q))
     for a, b in alignments:
         x, y = b - 2 + q, a - 2 + q
         out.append(f'<rect x="{x}" y="{y}" width="5" height="5" rx="1.5" fill="{_QR_INK}"/>'
                    f'<rect x="{x + 1}" y="{y + 1}" width="3" height="3" rx=".9" fill="{_QR_TILE}"/>'
                    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("</svg>")
     return "".join(out)
 
@@ -362,7 +401,7 @@ def _runs(cells):
     return out
 
 
-def scene_svg(modules, plate_data_uri, labelledby=None, uid="q"):
+def scene_svg(modules, plate_data_uri, labelledby=None, uid="q", mask=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.
 
@@ -371,7 +410,11 @@ def scene_svg(modules, plate_data_uri, labelledby=None, uid="q"):
     light modules that have a dark module in front, then the light modules' tops (the plate lifted by the relief,
     clipped to the light modules) and their ground dots. A light module's floor is always covered by its top,
     its faces or its near neighbours' tops, so only the dark floors stay darkened and dotted, as in the renderer. The
-    near kerb clips it all."""
+    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."""
     n = len(modules)
     if n != MODULES:
         return None
@@ -415,6 +458,14 @@ def scene_svg(modules, plate_data_uri, labelledby=None, uid="q"):
     faces = "".join(f'<path fill="{fill}" d="{"".join(d)}"/>' for fill, d in
                     ((FACE_V_LIP, lips_v), (FACE_V, face_v), (FACE_U_LIP, lips_u), (FACE_U, face_u)) if d)
 
+    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>")
     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):
@@ -426,8 +477,8 @@ def scene_svg(modules, plate_data_uri, labelledby=None, uid="q"):
             f'<defs><image id="{uid}p" width="{VIEW}" height="{VIEW}" href="{plate_data_uri}"/>'
             f'<clipPath id="{uid}t"><path d="{"".join(tops)}"/></clipPath>'
             f'<clipPath id="{uid}k"><path d="{kerb}"/></clipPath><path id="{uid}d" d="{dot}"/></defs>'
-            f'<use href="#{uid}p"/><g clip-path="url(#{uid}k)">'
+            f'<use href="#{uid}p"/><g class="modules" clip-path="url(#{uid}k)">'
             f'<g fill="{INK}">{"".join(dots[True])}</g>'
             f'<path fill-opacity="{1 - BED_DARK:.2f}" d="{area(0, 0, n, n, 0.0)}"/>{faces}'
             f'<g clip-path="url(#{uid}t)"><use href="#{uid}p" y="{-drop:.2f}"/></g>'
-            f'<g fill="{GROUND}">{"".join(dots[False])}</g></g></svg>')
+            f'<g fill="{GROUND}">{"".join(dots[False])}</g></g>{veil}</svg>')

{pendify-0.1.4 → pendify-0.1.5}/src/pendify/tray.py

@@ -1,5 +1,6 @@
 """The icon by the clock (lane pftray): an icon in the notification area whose menu opens the page, pauses or
-resumes the alerts and quits the program, so the program can be stopped with the page and the browser closed.
+resumes the alerts, quits the program and, once an update is ready, restarts into it, so the program can be stopped
+with the page and the browser closed.
 
 Standard library only: user32, shell32 and kernel32 by ctypes, bound for 64-bit Windows. The icon lives on a thread
 of its own, a daemon, with a hidden top-level tool window (never shown, so no taskbar entry and no Alt+Tab slot,
@@ -29,7 +30,7 @@ NIF_MESSAGE, NIF_ICON, NIF_TIP = 0x1, 0x2, 0x4
 IMAGE_ICON, LR_LOADFROMFILE, LR_DEFAULTSIZE = 1, 0x10, 0x40
 MF_STRING, MF_SEPARATOR = 0x0, 0x800
 TPM_RIGHTBUTTON, TPM_NONOTIFY, TPM_RETURNCMD = 0x2, 0x80, 0x100
-OPEN, PAUSE, RESUME, QUIT = 1, 2, 3, 4  # the menu's commands
+OPEN, PAUSE, RESUME, QUIT, RESTART = 1, 2, 3, 4, 5  # the menu's commands
 
 FAILED_LINE = " [tray] {call} failed (error {code})"
 BROKE_LINE = " [tray] the icon broke: {kind}"
@@ -122,10 +123,13 @@ def _say(line):
 class Tray:
     """The icon by the clock. `paused` answers the watcher's state and `words` the page's table for the language set
     at that moment; both are read at each click. `win32` is the facade of the Win32 functions, built from ctypes on
-    Windows when None; a test passes a fake."""
+    Windows when None; a test passes a fake. `update_ready` answers the version an install made ready, or None, read
+    at each click as well, and `on_restart` is the page's restart: with both, a ready version adds its item."""
 
-    def __init__(self, url, on_open, on_pause, on_resume, on_quit, paused, words, icon_path, win32=None):
+    def __init__(self, url, on_open, on_pause, on_resume, on_quit, paused, words, icon_path, win32=None,
+                 update_ready=None, on_restart=None):
         self.url = url
+        self._update_ready, self._on_restart = update_ready, on_restart
         self._on_open, self._on_pause, self._on_resume, self._on_quit = on_open, on_pause, on_resume, on_quit
         self._paused, self._words, self._icon_path = paused, words, str(icon_path)
         self._win32 = win32
@@ -277,12 +281,14 @@ class Tray:
         answers 0 when the menu is dismissed, which is no failure."""
         win32, words = self._win32, self._words()
         middle = (RESUME, words["resume"]) if self._paused() else (PAUSE, words["pause"])
+        ready = self._update_ready() if self._update_ready is not None and self._on_restart is not None else None
+        restart = () if ready is None else ((RESTART, words["update_tray_restart"].format(version=ready)),)
         menu = win32.CreatePopupMenu()
         if not menu:
             self._failed("CreatePopupMenu")
             return
         try:
-            for item in ((OPEN, words["tray_open"]), middle, None, (QUIT, words["quit"])):
+            for item in ((OPEN, words["tray_open"]), middle, None, *restart, (QUIT, words["quit"])):
                 flags, command, text = (MF_SEPARATOR, 0, None) if item is None else (MF_STRING, *item)
                 if not win32.AppendMenuW(menu, flags, command, text):
                     self._failed("AppendMenuW")
@@ -304,7 +310,7 @@ class Tray:
             self._on_pause()
         elif chosen == RESUME:
             self._on_resume()
-        elif chosen == QUIT:
-            self._on_quit()
+        elif chosen in (QUIT, RESTART):  # either ends this copy: its icon goes at once
+            (self._on_quit if chosen == QUIT else self._on_restart)()
             if not win32.PostMessageW(hwnd, WM_CLOSE, 0, 0):
                 self._failed("PostMessageW")

pendify-0.1.5/src/pendify/update.py

@@ -0,0 +1,252 @@
+"""The update (OR-103): one GET to PyPI a minute after the start and every six hours after, and the newer version
+installed with pip.
+
+`auto` checks and installs in the background, and the page then offers «Reiniciar ahora»; `notify` checks only, and
+the page offers «Actualizar», which installs and then restarts; `off` never checks. The check carries nothing of the
+pair: one GET to pypi.org with the program's User-Agent. pip runs with python.exe beside this interpreter, since the
+output of pythonw goes nowhere, with the arguments of the paste (install.ps1:184) and the version pinned, and never
+with a console over a game; its output goes to update-pip.log in the config folder, never to pipes of this copy, and
+main's stop waits for it a minute before the run file goes. The running copy is never touched: every module was
+imported at its start, so the new
+files take effect at the next start, the one «Reiniciar ahora» asks for.
+"""
+import importlib.metadata
+import json
+import os
+import re
+import subprocess
+import sys
+import threading
+import urllib.request
+from pathlib import Path
+
+from . import config, worker
+
+DISTRIBUTION = "pendify"
+PYPI_URL = f"https://pypi.org/pypi/{DISTRIBUTION}/json"
+MODES = config.UPDATE_MODES
+AUTO, NOTIFY, OFF = MODES
+FIRST_ROUND_SECONDS = 60
+ROUND_SECONDS = 6 * 60 * 60
+INSTALL_SECONDS = 10 * 60
+# How long main's stop waits for an install under way before the run file goes.
+INSTALL_JOIN_SECONDS = 60
+# pip's output, in the config folder: a file, never a pipe of this copy, which a quit or a logoff would close under a
+# pip that is swapping the files, and pip's next line would then raise before its rollback.
+PIP_LOG_NAME = "update-pip.log"
+# What the page reads: the state, with the version it is about.
+NONE, AVAILABLE, INSTALLING, READY, FAILED = "none", "available", "installing", "ready", "failed"
+# No console over a game: the flags of the process pip runs in.
+CREATE_NO_WINDOW = 0x08000000
+DETACHED_PROCESS = 0x00000008
+_MAX_ANSWER_BYTES = 4 * 1024 * 1024
+_VERSION = re.compile(r"([0-9]+)\.([0-9]+)\.([0-9]+)")
+
+
+def _parts(version):
+    """X.Y.Z as a tuple of ints; None for anything else."""
+    match = _VERSION.fullmatch(version) if isinstance(version, str) else None
+    return tuple(int(part) for part in match.groups()) if match else None
+
+
+def newer(remote, local):
+    """True only when both are X.Y.Z and `remote` is the higher; anything else, on either side, is not newer."""
+    remote_parts, local_parts = _parts(remote), _parts(local)
+    return remote_parts is not None and local_parts is not None and remote_parts > local_parts
+
+
+def installed_version():
+    """The version the disk holds now, read fresh from the package's metadata; None when it cannot be read."""
+    try:
+        version = importlib.metadata.version(DISTRIBUTION)
+    except Exception:  # not installed (a checkout) or a half-written dist-info: no version
+        return None
+    return version.strip() if isinstance(version, str) and version.strip() else None
+
+
+# The version this copy runs: read once at import, at the start, before any install can change the disk.
+RUNNING_VERSION = installed_version()
+
+
+def check(urlopen=urllib.request.urlopen):
+    """PyPI's latest version of the package, as its JSON names it in info.version; raises on any failure."""
+    request = urllib.request.Request(PYPI_URL, headers={"User-Agent": worker.USER_AGENT})
+    with urlopen(request, timeout=worker.TIMEOUT_SECONDS) as answer:
+        data = json.loads(answer.read(_MAX_ANSWER_BYTES).decode("utf-8"))
+    return data["info"]["version"]
+
+
+def pip_command(version, executable, in_venv):
+    """The paste's pip arguments (install.ps1:184) with the version pinned, run by python.exe beside `executable`;
+    without --user in a venv, where pip refuses it."""
+    user = [] if in_venv else ["--user"]
+    return [str(Path(executable).with_name("python.exe")), "-m", "pip", "install", *user, "--upgrade",
+            "--force-reinstall", "--no-deps", "--no-warn-script-location", f"{DISTRIBUTION}=={version}"]
+
+
+def install(version, log_path, run=subprocess.run, installed=installed_version, executable=None, in_venv=None):
+    """`version` onto the disk: (True, None) when the disk already holds it, which skips pip, or when pip ends 0;
+    (False, line) otherwise, the line pip's last one, read from `log_path` once pip has ended, or the name of what
+    kept pip from running. pip's stdout and stderr go to `log_path`, truncated at each install, never to pipes of
+    this process: a copy that stops while pip swaps the files leaves pip writing to a file."""
+    if installed() == version:
+        return True, None
+    executable = sys.executable if executable is None else executable
+    in_venv = sys.prefix != sys.base_prefix if in_venv is None else in_venv
+    # pip's own version notice would be its last line; the variable keeps it out, the arguments stay the paste's.
+    # Unbuffered, pip's stdout and stderr reach the one file in the order pip wrote them, so its last line is last.
+    environment = {**os.environ, "PIP_DISABLE_PIP_VERSION_CHECK": "1", "PYTHONUNBUFFERED": "1"}
+    try:
+        with open(log_path, "wb") as output:
+            done = run(pip_command(version, executable, in_venv), stdin=subprocess.DEVNULL, stdout=output,
+                       stderr=output, timeout=INSTALL_SECONDS, creationflags=CREATE_NO_WINDOW | DETACHED_PROCESS,
+                       env=environment)
+        if done.returncode == 0:
+            return True, None
+        written = Path(log_path).read_bytes().decode("utf-8", "replace")
+    except (OSError, subprocess.SubprocessError) as failure:
+        return False, type(failure).__name__
+    lines = [line.strip() for line in written.splitlines() if line.strip()]
+    return False, lines[-1] if lines else f"pip ended {done.returncode}"
+
+
+def _log(line):
+    print(f" [update] {line}", file=sys.stderr, flush=True)
+
+
+class Updater:
+    """The rounds on their own daemon thread, never the watcher's nor the tick loop's, and the state the page reads.
+
+    `check` answers PyPI's latest version, `install(version)` answers (done, line), pip itself with its output in
+    update-pip.log of `folder` (the config folder) when None, `restart` stops this copy once the restart flag is set
+    (main's quit), `clock(seconds)` waits before a round and answers True once the updater is closed (the close's
+    own wait when None), and `log` takes a failure's one line (stderr when None)."""
+
+    def __init__(self, current_version, mode, check=check, install=None, restart=None, clock=None, log=None,
+                 folder=None):
+        if mode not in MODES:
+            raise ValueError("the update mode is not auto, notify or off")
+        self.pip_log = None if folder is None else Path(folder) / PIP_LOG_NAME
+        if install is None and self.pip_log is None:
+            raise ValueError("pip's output needs the config folder: no update without it")
+        self.current_version, self.mode = current_version, mode
+        self._check, self._install, self._restart = check, self._pip if install is None else install, restart
+        self._closed = threading.Event()
+        self._wait = self._closed.wait if clock is None else clock
+        self._log = _log if log is None else log
+        self._lock = threading.Lock()
+        self._state = (NONE, None, None)
+        # Set while no install runs: what wait() reads; cleared under the lock wherever the state turns installing.
+        self._idle = threading.Event()
+        self._idle.set()
+        # The flag main reads after the run file's release: set, it starts a new copy.
+        self.restart_requested = threading.Event()
+        # Whether that copy opens its page, so it starts without --quiet: every restart asked today does.
+        self.restart_opens_page = True
+        self.thread = None
+
+    def snapshot(self):
+        """What the page reads: the state, the version it is about and, for a failed install, pip's last line."""
+        with self._lock:
+            state, version, error = self._state
+        return {"state": state, "version": version, "error": error}
+
+    def start(self):
+        """The rounds on their own daemon thread; none in off mode."""
+        if self.mode == OFF or self.thread is not None:
+            return
+        self.thread = threading.Thread(target=self.run, name="update", daemon=True)
+        self.thread.start()
+
+    def close(self):
+        """Ends the wait between rounds; an install under way runs on in its own process, and wait() is how main's
+        stop waits for it."""
+        self._closed.set()
+
+    def wait(self, timeout=INSTALL_JOIN_SECONDS):
+        """Main's stop, before the run file's release: an install under way waited for, up to `timeout` seconds, so
+        a quit does not end this copy while pip swaps the files. True once none runs; False, said in one log line,
+        when pip still runs at the bound and goes on alone, its output in its file."""
+        if self._idle.wait(timeout):
+            return True
+        with self._lock:
+            version = self._state[1]
+        self._log(f"the install of {version} did not end in {timeout:g} seconds; pip goes on alone")
+        return False
+
+    def run(self):
+        """One round a minute after the start, then one every six hours, until the close."""
+        delay = FIRST_ROUND_SECONDS
+        while not self._wait(delay):
+            self.round()
+            delay = ROUND_SECONDS
+
+    def round(self):
+        """One check; a newer version reads available, and auto mode installs it at once. A failure is one log
+        line, and the next round runs. Nothing is checked again once an install has started, ended ready or failed:
+        a failed version is tried again at the next start only."""
+        if self.mode == OFF or not self._open():
+            return
+        try:
+            latest = self._check()
+        except Exception as failure:  # the network, PyPI or its answer: silent on the page until the next round
+            self._log(f"the check failed: {type(failure).__name__}")
+            return
+        if not newer(latest, self.current_version):
+            return
+        with self._lock:
+            if self._state[0] not in (NONE, AVAILABLE):
+                return
+            self._state = (AVAILABLE, latest, None)
+        if self.mode == AUTO:
+            self._apply(latest)
+
+    def request_install(self):
+        """The page's «Actualizar» in notify mode: the version seen installed on its own thread, then the restart.
+        False, and nothing done, in any other mode or state."""
+        with self._lock:
+            state, version, _ = self._state
+            if self.mode != NOTIFY or state != AVAILABLE:
+                return False
+            self._state = (INSTALLING, version, None)
+            self._idle.clear()
+        threading.Thread(target=self._install_then_restart, args=(version,), name="update-install",
+                         daemon=True).start()
+        return True
+
+    def restart(self, opens_page=True):
+        """A request only: the flag main reads after the run file's release, then the stop of this copy. With
+        `opens_page`, true for every restart asked today (the page's «Reiniciar ahora», the restart after
+        «Actualizar», the icon's item), the new copy starts without --quiet, so its page opens; a restart that does not
+        ask for it keeps the run's own --quiet."""
+        self.restart_opens_page = opens_page
+        self.restart_requested.set()
+        if self._restart is not None:
+            self._restart()
+
+    def _open(self):
+        with self._lock:
+            return self._state[0] in (NONE, AVAILABLE)
+
+    def _pip(self, version):
+        """pip itself, its output in update-pip.log of the config folder."""
+        return install(version, self.pip_log)
+
+    def _install_then_restart(self, version):
+        if self._apply(version) and not self._closed.is_set():
+            self.restart()
+
+    def _apply(self, version):
+        with self._lock:
+            self._state = (INSTALLING, version, None)
+            self._idle.clear()
+        try:
+            done, line = self._install(version)
+        except Exception as failure:  # never a dead thread with the page reading installing for ever
+            done, line = False, type(failure).__name__
+        with self._lock:
+            self._state = (READY, version, None) if done else (FAILED, version, line)
+            self._idle.set()
+        if not done:
+            self._log(f"the install of {version} failed")
+        return done

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pendify
-Version: 0.1.4
+Version: 0.1.5
 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
@@ -49,11 +49,13 @@ Si Windows responde que no encuentra `python`, usa `py` en su lugar: `py -m pip
 
 Así no se crean los accesos directos en el Escritorio ni en el menú Inicio, y el inicio con Windows queda en el interruptor de la página. Para actualizar, pulsa «Salir» en la página, ejecuta otra vez la misma línea de pip y vuelve a iniciarlo. Para quitarlo, apaga primero el interruptor «Iniciar con Windows» en la página, pulsa «Salir» y después ejecuta `python -m pip uninstall pendify`. La configuración en `%APPDATA%\pendify`, con el enlace con el teléfono, se queda; puedes borrar esa carpeta a mano.
 
+El programa revisa PyPI cada seis horas y, cuando hay una versión más nueva, la instala en segundo plano. La página ofrece entonces «Reiniciar ahora» para empezar a usarla. Para apagarlo, inícialo con `--no-update` o escribe `"update": "off"` en `%APPDATA%\pendify\config.json`. Las actualizaciones automáticas se instalan para tu usuario (--user).
+
 ### Enlazar
 
 Al iniciarse, el navegador abre una página local con un código QR. Escanéalo con la cámara del teléfono: se abre la app Pendi y te pide confirmar el enlace. La página muestra cuando el enlace quedó hecho.
 
-El código QR y la clave se muestran durante un minuto al pulsar «Mostrar el código» y luego se ocultan de nuevo.
+El código QR y la clave están ocultos; se muestran durante un minuto al pulsar «Mostrar el código», y la página dice para qué sirve el código.
 
 El botón de arriba a la derecha cambia entre el tema claro y el oscuro, y el programa guarda la elección para la próxima vez.
 
@@ -112,11 +114,13 @@ If Windows answers that `python` was not found, use `py` in its place: `py -m pi
 
 This way leaves no shortcut on the Desktop or in the Start menu, and the start with Windows is the switch on the page. To update, press «Quit» on the page, run the same pip line again and start it again. To remove it, first turn off the «Start with Windows» switch on the page, press «Quit», then run `python -m pip uninstall pendify`. The configuration in `%APPDATA%\pendify`, with the link to the phone, stays; you can delete that folder by hand.
 
+The program checks PyPI every six hours and, when a newer version exists, installs it in the background. The page then offers «Restart now» to start using it. To turn this off, start it with `--no-update` or write `"update": "off"` in `%APPDATA%\pendify\config.json`. Automatic updates install for your user (--user).
+
 ### Link
 
 When it starts, the browser opens a local page with a QR code. Scan it with the phone's camera: the Pendi app opens and asks you to confirm the link. The page shows when the link is done.
 
-The QR code and the key show for a minute when «Show the code» is pressed, and then hide again.
+The QR code and the key are hidden; they show for a minute when «Show the code» is pressed, and the page says what the code is for.
 
 The button at the top right switches between the light and the dark theme, and the program keeps the choice for the next time.
 

{pendify-0.1.4 → pendify-0.1.5}/src/pendify.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ src/pendify/plate_almena.py
 src/pendify/qr.py
 src/pendify/runfile.py
 src/pendify/tray.py
+src/pendify/update.py
 src/pendify/watcher.py
 src/pendify/worker.py
 src/pendify.egg-info/PKG-INFO