pendify 0.1.4__tar.gz → 0.1.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pendify
-Version: 0.1.4
+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.
 
@@ -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.
 
@@ -91,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.
 
@@ -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.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.
 
@@ -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.
 
@@ -75,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.
 
@@ -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.6}/pyproject.toml

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

@@ -4,26 +4,36 @@
     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 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
 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
 
-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 +51,22 @@ 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"
+# 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.
+_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 +106,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,14 +180,102 @@ 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 _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()
+    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, 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:
@@ -179,7 +293,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)
 
@@ -195,16 +311,31 @@ 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.
+        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)
+            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)
@@ -217,6 +348,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 +360,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 +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):
+         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."""
+    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. `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)
@@ -262,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)
+                          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.4 → pendify-0.1.6}/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)