From 6733aacb6e2446a5d264c9fafbda1e865cc507a4 Mon Sep 17 00:00:00 2001 From: Jos Rothman Date: Thu, 5 Nov 2026 23:52:39 +0100 Subject: [PATCH] Rename the Python package to daynivo_kiosk src/voxip_kiosk -> src/daynivo_kiosk, with every import, the launchers, install.sh, the Makefile and the manager's gunicorn app path. An upgrade replaces /usr/lib/voxip-kiosk/python as a whole, so the old package disappears; tested by upgrading an installation of the previous commit. Co-Authored-By: Claude Opus 5.5 --- Makefile | 2 +- bin/daynivo-kiosk-ctl | 2 +- bin/voxip-kiosk-agent | 2 +- bin/voxip-kiosk-browser | 2 +- bin/voxip-kiosk-healthcheck | 2 +- bin/voxip-kiosk-helper | 2 +- bin/voxip-kiosk-manager | 2 +- bin/voxip-kiosk-updater | 2 +- docs/ARCHITECTURE.md | 2 +- image/build.sh | 2 +- install.sh | 8 ++++---- src/{voxip_kiosk => daynivo_kiosk}/__init__.py | 0 src/{voxip_kiosk => daynivo_kiosk}/agent.py | 0 src/{voxip_kiosk => daynivo_kiosk}/browser.py | 0 src/{voxip_kiosk => daynivo_kiosk}/cdp.py | 0 src/{voxip_kiosk => daynivo_kiosk}/config.py | 0 src/{voxip_kiosk => daynivo_kiosk}/ctl.py | 0 src/{voxip_kiosk => daynivo_kiosk}/healthcheck.py | 0 src/{voxip_kiosk => daynivo_kiosk}/helper.py | 0 src/{voxip_kiosk => daynivo_kiosk}/helper_client.py | 0 src/{voxip_kiosk => daynivo_kiosk}/logutil.py | 0 src/{voxip_kiosk => daynivo_kiosk}/manager.py | 2 +- src/{voxip_kiosk => daynivo_kiosk}/netconfig.py | 0 src/{voxip_kiosk => daynivo_kiosk}/netinfo.py | 0 src/{voxip_kiosk => daynivo_kiosk}/paths.py | 0 src/{voxip_kiosk => daynivo_kiosk}/services.py | 0 src/{voxip_kiosk => daynivo_kiosk}/setupcode.py | 0 src/{voxip_kiosk => daynivo_kiosk}/sysinfo.py | 0 src/{voxip_kiosk => daynivo_kiosk}/updater.py | 0 src/{voxip_kiosk => daynivo_kiosk}/validation.py | 0 src/{voxip_kiosk => daynivo_kiosk}/web/__init__.py | 0 src/{voxip_kiosk => daynivo_kiosk}/web/auth.py | 0 src/{voxip_kiosk => daynivo_kiosk}/web/security.py | 0 .../web/static/app.css | 0 .../web/static/app.js | 0 .../web/static/favicon.png | Bin .../web/static/logo-mark.png | Bin .../web/templates/_ipv4_fields.html | 0 .../web/templates/_macros.html | 0 .../web/templates/base.html | 0 .../web/templates/dashboard.html | 0 .../web/templates/error.html | 0 .../web/templates/kiosk.html | 0 .../web/templates/login.html | 0 .../web/templates/logs.html | 0 .../web/templates/moved.html | 0 .../web/templates/network.html | 0 .../web/templates/password.html | 0 .../web/templates/setup.html | 0 .../web/templates/system.html | 0 src/{voxip_kiosk => daynivo_kiosk}/web/views.py | 0 tests/conftest.py | 10 +++++----- tests/test_agent.py | 6 +++--- tests/test_browser.py | 4 ++-- tests/test_config.py | 2 +- tests/test_healthcheck.py | 8 ++++---- tests/test_helper.py | 4 ++-- tests/test_netconfig.py | 4 ++-- tests/test_sysinfo.py | 2 +- tests/test_updater.py | 4 ++-- tests/test_validation.py | 2 +- tests/test_web.py | 10 +++++----- 62 files changed, 43 insertions(+), 43 deletions(-) rename src/{voxip_kiosk => daynivo_kiosk}/__init__.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/agent.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/browser.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/cdp.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/config.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/ctl.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/healthcheck.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/helper.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/helper_client.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/logutil.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/manager.py (98%) rename src/{voxip_kiosk => daynivo_kiosk}/netconfig.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/netinfo.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/paths.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/services.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/setupcode.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/sysinfo.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/updater.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/validation.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/__init__.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/auth.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/security.py (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/static/app.css (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/static/app.js (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/static/favicon.png (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/static/logo-mark.png (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/_ipv4_fields.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/_macros.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/base.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/dashboard.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/error.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/kiosk.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/login.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/logs.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/moved.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/network.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/password.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/setup.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/templates/system.html (100%) rename src/{voxip_kiosk => daynivo_kiosk}/web/views.py (100%) diff --git a/Makefile b/Makefile index 6abf32f..332ed87 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ dev: test -f $(DEV)/etc/config.json || cp config/config.default.json $(DEV)/etc/config.json cp VERSION $(DEV)/share/VERSION @echo "Setupcode: zie $(DEV)/etc/setup-code (wordt aangemaakt bij de start)" - $(DEV_ENV) $(PY) -m flask --app 'voxip_kiosk.web:create_app()' run --host 127.0.0.1 --port 8080 + $(DEV_ENV) $(PY) -m flask --app 'daynivo_kiosk.web:create_app()' run --host 127.0.0.1 --port 8080 image: ./image/build.sh diff --git a/bin/daynivo-kiosk-ctl b/bin/daynivo-kiosk-ctl index 41fd167..ecb2b6a 100755 --- a/bin/daynivo-kiosk-ctl +++ b/bin/daynivo-kiosk-ctl @@ -4,6 +4,6 @@ import sys sys.path.insert(0, "/usr/lib/voxip-kiosk/python") -from voxip_kiosk.ctl import main # noqa: E402 +from daynivo_kiosk.ctl import main # noqa: E402 sys.exit(main()) diff --git a/bin/voxip-kiosk-agent b/bin/voxip-kiosk-agent index f2adadd..856eaff 100755 --- a/bin/voxip-kiosk-agent +++ b/bin/voxip-kiosk-agent @@ -4,6 +4,6 @@ import sys sys.path.insert(0, "/usr/lib/voxip-kiosk/python") -from voxip_kiosk.agent import main # noqa: E402 +from daynivo_kiosk.agent import main # noqa: E402 sys.exit(main()) diff --git a/bin/voxip-kiosk-browser b/bin/voxip-kiosk-browser index 7abd68d..bb9858f 100755 --- a/bin/voxip-kiosk-browser +++ b/bin/voxip-kiosk-browser @@ -4,6 +4,6 @@ import sys sys.path.insert(0, "/usr/lib/voxip-kiosk/python") -from voxip_kiosk.browser import main # noqa: E402 +from daynivo_kiosk.browser import main # noqa: E402 sys.exit(main()) diff --git a/bin/voxip-kiosk-healthcheck b/bin/voxip-kiosk-healthcheck index b958a06..39e2fe5 100755 --- a/bin/voxip-kiosk-healthcheck +++ b/bin/voxip-kiosk-healthcheck @@ -4,6 +4,6 @@ import sys sys.path.insert(0, "/usr/lib/voxip-kiosk/python") -from voxip_kiosk.healthcheck import main # noqa: E402 +from daynivo_kiosk.healthcheck import main # noqa: E402 sys.exit(main()) diff --git a/bin/voxip-kiosk-helper b/bin/voxip-kiosk-helper index 235d40d..cf3c7ee 100755 --- a/bin/voxip-kiosk-helper +++ b/bin/voxip-kiosk-helper @@ -4,6 +4,6 @@ import sys sys.path.insert(0, "/usr/lib/voxip-kiosk/python") -from voxip_kiosk.helper import main # noqa: E402 +from daynivo_kiosk.helper import main # noqa: E402 sys.exit(main()) diff --git a/bin/voxip-kiosk-manager b/bin/voxip-kiosk-manager index 0d298c3..8417caf 100755 --- a/bin/voxip-kiosk-manager +++ b/bin/voxip-kiosk-manager @@ -4,6 +4,6 @@ import sys sys.path.insert(0, "/usr/lib/voxip-kiosk/python") -from voxip_kiosk.manager import main # noqa: E402 +from daynivo_kiosk.manager import main # noqa: E402 sys.exit(main()) diff --git a/bin/voxip-kiosk-updater b/bin/voxip-kiosk-updater index cb48cf4..38a68bf 100755 --- a/bin/voxip-kiosk-updater +++ b/bin/voxip-kiosk-updater @@ -4,6 +4,6 @@ import sys sys.path.insert(0, "/usr/lib/voxip-kiosk/python") -from voxip_kiosk.updater import main # noqa: E402 +from daynivo_kiosk.updater import main # noqa: E402 sys.exit(main()) diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index b2f30b6..9d8b5aa 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -180,7 +180,7 @@ daynivo-kiosk-os/ ├── update.sh update met backup van configuratie ├── uninstall.sh verwijderen (--purge voor alles) ├── bin/ dunne launchers → /usr/lib/voxip-kiosk/ -├── src/voxip_kiosk/ Python-package (alle logica) +├── src/daynivo_kiosk/ Python-package (alle logica) │ ├── config.py laden/valideren/atomair opslaan │ ├── validation.py gedeelde invoervalidatie │ ├── cdp.py Chrome DevTools Protocol-client diff --git a/image/build.sh b/image/build.sh index ea97e5c..52dddd6 100755 --- a/image/build.sh +++ b/image/build.sh @@ -72,7 +72,7 @@ VOXIP_DEFAULT_URL=$(printf %q "$VOXIP_DEFAULT_URL") VOXIP_DEVICE_NAME=$(printf %q "$VOXIP_DEVICE_NAME") EOF cat > "$PAYLOAD/BUILD-INFO" </dev/null 2>&1 && systemd-detect-virt --chroot --quiet; then @@ -126,7 +126,7 @@ say "Programmabestanden installeren" install -d -m 0755 "$LIB" "$SHARE" "$DOC" rm -rf "$LIB/python.new" install -d -m 0755 "$LIB/python.new" -tar -C "$SRC/src" --exclude='__pycache__' --exclude='*.pyc' -cf - voxip_kiosk | tar -C "$LIB/python.new" -xf - +tar -C "$SRC/src" --exclude='__pycache__' --exclude='*.pyc' -cf - daynivo_kiosk | tar -C "$LIB/python.new" -xf - chown -R root:root "$LIB/python.new" chmod -R u=rwX,go=rX "$LIB/python.new" python3 -m compileall -q "$LIB/python.new" >/dev/null @@ -172,7 +172,7 @@ PYRUN=(python3 -I -c) "${PYRUN[@]}" ' import json, os, sys sys.path.insert(0, "/usr/lib/voxip-kiosk/python") -from voxip_kiosk import config as c +from daynivo_kiosk import config as c path, default, url, name = sys.argv[1:5] updates = {} if url: updates["url"] = url @@ -220,7 +220,7 @@ for dir in /etc/chromium/policies/managed /etc/chromium-browser/policies/managed install -D -m 0644 "$SRC/config/chromium/voxip-kiosk.json" "$dir/voxip-kiosk.json" done -ADMIN_PORT="$(python3 -I -c 'import sys; sys.path.insert(0, "/usr/lib/voxip-kiosk/python"); from voxip_kiosk.config import load_config; print(load_config(__import__("pathlib").Path(sys.argv[1]))["admin_port"])' "$ETC/config.json")" +ADMIN_PORT="$(python3 -I -c 'import sys; sys.path.insert(0, "/usr/lib/voxip-kiosk/python"); from daynivo_kiosk.config import load_config; print(load_config(__import__("pathlib").Path(sys.argv[1]))["admin_port"])' "$ETC/config.json")" install -d -m 0755 /etc/avahi/services sed "s#8080#${ADMIN_PORT}#" "$SRC/config/avahi-voxip.service" > /etc/avahi/services/voxip-kiosk.service chmod 0644 /etc/avahi/services/voxip-kiosk.service diff --git a/src/voxip_kiosk/__init__.py b/src/daynivo_kiosk/__init__.py similarity index 100% rename from src/voxip_kiosk/__init__.py rename to src/daynivo_kiosk/__init__.py diff --git a/src/voxip_kiosk/agent.py b/src/daynivo_kiosk/agent.py similarity index 100% rename from src/voxip_kiosk/agent.py rename to src/daynivo_kiosk/agent.py diff --git a/src/voxip_kiosk/browser.py b/src/daynivo_kiosk/browser.py similarity index 100% rename from src/voxip_kiosk/browser.py rename to src/daynivo_kiosk/browser.py diff --git a/src/voxip_kiosk/cdp.py b/src/daynivo_kiosk/cdp.py similarity index 100% rename from src/voxip_kiosk/cdp.py rename to src/daynivo_kiosk/cdp.py diff --git a/src/voxip_kiosk/config.py b/src/daynivo_kiosk/config.py similarity index 100% rename from src/voxip_kiosk/config.py rename to src/daynivo_kiosk/config.py diff --git a/src/voxip_kiosk/ctl.py b/src/daynivo_kiosk/ctl.py similarity index 100% rename from src/voxip_kiosk/ctl.py rename to src/daynivo_kiosk/ctl.py diff --git a/src/voxip_kiosk/healthcheck.py b/src/daynivo_kiosk/healthcheck.py similarity index 100% rename from src/voxip_kiosk/healthcheck.py rename to src/daynivo_kiosk/healthcheck.py diff --git a/src/voxip_kiosk/helper.py b/src/daynivo_kiosk/helper.py similarity index 100% rename from src/voxip_kiosk/helper.py rename to src/daynivo_kiosk/helper.py diff --git a/src/voxip_kiosk/helper_client.py b/src/daynivo_kiosk/helper_client.py similarity index 100% rename from src/voxip_kiosk/helper_client.py rename to src/daynivo_kiosk/helper_client.py diff --git a/src/voxip_kiosk/logutil.py b/src/daynivo_kiosk/logutil.py similarity index 100% rename from src/voxip_kiosk/logutil.py rename to src/daynivo_kiosk/logutil.py diff --git a/src/voxip_kiosk/manager.py b/src/daynivo_kiosk/manager.py similarity index 98% rename from src/voxip_kiosk/manager.py rename to src/daynivo_kiosk/manager.py index 07cda51..e6a8c78 100644 --- a/src/voxip_kiosk/manager.py +++ b/src/daynivo_kiosk/manager.py @@ -55,7 +55,7 @@ def gunicorn_argv(paths: Paths, config: dict) -> list[str]: if config["admin_https"]: cert, key = ensure_certificate(paths) argv += ["--certfile", str(cert), "--keyfile", str(key)] - argv.append("voxip_kiosk.web:create_app()") + argv.append("daynivo_kiosk.web:create_app()") return argv diff --git a/src/voxip_kiosk/netconfig.py b/src/daynivo_kiosk/netconfig.py similarity index 100% rename from src/voxip_kiosk/netconfig.py rename to src/daynivo_kiosk/netconfig.py diff --git a/src/voxip_kiosk/netinfo.py b/src/daynivo_kiosk/netinfo.py similarity index 100% rename from src/voxip_kiosk/netinfo.py rename to src/daynivo_kiosk/netinfo.py diff --git a/src/voxip_kiosk/paths.py b/src/daynivo_kiosk/paths.py similarity index 100% rename from src/voxip_kiosk/paths.py rename to src/daynivo_kiosk/paths.py diff --git a/src/voxip_kiosk/services.py b/src/daynivo_kiosk/services.py similarity index 100% rename from src/voxip_kiosk/services.py rename to src/daynivo_kiosk/services.py diff --git a/src/voxip_kiosk/setupcode.py b/src/daynivo_kiosk/setupcode.py similarity index 100% rename from src/voxip_kiosk/setupcode.py rename to src/daynivo_kiosk/setupcode.py diff --git a/src/voxip_kiosk/sysinfo.py b/src/daynivo_kiosk/sysinfo.py similarity index 100% rename from src/voxip_kiosk/sysinfo.py rename to src/daynivo_kiosk/sysinfo.py diff --git a/src/voxip_kiosk/updater.py b/src/daynivo_kiosk/updater.py similarity index 100% rename from src/voxip_kiosk/updater.py rename to src/daynivo_kiosk/updater.py diff --git a/src/voxip_kiosk/validation.py b/src/daynivo_kiosk/validation.py similarity index 100% rename from src/voxip_kiosk/validation.py rename to src/daynivo_kiosk/validation.py diff --git a/src/voxip_kiosk/web/__init__.py b/src/daynivo_kiosk/web/__init__.py similarity index 100% rename from src/voxip_kiosk/web/__init__.py rename to src/daynivo_kiosk/web/__init__.py diff --git a/src/voxip_kiosk/web/auth.py b/src/daynivo_kiosk/web/auth.py similarity index 100% rename from src/voxip_kiosk/web/auth.py rename to src/daynivo_kiosk/web/auth.py diff --git a/src/voxip_kiosk/web/security.py b/src/daynivo_kiosk/web/security.py similarity index 100% rename from src/voxip_kiosk/web/security.py rename to src/daynivo_kiosk/web/security.py diff --git a/src/voxip_kiosk/web/static/app.css b/src/daynivo_kiosk/web/static/app.css similarity index 100% rename from src/voxip_kiosk/web/static/app.css rename to src/daynivo_kiosk/web/static/app.css diff --git a/src/voxip_kiosk/web/static/app.js b/src/daynivo_kiosk/web/static/app.js similarity index 100% rename from src/voxip_kiosk/web/static/app.js rename to src/daynivo_kiosk/web/static/app.js diff --git a/src/voxip_kiosk/web/static/favicon.png b/src/daynivo_kiosk/web/static/favicon.png similarity index 100% rename from src/voxip_kiosk/web/static/favicon.png rename to src/daynivo_kiosk/web/static/favicon.png diff --git a/src/voxip_kiosk/web/static/logo-mark.png b/src/daynivo_kiosk/web/static/logo-mark.png similarity index 100% rename from src/voxip_kiosk/web/static/logo-mark.png rename to src/daynivo_kiosk/web/static/logo-mark.png diff --git a/src/voxip_kiosk/web/templates/_ipv4_fields.html b/src/daynivo_kiosk/web/templates/_ipv4_fields.html similarity index 100% rename from src/voxip_kiosk/web/templates/_ipv4_fields.html rename to src/daynivo_kiosk/web/templates/_ipv4_fields.html diff --git a/src/voxip_kiosk/web/templates/_macros.html b/src/daynivo_kiosk/web/templates/_macros.html similarity index 100% rename from src/voxip_kiosk/web/templates/_macros.html rename to src/daynivo_kiosk/web/templates/_macros.html diff --git a/src/voxip_kiosk/web/templates/base.html b/src/daynivo_kiosk/web/templates/base.html similarity index 100% rename from src/voxip_kiosk/web/templates/base.html rename to src/daynivo_kiosk/web/templates/base.html diff --git a/src/voxip_kiosk/web/templates/dashboard.html b/src/daynivo_kiosk/web/templates/dashboard.html similarity index 100% rename from src/voxip_kiosk/web/templates/dashboard.html rename to src/daynivo_kiosk/web/templates/dashboard.html diff --git a/src/voxip_kiosk/web/templates/error.html b/src/daynivo_kiosk/web/templates/error.html similarity index 100% rename from src/voxip_kiosk/web/templates/error.html rename to src/daynivo_kiosk/web/templates/error.html diff --git a/src/voxip_kiosk/web/templates/kiosk.html b/src/daynivo_kiosk/web/templates/kiosk.html similarity index 100% rename from src/voxip_kiosk/web/templates/kiosk.html rename to src/daynivo_kiosk/web/templates/kiosk.html diff --git a/src/voxip_kiosk/web/templates/login.html b/src/daynivo_kiosk/web/templates/login.html similarity index 100% rename from src/voxip_kiosk/web/templates/login.html rename to src/daynivo_kiosk/web/templates/login.html diff --git a/src/voxip_kiosk/web/templates/logs.html b/src/daynivo_kiosk/web/templates/logs.html similarity index 100% rename from src/voxip_kiosk/web/templates/logs.html rename to src/daynivo_kiosk/web/templates/logs.html diff --git a/src/voxip_kiosk/web/templates/moved.html b/src/daynivo_kiosk/web/templates/moved.html similarity index 100% rename from src/voxip_kiosk/web/templates/moved.html rename to src/daynivo_kiosk/web/templates/moved.html diff --git a/src/voxip_kiosk/web/templates/network.html b/src/daynivo_kiosk/web/templates/network.html similarity index 100% rename from src/voxip_kiosk/web/templates/network.html rename to src/daynivo_kiosk/web/templates/network.html diff --git a/src/voxip_kiosk/web/templates/password.html b/src/daynivo_kiosk/web/templates/password.html similarity index 100% rename from src/voxip_kiosk/web/templates/password.html rename to src/daynivo_kiosk/web/templates/password.html diff --git a/src/voxip_kiosk/web/templates/setup.html b/src/daynivo_kiosk/web/templates/setup.html similarity index 100% rename from src/voxip_kiosk/web/templates/setup.html rename to src/daynivo_kiosk/web/templates/setup.html diff --git a/src/voxip_kiosk/web/templates/system.html b/src/daynivo_kiosk/web/templates/system.html similarity index 100% rename from src/voxip_kiosk/web/templates/system.html rename to src/daynivo_kiosk/web/templates/system.html diff --git a/src/voxip_kiosk/web/views.py b/src/daynivo_kiosk/web/views.py similarity index 100% rename from src/voxip_kiosk/web/views.py rename to src/daynivo_kiosk/web/views.py diff --git a/tests/conftest.py b/tests/conftest.py index 7b7de79..5b23459 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,7 +4,7 @@ from pathlib import Path import pytest -from voxip_kiosk.paths import Paths +from daynivo_kiosk.paths import Paths ROOT = Path(__file__).resolve().parents[1] @@ -39,7 +39,7 @@ class FakeHelper: self.responses = {} def call(self, verb, *args, payload=None, timeout=60): - from voxip_kiosk.helper_client import HelperError + from daynivo_kiosk.helper_client import HelperError self.calls.append((verb, args, payload)) if self.fail: @@ -53,7 +53,7 @@ class FakeCDP: self.fail = None def _do(self, name, *args): - from voxip_kiosk.cdp import CDPError + from daynivo_kiosk.cdp import CDPError self.calls.append((name, args)) if self.fail: @@ -80,7 +80,7 @@ def fake_cdp(): @pytest.fixture def quiet_system(monkeypatch): """Keep the web tests independent of the machine they run on.""" - from voxip_kiosk import netinfo, services, sysinfo + from daynivo_kiosk import netinfo, services, sysinfo monkeypatch.setattr(services, "summary", lambda: { "browser": {"unit": services.BROWSER_UNIT, "status": "ok", "label": "Actief", "restarts": "2", "since": ""}, @@ -106,7 +106,7 @@ def quiet_system(monkeypatch): @pytest.fixture def app(paths, fake_helper, fake_cdp, quiet_system): - from voxip_kiosk.web import create_app + from daynivo_kiosk.web import create_app application = create_app(paths, helper=fake_helper, cdp=fake_cdp) application.config["TESTING"] = True diff --git a/tests/test_agent.py b/tests/test_agent.py index 49e2070..d502d7a 100644 --- a/tests/test_agent.py +++ b/tests/test_agent.py @@ -2,9 +2,9 @@ import json import pytest -from voxip_kiosk.agent import Agent, HUNG_RELOAD_AFTER, HUNG_RESTART_AFTER -from voxip_kiosk.cdp import CDPError -from voxip_kiosk.config import save_config +from daynivo_kiosk.agent import Agent, HUNG_RELOAD_AFTER, HUNG_RESTART_AFTER +from daynivo_kiosk.cdp import CDPError +from daynivo_kiosk.config import save_config class Clock: diff --git a/tests/test_browser.py b/tests/test_browser.py index ebffac9..f7c2b24 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -2,8 +2,8 @@ import json from pathlib import Path from urllib.parse import parse_qs, urlsplit -from voxip_kiosk import browser as b -from voxip_kiosk.config import DEFAULTS +from daynivo_kiosk import browser as b +from daynivo_kiosk.config import DEFAULTS XRANDR = """Screen 0: minimum 320 x 200, current 1920 x 1080, maximum 7680 x 7680 HDMI-1 connected primary 1920x1080+0+0 (normal left inverted right x axis y axis) 531mm x 299mm diff --git a/tests/test_config.py b/tests/test_config.py index 49a8e55..b15f613 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -4,7 +4,7 @@ import stat import pytest -from voxip_kiosk import config as c +from daynivo_kiosk import config as c def test_default_file_matches_defaults(paths): diff --git a/tests/test_healthcheck.py b/tests/test_healthcheck.py index 7e38272..21adb66 100644 --- a/tests/test_healthcheck.py +++ b/tests/test_healthcheck.py @@ -1,9 +1,9 @@ import pytest -from voxip_kiosk import services -from voxip_kiosk.cdp import CDPError -from voxip_kiosk.config import save_config -from voxip_kiosk.healthcheck import CDP_FAILURES_BEFORE_RESTART, DISPLAY_RETRY_AFTER, HealthCheck +from daynivo_kiosk import services +from daynivo_kiosk.cdp import CDPError +from daynivo_kiosk.config import save_config +from daynivo_kiosk.healthcheck import CDP_FAILURES_BEFORE_RESTART, DISPLAY_RETRY_AFTER, HealthCheck class World: diff --git a/tests/test_helper.py b/tests/test_helper.py index bec87d5..2b67759 100644 --- a/tests/test_helper.py +++ b/tests/test_helper.py @@ -3,8 +3,8 @@ import subprocess import pytest -from voxip_kiosk import helper as h -from voxip_kiosk.config import load_config +from daynivo_kiosk import helper as h +from daynivo_kiosk.config import load_config class Recorder: diff --git a/tests/test_netconfig.py b/tests/test_netconfig.py index 257cb45..53e8466 100644 --- a/tests/test_netconfig.py +++ b/tests/test_netconfig.py @@ -1,7 +1,7 @@ import pytest -from voxip_kiosk import netconfig as n -from voxip_kiosk.validation import ValidationError +from daynivo_kiosk import netconfig as n +from daynivo_kiosk.validation import ValidationError def test_validate_static_ethernet(): diff --git a/tests/test_sysinfo.py b/tests/test_sysinfo.py index 1fc0b4c..8847ed7 100644 --- a/tests/test_sysinfo.py +++ b/tests/test_sysinfo.py @@ -1,4 +1,4 @@ -from voxip_kiosk import services, sysinfo +from daynivo_kiosk import services, sysinfo def test_parse_throttled(): diff --git a/tests/test_updater.py b/tests/test_updater.py index ba6faaf..4b80b58 100644 --- a/tests/test_updater.py +++ b/tests/test_updater.py @@ -6,8 +6,8 @@ import tarfile import pytest -from voxip_kiosk import updater as u -from voxip_kiosk.config import save_config +from daynivo_kiosk import updater as u +from daynivo_kiosk.config import save_config API = u.RELEASE_API BASE = "https://git.example.nl/rothman/daynivo-kiosk-os/releases/download" diff --git a/tests/test_validation.py b/tests/test_validation.py index 82b670d..88d1413 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -1,6 +1,6 @@ import pytest -from voxip_kiosk import validation as v +from daynivo_kiosk import validation as v @pytest.mark.parametrize("url", [ diff --git a/tests/test_web.py b/tests/test_web.py index afd5db0..54c36c7 100644 --- a/tests/test_web.py +++ b/tests/test_web.py @@ -2,8 +2,8 @@ import json import pytest -from voxip_kiosk.config import load_config -from voxip_kiosk.web import auth +from daynivo_kiosk.config import load_config +from daynivo_kiosk.web import auth from .conftest import PASSWORD, csrf_from, token @@ -113,7 +113,7 @@ def test_password_change_invalidates_other_sessions(app, logged_in): def test_idle_session_expires(app, logged_in, monkeypatch): - from voxip_kiosk.web import views + from daynivo_kiosk.web import views real = views.time.time monkeypatch.setattr(views.time, "time", lambda: real() + views.IDLE_TIMEOUT + 5) @@ -141,7 +141,7 @@ def test_public_clients_blocked(client, addr, allowed): def test_same_subnet_global_ipv6_allowed(): - from voxip_kiosk.web.security import client_allowed + from daynivo_kiosk.web.security import client_allowed assert client_allowed("2a02:a210:1:2::99", False, ["2a02:a210:1:2::5/64"]) assert not client_allowed("2a02:a210:9:9::99", False, ["2a02:a210:1:2::5/64"]) @@ -180,7 +180,7 @@ def test_pages_render(logged_in, path): def test_dashboard_masks_token(logged_in, paths): - from voxip_kiosk.config import save_config + from daynivo_kiosk.config import save_config save_config(paths.config_file, {"url": "https://portal.example.nl/display/hal?token=supergeheimtoken99"}) body = logged_in.get("/").get_data(as_text=True)