Talks
", + ) + ) + creator.add_item( + _MediaItem("videos/1/video.webm", "video/webm", b"\x1aE\xdf\xa3real") + ) + creator.add_item(_MediaItem("videos/2/video.webm", "video/webm", b"")) + creator.add_metadata("Title", "Test Talks") + creator.add_metadata("Language", "eng") + creator.add_metadata("Description", "media fixture") + assert os.path.exists(path) + return path diff --git a/playwright.config.mjs b/tests/playwright.config.mjs similarity index 66% rename from playwright.config.mjs rename to tests/playwright.config.mjs index c19dd370..636938c0 100644 --- a/playwright.config.mjs +++ b/tests/playwright.config.mjs @@ -1,14 +1,15 @@ import { defineConfig } from '@playwright/test'; export default defineConfig({ - testDir: './tests', - testMatch: ['visual_validation.spec.mjs', 'test_password_flow.mjs', 'test_interlang.mjs', 'screenshots.mjs', 'test_tabs.mjs', 'test_almanac_hero_clock.spec.mjs', 'test_login_navigation.spec.mjs'], + // This config lives in tests/; specs sit beside it, artifacts stay at repo root. + testDir: '.', + testMatch: ['visual_validation.spec.mjs', 'test_password_flow.mjs', 'test_interlang.mjs', 'screenshots.mjs', 'test_tabs.mjs', 'test_almanac_hero_clock.spec.mjs', 'test_login_navigation.spec.mjs', 'test_private_mode_login.spec.mjs', 'test_admin_private_library.spec.mjs', 'test_backup_hub.spec.mjs'], timeout: 60000, expect: { timeout: 10000 }, fullyParallel: false, // Run sequentially — some tests depend on server state retries: 0, reporter: [ - ['html', { open: 'always', outputFolder: 'test-results/html-report' }], + ['html', { open: 'always', outputFolder: '../test-results/html-report' }], ['list'], ], use: { @@ -19,5 +20,5 @@ export default defineConfig({ viewport: { width: 1440, height: 900 }, actionTimeout: 10000, }, - outputDir: 'test-results/artifacts', + outputDir: '../test-results/artifacts', }); diff --git a/tests/test_admin_private_library.spec.mjs b/tests/test_admin_private_library.spec.mjs new file mode 100644 index 00000000..2325152d --- /dev/null +++ b/tests/test_admin_private_library.spec.mjs @@ -0,0 +1,136 @@ +// SHIP BLOCKER (1.8.1 field): a signed-in ADMIN saw an EMPTY library in private +// (and limited) public-access mode — home "No knowledge sources found", Library +// "No ZIMs installed" — even though Settings listed every ZIM. The existing +// private-mode spec only proved the admin gate CLEARS; it never checked the +// admin's library was populated or that an article rendered. This spec closes +// both gaps. +// +// Root cause: the admin's credential is a password Bearer that only rides +// /manage/* calls. The DATA endpoints (/list, /search) are plain fetch() with no +// header, and the /w/ reader iframe is a browser navigation that CAN'T send one, +// so the server saw neither user nor admin and returned an empty library. Fix: +// an HttpOnly zimi_session admin cookie, minted at login, that rides both +// transports. +// +// Run against a FRESH passwordless server on plain http; beforeAll configures it: +// ZIM_DIR=./zims ZIMI_DATA_DIR=/tmp/zimi-admin ZIMI_MANAGE=1 \ +// python3 -m zimi serve --port 8878 +// BASE_URL=http://localhost:8878 npx playwright test --project=webkit \ +// --config=tests/playwright.config.mjs tests/test_admin_private_library.spec.mjs + +import { test, expect } from '@playwright/test'; + +const BASE = process.env.BASE_URL || 'http://localhost:8878'; +const ADMIN_PW = 'adminpw'; +const USER = 'kid'; +const USER_PW = 'crayons'; + +// Loopback is a private client: set the password + seed a limited user while the +// instance is still passwordless/open, then flip to private. +test.beforeAll(async ({ request }) => { + await request.post(`${BASE}/manage/set-password`, { + headers: { 'Content-Type': 'application/json' }, + data: { password: ADMIN_PW }, + }); + const auth = { 'Content-Type': 'application/json', Authorization: 'Bearer ' + ADMIN_PW }; + await request.post(`${BASE}/manage/users`, { + headers: auth, + // A user whose allowlist is EMPTY — so if isolation ever broke, they'd see + // the admin's ZIMs and the test would catch it. + data: { action: 'create', name: USER, password: USER_PW, allowlist: [] }, + }); + await request.post(`${BASE}/manage/public-access`, { + headers: auth, + data: { mode: 'private' }, + }); +}); + +// The client's live view through the (SW-controlled) fetch path — the security +// contract that actually matters. Also pulls the /list payload so we can assert +// the admin's library is POPULATED, not just 200-but-empty. +async function serverView(page) { + return page.evaluate(async () => { + const who = await (await fetch('/whoami', { credentials: 'same-origin' })).json(); + const listRes = await fetch('/list?layout=1', { credentials: 'same-origin' }); + let zimCount = 0; + if (listRes.status === 200) { + const data = await listRes.json(); + const zims = Array.isArray(data) ? data : data.zims || []; + zimCount = zims.length; + } + return { role: who.role, listStatus: listRes.status, zimCount }; + }); +} + +async function adminSignIn(page) { + await page.goto(BASE); + await page.waitForFunction(() => window._loginRequired === true, { timeout: 8000 }); + await page.fill('#pw-username', 'admin'); + await page.fill('#pw-input', ADMIN_PW); + await page.evaluate(() => submitPw()); + // submitPw reloads on a gate sign-in; wait until the gate is gone. + await expect.poll(() => page.evaluate(() => window._loginRequired), { timeout: 8000 }).toBeFalsy(); + await page.waitForTimeout(400); +} + +test('private-mode admin sees a POPULATED library (not the empty state)', async ({ page }) => { + await adminSignIn(page); + // The authoritative contract: the admin's DATA endpoints return the WHOLE + // library, not the empty/limited set the bug produced. Read it through the + // client's own (SW-controlled) fetch path — a plain fetch with no Auth header, + // exactly like the app's /list call. This is stronger than scraping the home + // grid (whose exact DOM varies with how many ZIMs the fixture installs). + const view = await serverView(page); + expect(view.role).toBe('admin'); + expect(view.listStatus).toBe(200); + expect(view.zimCount, 'admin /list must return the installed ZIMs').toBeGreaterThan(0); + // And the login gate must be gone — the admin is inside the app, not stuck at + // the sign-in overlay or a blank library. + expect(await page.evaluate(() => window._loginRequired)).toBeFalsy(); + await expect(page.locator('#pw-overlay.open')).toHaveCount(0); +}); + +test('private-mode admin can OPEN an article — the /w/ iframe renders, not blank', async ({ page }) => { + await adminSignIn(page); + // The reader iframe is a browser navigation carrying only the cookie. Load a + // real /w/ content URL in an iframe and confirm the server served it (200) AND + // the frame has a non-empty document — the exact thing that was blank before. + const result = await page.evaluate(async () => { + const listRes = await fetch('/list?layout=1', { credentials: 'same-origin' }); + const data = await listRes.json(); + const zims = Array.isArray(data) ? data : data.zims || []; + const z = zims[0]; + const url = '/w/' + z.name + '/' + (z.main_path || 'index'); + const status = (await fetch(url, { credentials: 'same-origin' })).status; + // Now the true iframe transport: no Authorization header possible. + const bodyLen = await new Promise((resolve) => { + const f = document.createElement('iframe'); + f.style.display = 'none'; + f.onload = () => { + try { + resolve((f.contentDocument.body.innerText || '').length); + } catch (e) { + resolve(-1); + } + f.remove(); + }; + f.src = url; + document.body.appendChild(f); + }); + return { status, bodyLen }; + }); + expect(result.status, '/w/ content must serve to a cookie-only request').toBe(200); + expect(result.bodyLen, 'the reader iframe must render a non-empty article').toBeGreaterThan(0); +}); + +test('admin logout in private mode returns to the gate and cuts off access', async ({ page }) => { + await adminSignIn(page); + expect((await serverView(page)).role).toBe('admin'); + // manageLogout POSTs /logout (dropping the admin cookie session) then reloads. + await page.evaluate(() => manageLogout()); + await page.waitForFunction(() => window._loginRequired === true, { timeout: 8000 }); + await expect(page.locator('#pw-overlay.open')).toBeVisible(); + const view = await serverView(page); + expect(view.role).toBe('anonymous'); + expect(view.listStatus).toBe(401); +}); diff --git a/tests/test_almanac_hero_clock.spec.mjs b/tests/test_almanac_hero_clock.spec.mjs index 2ee2eb95..78e37883 100644 --- a/tests/test_almanac_hero_clock.spec.mjs +++ b/tests/test_almanac_hero_clock.spec.mjs @@ -10,7 +10,7 @@ // Start a server first (no ZIMs needed): // ZIM_DIR=/tmp/zimi-empty python3 -m zimi serve --port 8877 // Run: -// BASE_URL=http://localhost:8877 npx playwright test tests/test_almanac_hero_clock.spec.mjs +// BASE_URL=http://localhost:8877 npx playwright test --config=tests/playwright.config.mjs tests/test_almanac_hero_clock.spec.mjs import { test, expect } from '@playwright/test'; diff --git a/tests/test_backup.py b/tests/test_backup.py new file mode 100644 index 00000000..2d414ddc --- /dev/null +++ b/tests/test_backup.py @@ -0,0 +1,566 @@ +"""Handler-level tests for the backup & export hub (v1.8.1, schema v2). + +Covers the server half of a backup bundle: `_build_backup_bundle` (device + +admin-only server scope), and the `/manage/backup` POST importer — a two-step +preview→apply that MERGES by default (union by identity, incoming wins) with an +overwrite escape hatch. Per-browser state (bookmarks/history/preferences) is +client-only and never reaches the server, so it isn't exercised here. +""" + +import os +import sys +from urllib.parse import urlparse + +import pytest + +sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +import zimi.manage as manage # noqa: E402 +import zimi.server as server # noqa: E402 + + +class _Handler: + def __init__(self, private=True, auth=None): + self.status = None + self.body = None + self._private = private + self.headers = {} + if auth is not None: + self.headers["Authorization"] = auth + + def _json(self, status, body): + self.status = status + self.body = body + return None + + def _is_private_client(self): + return self._private + + +def _setup(monkeypatch, tmp_path, *, password_hash="", private=True): + data_dir = tmp_path / "data" + data_dir.mkdir() + monkeypatch.setattr(server, "ZIMI_DATA_DIR", str(data_dir)) + monkeypatch.setattr(server, "ZIMI_MANAGE", True) + monkeypatch.setattr(manage, "_get_manage_password_hash", lambda: password_hash) + monkeypatch.setattr(manage, "_get_api_token", lambda: "") + # No ZIMs on disk in these tests — keep the library list empty + fast. + monkeypatch.setattr(server, "list_zims", lambda: []) + monkeypatch.setattr(server, "get_zim_files", lambda: {}) + return data_dir + + +def _post(handler, body): + manage.handle_manage_post(handler, urlparse("/manage/backup"), body) + return handler.status, handler.body + + +def _apply(handler, body): + """POST an apply (the two-step's confirm leg).""" + b = dict(body) + b["action"] = "apply" + return _post(handler, b) + + +# ── Export shape ── + + +def test_build_bundle_shape(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + bundle = manage._build_backup_bundle() + assert bundle["schema"] == "zimi-backup" + assert bundle["schema_version"] == manage._BACKUP_SCHEMA_VERSION + assert bundle["library"] == [] + assert bundle["collections"] == {"version": 1, "favorites": [], "collections": {}} + assert bundle["library_layout"] == { + "overrides": {}, + "section_order": [], + "sections": [], + } + assert "created" in bundle and "zimi_version" in bundle + + +def test_build_bundle_lists_installed_library(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + monkeypatch.setattr( + server, + "list_zims", + lambda: [ + { + "name": "wikipedia_en", + "file": "wikipedia_en_2026-01.zim", + "date": "2026-01", + "language": "eng", + "article_count": 100, + "size_bytes": 999, + "title": "Wikipedia", + } + ], + ) + lib = manage._build_backup_bundle()["library"] + assert lib == [ + { + "name": "wikipedia_en", + "file": "wikipedia_en_2026-01.zim", + "date": "2026-01", + "language": "eng", + "article_count": 100, + "size_bytes": 999, + "title": "Wikipedia", + } + ] + + +# ── Import round-trips (apply leg) ── + + +def test_import_restores_collections(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + bundle = { + "schema": "zimi-backup", + "collections": { + "version": 1, + "favorites": ["wikipedia_en"], + "collections": {"survival": {"label": "Survival", "zims": ["a", "b"]}}, + }, + } + status, body = _apply(_Handler(), bundle) + assert status == 200 + assert "collections" in body["applied"] + saved = server._load_collections() + assert saved["favorites"] == ["wikipedia_en"] + assert saved["collections"]["survival"]["zims"] == ["a", "b"] + + +def test_import_restores_layout(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + bundle = { + "schema": "zimi-backup", + "library_layout": { + "overrides": {"wikipedia_en": "Books"}, + "section_order": ["cat:Books"], + }, + } + status, body = _apply(_Handler(), bundle) + assert status == 200 + assert "library_layout" in body["applied"] + layout = server._load_library_layout() + assert layout["overrides"] == {"wikipedia_en": "Books"} + assert layout["section_order"] == ["cat:Books"] + + +def test_import_partial_bundle_applies_only_present(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + status, body = _apply( + _Handler(), + {"schema": "zimi-backup", "library_layout": {"overrides": {"a": "Books"}}}, + ) + assert status == 200 + assert body["applied"] == ["library_layout"] + + +def test_import_empty_bundle_ok_noop(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + status, body = _apply(_Handler(), {"schema": "zimi-backup"}) + assert status == 200 + assert body["applied"] == [] + + +# ── Merge rules: union / dedupe / newest-wins ── + + +def test_favorites_merge_union_and_dedupe(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + server._save_collections({"version": 1, "favorites": ["old"], "collections": {}}) + status, body = _apply( + _Handler(), + { + "schema": "zimi-backup", + # "old" is a duplicate; "new" is added. + "collections": { + "version": 1, + "favorites": ["old", "new"], + "collections": {}, + }, + }, + ) + assert status == 200 + # Union preserves the existing entry, appends the new one, drops the dupe. + assert server._load_collections()["favorites"] == ["old", "new"] + assert body["preview"]["collections"]["fav_dupes"] == 1 + + +def test_collections_newest_wins_on_conflict(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + server._save_collections( + { + "version": 1, + "favorites": [], + "collections": {"c": {"label": "current", "updated": 100}}, + } + ) + # Incoming carries a newer timestamp → it wins. + _apply( + _Handler(), + { + "schema": "zimi-backup", + "collections": { + "version": 1, + "favorites": [], + "collections": {"c": {"label": "incoming", "updated": 200}}, + }, + }, + ) + assert server._load_collections()["collections"]["c"]["label"] == "incoming" + + +def test_collections_older_incoming_loses(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + server._save_collections( + { + "version": 1, + "favorites": [], + "collections": {"c": {"label": "current", "updated": 300}}, + } + ) + _apply( + _Handler(), + { + "schema": "zimi-backup", + "collections": { + "version": 1, + "favorites": [], + "collections": {"c": {"label": "incoming", "updated": 200}}, + }, + }, + ) + assert server._load_collections()["collections"]["c"]["label"] == "current" + + +def test_layout_overrides_merge_not_replace(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + server._save_library_layout({"overrides": {"a": "Books"}, "section_order": []}) + _apply( + _Handler(), + {"schema": "zimi-backup", "library_layout": {"overrides": {"b": "Docs"}}}, + ) + # Merge keeps the existing override AND adds the incoming one. + assert server._load_library_layout()["overrides"] == {"a": "Books", "b": "Docs"} + + +def test_overwrite_replaces_favorites(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + server._save_collections({"version": 1, "favorites": ["old"], "collections": {}}) + _post( + _Handler(), + { + "action": "apply", + "overwrite": True, + "schema": "zimi-backup", + "collections": {"version": 1, "favorites": ["new"], "collections": {}}, + }, + ) + assert server._load_collections()["favorites"] == ["new"] + + +def test_import_favorites_capped(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + _apply( + _Handler(), + { + "schema": "zimi-backup", + "collections": { + "version": 1, + "favorites": [str(i) for i in range(200)], + "collections": {}, + }, + }, + ) + assert len(server._load_collections()["favorites"]) == 100 + + +# ── Preview-before-apply contract ── + + +def test_preview_is_default_and_applies_nothing(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + server._save_collections({"version": 1, "favorites": ["keep"], "collections": {}}) + status, body = _post( # no action → preview + _Handler(), + { + "schema": "zimi-backup", + "collections": {"version": 1, "favorites": ["new"], "collections": {}}, + }, + ) + assert status == 200 + assert body["status"] == "preview" + assert body["preview"]["collections"]["fav_added"] == 1 + # Nothing was written — the existing favorites are untouched. + assert server._load_collections()["favorites"] == ["keep"] + + +def test_preview_reports_missing_zims(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + monkeypatch.setattr(server, "get_zim_files", lambda: {"have_it": object()}) + status, body = _post( + _Handler(), + { + "schema": "zimi-backup", + "library": [ + {"name": "have_it"}, + {"name": "missing_a"}, + {"name": "missing_b"}, + ], + }, + ) + assert status == 200 + assert body["preview"]["missing_zims"] == 2 + + +# ── Validation ── + + +def test_import_rejects_foreign_schema(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + status, body = _apply(_Handler(), {"schema": "something-else"}) + assert status == 400 + + +def test_import_rejects_bad_collections(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + status, _ = _apply( + _Handler(), {"schema": "zimi-backup", "collections": {"favorites": "nope"}} + ) + assert status == 400 + + +def test_import_rejects_bad_layout(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + status, _ = _apply( + _Handler(), + {"schema": "zimi-backup", "library_layout": {"section_order": ["bogus:x"]}}, + ) + assert status == 400 + + +# ── Auth matrix (mirrors library-layout) ── + + +def test_import_passwordless_public_locked(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path, private=False) + status, body = _apply(_Handler(private=False), {"schema": "zimi-backup"}) + assert status == 403 + assert body["error"] == "public_locked" + + +# ── Full-server scope: build + admin gate ── + + +def _seed_server_state(monkeypatch, tmp_path): + """Give the instance some server-owned state so a server bundle is non-empty.""" + from zimi import library as _lib + from zimi import p2p + from zimi import users as _users + + monkeypatch.setattr( + server, + "_DOWNLOAD_SCHEDULE_CONFIG", + str(tmp_path / "data" / "download_schedule.json"), + raising=False, + ) + p2p.set_prefs_path(str(tmp_path / "data" / "bt_prefs.json")) + _users._save_users({"alice": {"name": "alice", "pw": "HASH", "role": "user"}}) + _users.set_public_access("open") + _lib._save_download_schedule(True, "02:00", "05:00", True, 20) + p2p.set_pref("seed", False) + _lib.record_seed("wikipedia_en_2026.zim") + + +def test_build_server_bundle_includes_hashes_and_policy(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + _seed_server_state(monkeypatch, tmp_path) + bundle = manage._build_backup_bundle(scope="server") + assert bundle["scope"] == "server" + # users.json rides along WITH hashes — it's the admin's own backup. + assert bundle["users"]["alice"]["pw"] == "HASH" + assert bundle["public_access"]["mode"] == "open" + assert bundle["schedule"]["upload_restrict"] is True + assert bundle["bt_prefs"]["seed"] is False + assert "wikipedia_en_2026.zim" in bundle["seed_intents"] + # v3 additions — the rest of a full-restore's coverage. + assert isinstance(bundle["hot_zims"], list) + assert set(bundle["auto_update"]) == {"enabled", "frequency"} + assert isinstance(bundle["history"], list) + assert isinstance(bundle["user_data"], dict) + + +def test_device_bundle_has_no_server_state(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + _seed_server_state(monkeypatch, tmp_path) + bundle = manage._build_backup_bundle() # device + assert bundle["scope"] == "device" + for k in ( + "users", + "public_access", + "schedule", + "bt_prefs", + "seed_intents", + "hot_zims", + "auto_update", + "history", + "user_data", + ): + assert k not in bundle + + +def test_server_export_requires_admin(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + monkeypatch.setattr(manage, "admin_kind", lambda h: None) # not an admin + h = _Handler() + manage.handle_manage_get( + h, urlparse("/manage/backup?scope=server"), {"scope": ["server"]} + ) + assert h.status == 403 + + +def test_server_restore_refuses_non_admin(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + _seed_server_state(monkeypatch, tmp_path) + monkeypatch.setattr(manage, "admin_kind", lambda h: None) + # A server-scope bundle from a non-admin session is refused in BOTH legs. + for action in ("preview", "apply"): + status, body = _post( + _Handler(), + { + "schema": "zimi-backup", + "scope": "server", + "action": action, + "users": {"mallory": {"name": "mallory", "pw": "X", "role": "admin"}}, + }, + ) + assert status == 403 + # And the malicious user was never written. + from zimi import users as _users + + assert "mallory" not in _users._load_users() + + +def test_server_restore_merges_users_for_admin(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + _seed_server_state(monkeypatch, tmp_path) # existing user "alice" + monkeypatch.setattr(manage, "admin_kind", lambda h: "primary") + status, body = _apply( + _Handler(), + { + "schema": "zimi-backup", + "scope": "server", + "users": {"bob": {"name": "bob", "pw": "BHASH", "role": "user"}}, + }, + ) + assert status == 200 + assert "users" in body["applied"] + from zimi import users as _users + + merged = _users._load_users() + assert "alice" in merged and "bob" in merged # union, not replace + + +def test_device_bundle_ignores_stray_server_keys(monkeypatch, tmp_path): + """A device bundle carrying server keys must NOT touch server state — the + scope, not the presence of keys, gates the server path.""" + _setup(monkeypatch, tmp_path) + _seed_server_state(monkeypatch, tmp_path) + monkeypatch.setattr(manage, "admin_kind", lambda h: "primary") + _apply( + _Handler(), + { + "schema": "zimi-backup", # no scope → device + "users": {"mallory": {"name": "mallory", "pw": "X", "role": "admin"}}, + }, + ) + from zimi import users as _users + + assert "mallory" not in _users._load_users() + + +# ── v3 server state: hot list, auto-update, history, per-user data round-trip ── + + +def test_server_restore_roundtrips_v3_fields(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + _seed_server_state(monkeypatch, tmp_path) + monkeypatch.setattr(manage, "admin_kind", lambda h: "primary") + monkeypatch.setattr( + server, + "_AUTO_UPDATE_CONFIG", + str(tmp_path / "data" / "auto_update.json"), + raising=False, + ) + monkeypatch.delenv("ZIMI_HOT_ZIMS", raising=False) + monkeypatch.delenv("ZIMI_AUTO_UPDATE", raising=False) + monkeypatch.setattr(server, "_auto_update_env_locked", False, raising=False) + from zimi import library as _lib + + status, body = _apply( + _Handler(), + { + "schema": "zimi-backup", + "scope": "server", + "hot_zims": ["wikipedia_en", "gutenberg"], + "auto_update": {"enabled": True, "frequency": "daily"}, + "history": [{"event": "download", "name": "x"}], + "user_data": { + "kid": {"version": 1, "bookmarks": [{"zim": "a", "path": "b"}]} + }, + }, + ) + assert status == 200 + for k in ("hot_zims", "auto_update", "history", "user_data"): + assert k in body["applied"] + assert server.get_hot_zims() == ["wikipedia_en", "gutenberg"] + assert _lib._load_auto_update_config() == (True, "daily") + assert server._load_history() == [{"event": "download", "name": "x"}] + from zimi import users as _users + + assert _users.load_user_data("kid")["bookmarks"] == [{"zim": "a", "path": "b"}] + + +def test_history_restore_preserves_running_log_without_overwrite(monkeypatch, tmp_path): + """Merge-mode restore into a NON-empty history is a no-op (a live server's + real event stream is never duplicated/reordered); overwrite replaces it.""" + _setup(monkeypatch, tmp_path) + monkeypatch.setattr(manage, "admin_kind", lambda h: "primary") + server._save_history([{"event": "existing"}]) + _apply( + _Handler(), + { + "schema": "zimi-backup", + "scope": "server", + "history": [{"event": "incoming"}], + }, + ) + assert server._load_history() == [{"event": "existing"}] # unchanged + _post( + _Handler(), + { + "action": "apply", + "overwrite": True, + "schema": "zimi-backup", + "scope": "server", + "history": [{"event": "incoming"}], + }, + ) + assert server._load_history() == [{"event": "incoming"}] + + +def test_hot_zims_env_lock_wins_over_restore(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + monkeypatch.setattr(manage, "admin_kind", lambda h: "primary") + monkeypatch.setenv("ZIMI_HOT_ZIMS", "locked_zim") + status, body = _apply( + _Handler(), + {"schema": "zimi-backup", "scope": "server", "hot_zims": ["from_backup"]}, + ) + assert status == 200 + assert "hot_zims" not in body["applied"] # env-locked → skipped + assert server.get_hot_zims() == ["locked_zim"] diff --git a/tests/test_backup_hub.spec.mjs b/tests/test_backup_hub.spec.mjs new file mode 100644 index 00000000..2f297284 --- /dev/null +++ b/tests/test_backup_hub.spec.mjs @@ -0,0 +1,109 @@ +// Backup hub (v1.8.1): the two clearly-separated cards — "My data" and "Server +// backup" — each with their own Export + Import, scope-validated imports, and a +// signed-in user's Save-to / Restore-from-server round-trip. +// +// Start a password-protected server with a scratch data dir first: +// ZIM_DIR=./zims ZIMI_DATA_DIR=/tmp/zimi-backup-hub ZIMI_MANAGE=1 \ +// python3 -m zimi serve --port 8877 +// Run: +// BASE_URL=http://localhost:8877 npx playwright test \ +// --config=tests/playwright.config.mjs tests/test_backup_hub.spec.mjs + +import { test, expect } from '@playwright/test'; + +const BASE = process.env.BASE_URL || 'http://localhost:8893'; +const PW = 'hunter2'; + +test.beforeAll(async ({ request }) => { + // Loopback client is private, so it may set the admin password. + await request.post(`${BASE}/manage/set-password`, { + headers: { 'Content-Type': 'application/json' }, + data: { password: PW }, + }); + // A named user for the signed-in My-data flow. + await request.post(`${BASE}/manage/users`, { + headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${PW}` }, + data: { action: 'create', name: 'kiddo', password: 'kidpw', role: 'user' }, + }); +}); + +async function freshAdminServerPane(page) { + await page.goto(BASE); + await page.evaluate(() => { localStorage.clear(); sessionStorage.clear(); }); + await page.goto(BASE); + await page.waitForFunction(() => typeof enterManage === 'function'); + // Seed the admin token + enable manage directly so the test doesn't race the + // boot probe; then enter manage and land on the Server pane. + await page.evaluate((pw) => { manageEnabled = true; _manageToken = pw; _manageUser = 'admin'; enterManage(); }, PW); + await expect.poll(() => page.evaluate(() => mode)).toBe('manage'); + // renderManage fetches /manage/status then lands on the Library pane; its + // async switchMs('library') can clobber a one-shot switch, so re-apply + // switchMs('server') each poll until the Server pane (and its cards) sticks. + await expect.poll(() => + page.evaluate(() => { switchMs('server'); return !!document.querySelector('#ms-server-file'); }) + ).toBe(true); +} + +test('admin Server pane renders both cards with separate controls', async ({ page }) => { + await freshAdminServerPane(page); + // My-data card controls. + await expect(page.locator('#ms-mydata-file')).toHaveCount(1); + await expect(page.locator('#ms-mydata-overwrite')).toHaveCount(1); + await expect(page.locator('#ms-mydata-status')).toHaveCount(1); + // Server-backup card controls — distinct ids, its own import/preview slot. + await expect(page.locator('#ms-server-file')).toHaveCount(1); + await expect(page.locator('#ms-server-overwrite')).toHaveCount(1); + await expect(page.locator('#ms-server-import')).toHaveCount(1); + // Admin (no named-user session) → the My-data card is file-only, no + // Save/Restore-to-server buttons. + await expect(page.locator('button', { hasText: 'Save to server' })).toHaveCount(0); +}); + +test('scope-mismatch imports fail clearly, pointing at the right card', async ({ page }) => { + await freshAdminServerPane(page); + // A My-data bundle dropped on the Server-backup card. + await page.evaluate(() => + _previewServerBackup(JSON.stringify({ schema: 'zimi-backup', scope: 'my-data', bookmarks: [] })) + ); + await expect.poll(() => + page.evaluate(() => document.getElementById('ms-server-status').textContent) + ).toContain('My data card'); + // A server bundle dropped on the My-data card. + await page.evaluate(() => + _applyMyDataFile(JSON.stringify({ schema: 'zimi-backup', scope: 'server' })) + ); + await expect.poll(() => + page.evaluate(() => document.getElementById('ms-mydata-status').textContent) + ).toContain('Server backup card'); +}); + +test('signed-in user saves then restores My data from their server account', async ({ page }) => { + await page.goto(BASE); + await page.evaluate(() => { localStorage.clear(); sessionStorage.clear(); }); + await page.goto(BASE); + await page.waitForFunction(() => typeof openLoginModal === 'function'); + await page.evaluate(() => openLoginModal()); + await page.waitForSelector('#pw-overlay.open'); + await page.fill('#pw-username', 'kiddo'); + await page.fill('#pw-input', 'kidpw'); + await page.evaluate(() => submitPw()); + await expect.poll(() => page.evaluate(() => !!(_userSession && _userSession.name))).toBe(true); + // The user's account view carries their My-data card (with server buttons). + await expect.poll(() => + page.evaluate(() => { manageEnabled = true; enterManage(); return !!document.querySelector('#ms-mydata-file'); }) + ).toBe(true); + await expect(page.locator('button', { hasText: 'Save to server' })).toHaveCount(1); + // Seed a bookmark, save to server, wipe locally, restore — it comes back. + await page.evaluate(() => + _setStorageJSON(SK.BOOKMARKS, [{ zim: 'w', path: '/a', timestamp: 1 }]) + ); + await page.evaluate(() => saveMyDataToServer()); + await expect.poll(() => + page.evaluate(() => document.getElementById('ms-mydata-status').textContent) + ).toContain('account'); + await page.evaluate(() => _setStorageJSON(SK.BOOKMARKS, [])); + await page.evaluate(() => restoreMyDataFromServer()); + await expect.poll(() => + page.evaluate(() => _getStorageJSON(SK.BOOKMARKS, []).length) + ).toBe(1); +}); diff --git a/tests/test_define_touch_position.cjs b/tests/test_define_touch_position.cjs new file mode 100644 index 00000000..322e50cc --- /dev/null +++ b/tests/test_define_touch_position.cjs @@ -0,0 +1,133 @@ +// DOM-free regression test for the Define-chip touch/iOS positioning logic. +// +// Guards three properties added for the iOS system-callout collision fix: +// 1. Touch devices get a bigger clearance below the selection than desktop +// (_defineRangeRect's margin), so the chip doesn't sit under the OS +// callout's tail even though both default to "below the selection." +// 2. Touch devices flip the chip ABOVE the selection when it's near the top +// of the viewport — that's exactly where iOS itself has no room above +// and flips its own callout below, so mirroring keeps them apart. +// 3. Desktop (non-touch) positioning is completely unaffected: no near-top +// flip, margin stays at the original 4px. +// +// Pure-helper approach, same pattern as test_reader_font.cjs: extract the +// constants + functions straight from app.js by source markers, eval them in +// a sandboxed vm context with a controllable matchMedia + a fake popover +// element, and assert on the computed style.left/top. +// +// Run: node tests/test_define_touch_position.cjs (exit 0 = pass, non-zero = fail) + +const fs = require('fs'); +const path = require('path'); +const vm = require('vm'); + +const APP_JS = path.join(__dirname, '..', 'zimi', 'static', 'app.js'); +const src = fs.readFileSync(APP_JS, 'utf8'); + +function extract(re, label) { + const m = src.match(re); + if (!m) { throw new Error('could not extract ' + label + ' from app.js'); } + return m[0]; +} + +const cDelay = extract(/var _DEFINE_TOUCH_DELAY = \d+;.*$/m, '_DEFINE_TOUCH_DELAY'); +const cMargin = extract(/var _DEFINE_TOUCH_MARGIN = \d+;.*$/m, '_DEFINE_TOUCH_MARGIN'); +const cNearTop = extract(/var _DEFINE_NEAR_TOP_PX = \d+;.*$/m, '_DEFINE_NEAR_TOP_PX'); +const fIsTouch = extract(/function _defineIsTouch\(\)\s*\{[\s\S]*?\n\}/, '_defineIsTouch'); +const fRangeRect = extract(/function _defineRangeRect\(frame, range\)\s*\{[\s\S]*?\n\}/, '_defineRangeRect'); +const fPosition = extract(/function _definePosition\(rect\)\s*\{[\s\S]*?\n\}/, '_definePosition'); + +// Controllable "is this a touch/coarse-pointer device" flag, flipped per test. +let touchMode = false; + +function makeFrame(top, left) { + return { getBoundingClientRect: () => ({ top: top, left: left, bottom: top, right: left }) }; +} +function makeRange(top, bottom, left, right) { + return { getBoundingClientRect: () => ({ top: top, bottom: bottom, left: left, right: right }) }; +} +function makePopover(w, h) { + const style = {}; + return { + classList: { add: () => {} }, + offsetWidth: w, offsetHeight: h, + style, + }; +} + +const sandbox = { + window: { + matchMedia: () => ({ matches: touchMode }), + innerWidth: 390, + innerHeight: 800, + }, +}; +vm.createContext(sandbox); +vm.runInContext([cDelay, cMargin, cNearTop, fIsTouch, fRangeRect, fPosition].join('\n'), sandbox); + +let failures = 0; +function check(name, cond) { + if (cond) { console.log(' ok - ' + name); } + else { console.log(' FAIL - ' + name); failures++; } +} + +// 1. Desktop: unchanged 4px margin below the selection. +{ + touchMode = false; + const frame = makeFrame(100, 20); + const range = makeRange(150, 170, 30, 60); // selection well below viewport top + const rect = vm.runInContext('_defineRangeRect(frame, range)', Object.assign(sandbox, { frame, range })); + check('desktop margin is 4px below the selection bottom', rect.y === 170 + 100 + 4); +} + +// 2. Touch: bigger clearance below the selection (collision margin). +{ + touchMode = true; + const frame = makeFrame(100, 20); + const range = makeRange(150, 170, 30, 60); + const rect = vm.runInContext('_defineRangeRect(frame, range)', Object.assign(sandbox, { frame, range })); + const margin = vm.runInContext('_DEFINE_TOUCH_MARGIN', sandbox); + check('touch margin exceeds desktop margin', margin > 4); + check('touch rect.y uses the touch margin', rect.y === 170 + 100 + margin); +} + +// 3. Desktop positioning: no near-top flip even when the selection is at the +// very top of the viewport — only touch devices mirror the OS callout flip. +{ + touchMode = false; + const popover = makePopover(200, 60); + sandbox.__pop = popover; + vm.runInContext('_definePopover = __pop', sandbox); + const rect = { x: 20, y: 40, top: 10 }; // near top; would trigger the touch flip + vm.runInContext('_definePosition(__rect)', Object.assign(sandbox, { __rect: rect })); + check('desktop stays below near the top (no flip)', popover.style.top === '40px'); +} + +// 4. Touch positioning away from the top: stays below, per the default. +{ + touchMode = true; + const popover = makePopover(200, 60); + sandbox.__pop = popover; + vm.runInContext('_definePopover = __pop', sandbox); + const rect = { x: 20, y: 400, top: 380 }; // nowhere near the viewport top + vm.runInContext('_definePosition(__rect)', Object.assign(sandbox, { __rect: rect })); + check('touch away from the top stays below', popover.style.top === '400px'); +} + +// 5. Touch positioning near the top: flips ABOVE the selection, mirroring +// iOS's own callout-below-when-no-room-above behavior. +{ + touchMode = true; + const popover = makePopover(200, 60); + sandbox.__pop = popover; + vm.runInContext('_definePopover = __pop', sandbox); + const nearTop = vm.runInContext('_DEFINE_NEAR_TOP_PX', sandbox); + const margin = vm.runInContext('_DEFINE_TOUCH_MARGIN', sandbox); + const rect = { x: 20, y: 60, top: nearTop - 20 }; // inside the near-top zone + vm.runInContext('_definePosition(__rect)', Object.assign(sandbox, { __rect: rect })); + const expectedY = Math.max(8, rect.top - 60 - margin); + check('touch near the top flips above the selection', popover.style.top === expectedY + 'px'); +} + +if (failures) { console.log('\n' + failures + ' check(s) FAILED'); process.exit(1); } +console.log('\nAll Define touch-position checks passed.'); diff --git a/tests/test_did_you_mean.py b/tests/test_did_you_mean.py index 41258bfd..528dc1ee 100644 --- a/tests/test_did_you_mean.py +++ b/tests/test_did_you_mean.py @@ -284,27 +284,53 @@ def test_eviction_sweep_keeps_frequent_drops_singletons(self): for w in ("aaa", "bbb", "ccc", "ddd"): self.assertNotIn(w, vocab) - def test_saturation_stops_the_scan(self): - # 19 words pre-seeded to count 2 (via a duplicate within each row's - # own title), then a 20th, brand-new singleton word hits a word cap - # of 20. It's the ONLY singleton in the vocab at that moment, so the - # sweep frees just 1 — under the 10% (of 20 = 2) saturation - # threshold. That must stop the scan outright: a further row after - # the trigger must never be read. - titles = [f"W{i:02d} W{i:02d}" for i in range(19)] - titles.append("Trigger") # 20th distinct word, count 1 → hits the cap - titles.append("ShouldNeverAppear ShouldNeverAppear") # must not be read + def test_cap_evicts_but_never_stops_the_scan(self): + # THE coverage-promise regression guard. Five singleton words fill a + # word cap of 5; the 5th admission triggers a tiered sweep. Unlike the + # old saturation-stop, the scan MUST continue — so "later", which + # appears (three times, to clear the final singleton prune) only in a + # row read AFTER the eviction, must land in the vocab. This is exactly + # the "mitochondria only shows up once the later indexes are scanned" + # case, in miniature. + titles = [ + "Aaa", + "Bbb", + "Ccc", + "Ddd", + "Eee", # 5th distinct singleton → hits cap of 5, triggers eviction + "Later Later Later", # read only after the sweep — must be admitted + ] + _make_title_index(self.tmp, "wikipedia", titles) + with ( + mock.patch.object(_search, "_VOCAB_MAX_WORDS", 5), + mock.patch.object(_search, "_VOCAB_FETCH_BATCH_SIZE", 1), + ): + vocab = _search._build_vocab() + # The singletons were swept (and pruned) — but the post-eviction word + # was still counted, proving the scan did not stop. + self.assertEqual(vocab.get("later"), 3) + + def test_admissions_freeze_when_eviction_cannot_free_room(self): + # A vocab of nothing but high-count words: the sweep can't free the + # required room even at the top tier, so NEW words stop being admitted + # — but existing words keep counting and every row is still read. + # 19 words pre-seeded to a count above every eviction tier, then a new + # word appears after the cap is hit; it must be refused admission, + # while an already-known word seen again afterward must still increment. + titles = [f"W{i:02d} W{i:02d} W{i:02d} W{i:02d}" for i in range(19)] + titles.append("Newword") # 20th distinct → hits cap, can't free → frozen + titles.append("W00") # already known → must still be counted (5th time) _make_title_index(self.tmp, "wikipedia", titles) with ( mock.patch.object(_search, "_VOCAB_MAX_WORDS", 20), - mock.patch.object(_search, "_VOCAB_EVICT_MIN_FRACTION", 0.10), + mock.patch.object(_search, "_VOCAB_EVICT_MAX_TIER", 3), mock.patch.object(_search, "_VOCAB_FETCH_BATCH_SIZE", 1), ): vocab = _search._build_vocab() - for i in range(19): - self.assertEqual(vocab.get(f"w{i:02d}"), 2) - self.assertNotIn("trigger", vocab) - self.assertNotIn("shouldneverappear", vocab) + self.assertNotIn("newword", vocab) # admission frozen + self.assertEqual( + vocab.get("w00"), 5 + ) # existing word still counted after freeze def test_final_prune_drops_remaining_singletons(self): # No cap pressure here — this isolates the end-of-scan prune from @@ -377,16 +403,18 @@ def test_builder_version_bump_invalidates_cache(self): # Back to the real (current) version — same indexes, different sig. self.assertIsNone(_search._vocab_cache_load()) - def test_round3_cache_on_disk_invalidated_by_round4_version_bump(self): - # The exact real-world case: a round-3 cache (builder version 2, - # first-come-eviction vocab, no stride sampling) already sitting on - # disk when round 4's code (version 3) starts up. It must not be - # loaded — the algorithm producing "words" changed, even though the - # indexes on disk did not. - with mock.patch.object(_search, "_VOCAB_BUILDER_VERSION", 2): - round3_sig = _search._vocab_signature(self.index_dir) - _search._vocab_cache_save({"python": 4}, round3_sig) - self.assertEqual(_search._VOCAB_BUILDER_VERSION, 3) + def test_prior_version_cache_on_disk_invalidated_by_version_bump(self): + # The exact real-world case behind the 1.8.1 coverage promise: a cache + # from the previous builder (the saturating-cap algorithm that dropped + # spread-thin words) already sitting on disk when the current code + # starts up. It must not be loaded — the algorithm producing "words" + # changed, even though the indexes on disk did not — so production + # re-scans once and picks up the previously-missing words. + with mock.patch.object( + _search, "_VOCAB_BUILDER_VERSION", _search._VOCAB_BUILDER_VERSION - 1 + ): + prior_sig = _search._vocab_signature(self.index_dir) + _search._vocab_cache_save({"python": 4}, prior_sig) self.assertIsNone(_search._vocab_cache_load()) def test_round_trip_avoids_rebuild(self): @@ -678,5 +706,111 @@ def test_absent_suggestion_not_shown(self): self.assertNotIn("Did you mean", out) +class EditDistanceTests(unittest.TestCase): + """The bounded Levenshtein used to verify trigram candidates.""" + + def test_zero_distance(self): + self.assertEqual(_search._edit_distance_le2("photo", "photo"), 0) + + def test_one_and_two(self): + self.assertEqual(_search._edit_distance_le2("photo", "photto"), 1) # 1 insert + self.assertEqual( + _search._edit_distance_le2("fotosynthesis", "photosynthesis"), 2 + ) + + def test_caps_at_three(self): + # Far-apart strings never report a real distance, just the >2 sentinel. + self.assertEqual(_search._edit_distance_le2("cat", "elephant"), 3) + self.assertEqual(_search._edit_distance_le2("abcdefg", "hijklmn"), 3) + + def test_length_gap_short_circuits(self): + self.assertEqual(_search._edit_distance_le2("ab", "abcde"), 3) + + +class TrigramIndexTests(unittest.TestCase): + """The trigram inverted index only covers long words and finds + distance-2 corrections an exhaustive edit-2 scan would skip for length.""" + + def tearDown(self): + _search._trigram_index = None + + def test_index_only_holds_long_words(self): + vocab = {"photosynthesis": 10, "cat": 5, "python": 3, "database": 7} + idx = _search._build_trigram_index(vocab) + # "database" (8) and "photosynthesis" (14) are indexed; "cat"/"python" + # (< _TRIGRAM_MIN_LEN) are not. + indexed = {w for posting in idx.values() for w in posting} + self.assertIn("photosynthesis", indexed) + self.assertIn("database", indexed) + self.assertNotIn("cat", indexed) + self.assertNotIn("python", indexed) + + def test_trigrams_helper(self): + self.assertEqual(_search._trigrams("abcd"), {"abc", "bcd"}) + self.assertEqual(_search._trigrams("ab"), {"ab"}) # short-circuit + + def test_long_word_distance2_correction(self): + # THE dist-2 promise case: "fotosynthesis" -> "photosynthesis" (two + # edits, 13/14 chars — too long for the exhaustive edit-2 path). + vocab = { + "photosynthesis": 100, + "photosynthetic": 20, + "mitochondria": 50, + "encyclopedia": 80, + } + _search._rebuild_trigram_index(vocab) + self.assertEqual( + _search._best_correction("fotosynthesis", vocab), "photosynthesis" + ) + + def test_long_word_correction_via_did_you_mean(self): + vocab = {"photosynthesis": 100, "chlorophyll": 40} + _search._rebuild_trigram_index(vocab) + deadline = time.monotonic() + 1.0 + self.assertEqual( + _search._did_you_mean("fotosynthesis", vocab, deadline), + "photosynthesis", + ) + + def test_long_word_no_index_fails_soft(self): + # No trigram index (never built) → long-word dist-2 is simply skipped, + # never raising, returning None. + _search._trigram_index = None + vocab = {"photosynthesis": 100} + self.assertIsNone(_search._best_correction("fotosynthesis", vocab)) + + def test_frequency_breaks_ties_among_near_long_words(self): + # Two long vocab words are each EXACTLY distance 2 from the typo (the + # two-char suffix differs), and distance 2 from each other, so neither + # is reachable by the distance-1 path — the trigram path must choose, + # and the far more common one wins. + vocab = {"helloworldaa": 900, "helloworldbb": 3} + _search._rebuild_trigram_index(vocab) + out = _search._best_correction("helloworldxx", vocab) + self.assertEqual(out, "helloworldaa") # frequency wins the tie + + def test_index_caps_to_highest_count_long_words(self): + # With the per-index word cap lowered, only the highest-count long + # words are indexed — a rare long word is excluded, a common one kept — + # so query latency stays flat as the vocab's low-count tail grows. + vocab = { + "photosynthesis": 500, # common → indexed + "electroencephalography": 3, # rare long word → dropped by the cap + "biodiversity": 400, # common → indexed + } + with mock.patch.object(_search, "_TRIGRAM_MAX_INDEX_WORDS", 2): + idx = _search._build_trigram_index(vocab) + indexed = {w for posting in idx.values() for w in posting} + self.assertIn("photosynthesis", indexed) + self.assertIn("biodiversity", indexed) + self.assertNotIn("electroencephalography", indexed) + + def test_reset_clears_trigram_index(self): + _search._rebuild_trigram_index({"photosynthesis": 5}) + self.assertIsNotNone(_search._trigram_index) + _search._reset_vocab() + self.assertIsNone(_search._trigram_index) + + if __name__ == "__main__": unittest.main() diff --git a/tests/test_download_queue.py b/tests/test_download_queue.py index ef29f65b..37b75f18 100644 --- a/tests/test_download_queue.py +++ b/tests/test_download_queue.py @@ -69,11 +69,12 @@ def _kiwix_url(name): # ──────────────────────────────────────────────────────────────────────────── -def test_default_max_concurrent_is_3(monkeypatch): +def test_default_max_concurrent(monkeypatch): monkeypatch.delenv("ZIMI_MAX_CONCURRENT_DOWNLOADS", raising=False) - from zimi import library + monkeypatch.delenv("ZIMI_BT", raising=False) + from zimi import library, p2p - assert library._max_concurrent() == 3 + assert library._max_concurrent() == p2p.DEFAULT_MAX_ACTIVE_DOWNLOADS def test_env_var_overrides_max_concurrent(monkeypatch): @@ -85,9 +86,9 @@ def test_env_var_overrides_max_concurrent(monkeypatch): def test_env_var_invalid_falls_back_to_default(monkeypatch): monkeypatch.setenv("ZIMI_MAX_CONCURRENT_DOWNLOADS", "not-a-number") - from zimi import library + from zimi import library, p2p - assert library._max_concurrent() == library._MAX_CONCURRENT_DEFAULT + assert library._max_concurrent() == p2p.DEFAULT_MAX_ACTIVE_DOWNLOADS def test_env_var_zero_clamps_to_one(monkeypatch): @@ -126,6 +127,28 @@ def test_at_cap_queues_extras(_no_real_threads, _no_mirrors, monkeypatch): assert library._download_queue[0]["id"] == qid +def test_pref_cap_queues_extras(_no_real_threads, _no_mirrors, monkeypatch, tmp_path): + """The cap wired through the p2p pref (the UI path, no env) queues past it, + and raising it live then drains the queue.""" + from zimi import library, p2p + + monkeypatch.delenv("ZIMI_MAX_CONCURRENT_DOWNLOADS", raising=False) + monkeypatch.delenv("ZIMI_BT", raising=False) + monkeypatch.setattr(p2p, "_prefs_path", str(tmp_path / "prefs.json")) + assert p2p.set_pref("max_active_downloads", 1) + + library._start_download(_kiwix_url("a"), size_bytes=100) + qid = library._start_download(_kiwix_url("b"), size_bytes=200)[0] + assert len(library._active_downloads) == 1 + assert [q["id"] for q in library._download_queue] == [qid] + + # Raise the cap and drain — the queued item promotes into the new slot. + assert p2p.set_pref("max_active_downloads", 2) + library.drain_download_queue() + assert qid in library._active_downloads + assert len(library._download_queue) == 0 + + def test_queue_orders_smallest_first(_no_real_threads, _no_mirrors, monkeypatch): """When the cap is full, queued items are sorted smallest-first.""" monkeypatch.setenv("ZIMI_MAX_CONCURRENT_DOWNLOADS", "1") @@ -274,9 +297,7 @@ def _read_pending(data_dir): return json.load(f)["pending"] -def test_pending_downloads_persist_on_enqueue( - _no_real_threads, _no_mirrors, _data_dir -): +def test_pending_downloads_persist_on_enqueue(_no_real_threads, _no_mirrors, _data_dir): library._start_download(_kiwix_url("aaa"), size_bytes=100) library._start_download(_kiwix_url("bbb"), size_bytes=200) pending = _read_pending(_data_dir) @@ -376,9 +397,7 @@ def test_download_refused_when_size_exceeds_free_space( monkeypatch.setattr( library.shutil, "disk_usage", lambda p: _FakeUsage(free=5 * 1024**3) ) - dl_id, err = library._start_download( - _kiwix_url("big"), size_bytes=10 * 1024**3 - ) + dl_id, err = library._start_download(_kiwix_url("big"), size_bytes=10 * 1024**3) assert dl_id is None assert "disk space" in err.lower() diff --git a/tests/test_download_schedule.py b/tests/test_download_schedule.py new file mode 100644 index 00000000..d4600a64 --- /dev/null +++ b/tests/test_download_schedule.py @@ -0,0 +1,386 @@ +"""Tests for scheduled / night-window downloads. + +When scheduling is enabled, downloads started outside the local-time window +are held in the queue as ``scheduled`` and released when the window opens +(by the watcher tick or a config change). Window logic is server-local time, +supports overnight-spanning ranges, and never traps downloads on bad config. +""" + +import os +import sys + +import pytest + +sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +import zimi.library as library # noqa: E402 +import zimi.server as server # noqa: E402 + + +@pytest.fixture(autouse=True) +def _reset(tmp_path, monkeypatch): + monkeypatch.setattr(server, "ZIM_DIR", str(tmp_path)) + monkeypatch.setattr( + server, + "_DOWNLOAD_SCHEDULE_CONFIG", + str(tmp_path / "download_schedule.json"), + raising=False, + ) + monkeypatch.delenv("ZIMI_DL_WINDOW", raising=False) + with library._download_lock: + library._active_downloads.clear() + library._download_queue.clear() + library._download_counter = 0 + yield + with library._download_lock: + library._active_downloads.clear() + library._download_queue.clear() + + +@pytest.fixture +def _no_real_threads(monkeypatch): + class _FakeThread: + def __init__(self, target=None, args=(), kwargs=None, daemon=None, name=None): + self.target, self.args, self.kwargs = target, args, kwargs or {} + + def start(self): + pass + + monkeypatch.setattr(library.threading, "Thread", _FakeThread) + + +def _kiwix_url(name): + return f"https://download.kiwix.org/zim/{name}.zim" + + +# ──────────────────────────────────────────────────────────────────────────── +# Pure window math +# ──────────────────────────────────────────────────────────────────────────── + + +def test_parse_hhmm(): + assert library._parse_hhmm("01:00") == 60 + assert library._parse_hhmm("07:30") == 450 + assert library._parse_hhmm("23:59") == 1439 + assert library._parse_hhmm("00:00") == 0 + + +def test_parse_hhmm_rejects_garbage(): + for bad in ("", "24:00", "1:60", "aa:bb", "7", "07-00", None, "25:10"): + assert library._parse_hhmm(bad) is None + + +def test_fmt_hhmm(): + assert library._fmt_hhmm(60) == "01:00" + assert library._fmt_hhmm(450) == "07:30" + assert library._fmt_hhmm(1440) == "00:00" # wraps + + +def test_in_window_daytime_range(): + # 01:00–07:00 + s, e = 60, 420 + assert not library._in_window(0, s, e) # 00:00 before + assert library._in_window(60, s, e) # 01:00 start inclusive + assert library._in_window(300, s, e) # 05:00 inside + assert not library._in_window(420, s, e) # 07:00 end exclusive + assert not library._in_window(600, s, e) # 10:00 after + + +def test_in_window_spans_midnight(): + # 22:00–06:00 + s, e = 1320, 360 + assert library._in_window(1380, s, e) # 23:00 + assert library._in_window(0, s, e) # 00:00 + assert library._in_window(300, s, e) # 05:00 + assert not library._in_window(360, s, e) # 06:00 end exclusive + assert not library._in_window(720, s, e) # 12:00 outside + assert library._in_window(1320, s, e) # 22:00 start inclusive + + +def test_in_window_equal_bounds_is_always_open(): + assert library._in_window(0, 120, 120) + assert library._in_window(1000, 120, 120) + + +# ──────────────────────────────────────────────────────────────────────────── +# Config load / save +# ──────────────────────────────────────────────────────────────────────────── + + +def test_default_schedule_disabled(): + sched = library._load_download_schedule() + assert sched["enabled"] is False + assert sched["start"] == "01:00" + assert sched["end"] == "07:00" + assert sched["locked"] is False + + +def test_save_and_reload(): + assert library._save_download_schedule(True, "23:00", "05:00") + sched = library._load_download_schedule() + assert sched == { + "enabled": True, + "start": "23:00", + "end": "05:00", + "locked": False, + "upload_restrict": False, + "upload_trickle_kb": library._DEFAULT_UPLOAD_TRICKLE_KB, + } + + +# ──────────────────────────────────────────────────────────────────────────── +# Upload-window restrictor (restrict seeding to the window) +# ──────────────────────────────────────────────────────────────────────────── + + +def test_upload_fields_persist(): + assert library._save_download_schedule(True, "01:00", "07:00", True, 25) + sched = library._load_download_schedule() + assert sched["upload_restrict"] is True + assert sched["upload_trickle_kb"] == 25 + + +def test_upload_fields_preserved_on_window_edit(): + # Set the upload policy, then edit only the window — policy must survive. + library._save_download_schedule(True, "01:00", "07:00", True, 40) + library._save_download_schedule(True, "02:00", "06:00") + sched = library._load_download_schedule() + assert sched["start"] == "02:00" + assert sched["upload_restrict"] is True + assert sched["upload_trickle_kb"] == 40 + + +def test_upload_trickle_floored_positive(): + # 0 would mean "unlimited" downstream — a trickle must stay positive. + library._save_download_schedule(True, "01:00", "07:00", True, 0) + assert library._load_download_schedule()["upload_trickle_kb"] >= 1 + + +def test_in_window_now_ignores_enabled(monkeypatch): + # Scheduling OFF but the upload restrictor uses raw window membership. + library._save_download_schedule(False, "01:00", "07:00", True, 30) + monkeypatch.setattr(library, "_now_local_minutes", lambda: 180) # 03:00 inside + assert library._in_window_now() is True + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) # noon outside + assert library._in_window_now() is False + + +def test_upload_window_transition_calls_rate_setter(monkeypatch): + from zimi import p2p + + calls = [] + monkeypatch.setattr(p2p, "set_upload_window_cap", lambda kb: calls.append(kb)) + library._save_download_schedule(True, "01:00", "07:00", True, 30) + library._upload_window_applied = None # reset transition memory + # Outside the window → trickle to 30. + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) + library._apply_upload_window() + assert calls[-1] == 30 + # Inside the window → release (None). + monkeypatch.setattr(library, "_now_local_minutes", lambda: 180) + library._apply_upload_window() + assert calls[-1] is None + + +def test_upload_window_idempotent_no_transition(monkeypatch): + from zimi import p2p + + calls = [] + monkeypatch.setattr(p2p, "set_upload_window_cap", lambda kb: calls.append(kb)) + library._save_download_schedule(True, "01:00", "07:00", True, 30) + library._upload_window_applied = None + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) + library._apply_upload_window() + n = len(calls) + library._apply_upload_window() # same state — must not touch the session again + assert len(calls) == n + + +def test_malformed_persisted_times_fall_back(): + cfg = server._DOWNLOAD_SCHEDULE_CONFIG + with open(cfg, "w") as f: + f.write('{"enabled": true, "start": "nope", "end": "99:99"}') + sched = library._load_download_schedule() + assert sched["start"] == "01:00" + assert sched["end"] == "07:00" + + +def test_env_var_locks_window(monkeypatch): + monkeypatch.setenv("ZIMI_DL_WINDOW", "02:00-04:00") + sched = library._load_download_schedule() + assert sched["enabled"] is True + assert sched["start"] == "02:00" + assert sched["end"] == "04:00" + assert sched["locked"] is True + # A locked window refuses persistence. + assert library._save_download_schedule(False, "10:00", "12:00") is False + + +def test_env_var_malformed_ignored(monkeypatch): + monkeypatch.setenv("ZIMI_DL_WINDOW", "notatime") + assert library._load_download_schedule()["locked"] is False + + +# ──────────────────────────────────────────────────────────────────────────── +# _within_download_window / _schedule_defers_now +# ──────────────────────────────────────────────────────────────────────────── + + +def test_disabled_schedule_always_in_window(): + library._save_download_schedule(False, "01:00", "07:00") + assert library._within_download_window(now_min=720) is True + assert library._schedule_defers_now() is False + + +def test_enabled_outside_window_defers(monkeypatch): + library._save_download_schedule(True, "01:00", "07:00") + # Pin "now" to noon — outside the window. + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) + assert library._within_download_window() is False + assert library._schedule_defers_now() is True + + +def test_enabled_inside_window_does_not_defer(monkeypatch): + library._save_download_schedule(True, "01:00", "07:00") + monkeypatch.setattr(library, "_now_local_minutes", lambda: 180) # 03:00 + assert library._within_download_window() is True + assert library._schedule_defers_now() is False + + +# ──────────────────────────────────────────────────────────────────────────── +# Queue transitions +# ──────────────────────────────────────────────────────────────────────────── + + +def test_outside_window_queues_as_scheduled(_no_real_threads, monkeypatch): + monkeypatch.setattr(library, "_fetch_mirrors", lambda url: []) + library._save_download_schedule(True, "01:00", "07:00") + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) # noon + dl_id, err = library._start_download(_kiwix_url("a"), size_bytes=100) + assert err is None + assert dl_id not in library._active_downloads + assert len(library._download_queue) == 1 + assert library._download_queue[0]["scheduled"] is True + + +def test_inside_window_starts_immediately(_no_real_threads, monkeypatch): + monkeypatch.setattr(library, "_fetch_mirrors", lambda url: []) + library._save_download_schedule(True, "01:00", "07:00") + monkeypatch.setattr(library, "_now_local_minutes", lambda: 180) # 03:00 + dl_id, err = library._start_download(_kiwix_url("a"), size_bytes=100) + assert err is None + assert dl_id in library._active_downloads + assert len(library._download_queue) == 0 + + +def test_scheduled_not_drained_outside_window(_no_real_threads, monkeypatch): + monkeypatch.setattr(library, "_fetch_mirrors", lambda url: []) + library._save_download_schedule(True, "01:00", "07:00") + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) + library._start_download(_kiwix_url("a"), size_bytes=100) + with library._download_lock: + library._drain_queue() + # Still parked — window is closed. + assert len(library._download_queue) == 1 + assert len(library._active_downloads) == 0 + + +def test_window_open_releases_scheduled(_no_real_threads, monkeypatch): + monkeypatch.setattr(library, "_fetch_mirrors", lambda url: []) + library._save_download_schedule(True, "01:00", "07:00") + # Queue it while the window is closed… + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) + library._start_download(_kiwix_url("a"), size_bytes=100) + assert len(library._download_queue) == 1 + # …then the window opens and the watcher tick releases it. + monkeypatch.setattr(library, "_now_local_minutes", lambda: 180) + library._download_schedule_tick() + assert len(library._download_queue) == 0 + assert len(library._active_downloads) == 1 + + +def test_tick_noop_outside_window(_no_real_threads, monkeypatch): + monkeypatch.setattr(library, "_fetch_mirrors", lambda url: []) + library._save_download_schedule(True, "01:00", "07:00") + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) + library._start_download(_kiwix_url("a"), size_bytes=100) + library._download_schedule_tick() # still outside window + assert len(library._download_queue) == 1 + + +def test_scheduled_status_serialization(monkeypatch): + library._save_download_schedule(True, "01:00", "07:00") + monkeypatch.setattr(library, "_now_local_minutes", lambda: 180) + from zimi import p2p + + monkeypatch.setattr(p2p, "get_download_limit_kb", lambda: 300) + monkeypatch.setattr(p2p, "is_bt_down_env_locked", lambda: False) + st = library._download_schedule_status() + assert st["enabled"] is True + assert st["start"] == "01:00" + assert st["in_window"] is True + assert st["download_kb"] == 300 + assert st["download_kb_locked"] is False + + +def test_get_downloads_reports_scheduled(_no_real_threads, monkeypatch): + monkeypatch.setattr(library, "_fetch_mirrors", lambda url: []) + library._save_download_schedule(True, "01:00", "07:00") + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) + library._start_download(_kiwix_url("a"), size_bytes=100) + rows = library._get_downloads() + queued = [r for r in rows if r.get("queued")] + assert len(queued) == 1 + assert queued[0]["scheduled"] is True + + +# ──────────────────────────────────────────────────────────────────────────── +# Start-now override (_start_scheduled_now) +# ──────────────────────────────────────────────────────────────────────────── + + +def test_start_now_launches_scheduled_item(_no_real_threads, monkeypatch): + monkeypatch.setattr(library, "_fetch_mirrors", lambda url: []) + library._save_download_schedule(True, "01:00", "07:00") + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) # outside + dl_id, _ = library._start_download(_kiwix_url("a"), size_bytes=100) + assert library._download_queue[0]["scheduled"] is True + # Override the window for this one — still outside it. + status, code = library._start_scheduled_now(dl_id) + assert (status, code) == ("started", 200) + assert dl_id in library._active_downloads + assert len(library._download_queue) == 0 + + +def test_start_now_at_cap_promotes_to_normal_queue(_no_real_threads, monkeypatch): + monkeypatch.setattr(library, "_fetch_mirrors", lambda url: []) + monkeypatch.setenv("ZIMI_MAX_CONCURRENT_DOWNLOADS", "1") + library._save_download_schedule(True, "01:00", "07:00") + # One active (in-window start), one scheduled (outside window). + monkeypatch.setattr(library, "_now_local_minutes", lambda: 180) # inside + library._start_download(_kiwix_url("active"), size_bytes=100) + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) # outside + sid, _ = library._start_download(_kiwix_url("later"), size_bytes=200) + assert library._download_queue[0]["scheduled"] is True + # No free slot: start-now clears the scheduled flag but can't launch yet. + status, code = library._start_scheduled_now(sid) + assert (status, code) == ("queued", 200) + assert "scheduled" not in library._download_queue[0] + # It now drains on the next slot regardless of the window (not gated). + monkeypatch.setattr(library, "_now_local_minutes", lambda: 720) + with library._download_lock: + library._active_downloads.clear() # free the slot + library._drain_queue() + assert sid in library._active_downloads + + +def test_start_now_unknown_id_not_found(): + assert library._start_scheduled_now("nope") == ("not_found", 404) + + +def test_start_now_on_active_item_reports_already_active(_no_real_threads, monkeypatch): + monkeypatch.setattr(library, "_fetch_mirrors", lambda url: []) + library._save_download_schedule(False, "01:00", "07:00") # off → starts active + dl_id, _ = library._start_download(_kiwix_url("a"), size_bytes=100) + assert dl_id in library._active_downloads + assert library._start_scheduled_now(dl_id) == ("already_active", 200) diff --git a/tests/test_download_throttle.py b/tests/test_download_throttle.py new file mode 100644 index 00000000..50876621 --- /dev/null +++ b/tests/test_download_throttle.py @@ -0,0 +1,143 @@ +"""Tests for the global HTTP download-speed throttle. + +The token bucket (_DownloadThrottle) is shared across every download thread so +N concurrent pulls sum to the cap, not N × the cap. The pacing math is pure +(clock injectable) so it can be verified without real sleeps. +""" + +import os +import sys + +import pytest + +sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +import zimi.library as library # noqa: E402 +import zimi.p2p as p2p # noqa: E402 + + +@pytest.fixture(autouse=True) +def _hermetic_throttle_state(): + """Snapshot and restore every piece of module-global state these tests + touch, so nothing leaks in or out regardless of suite order: + - library._rate_cache (the ~2s rate lookup cache) + - library._download_throttle (the shared token-bucket singleton) + - p2p._prefs_path (set by the mirrors-bt-down test) + A dirty _rate_cache or a mid-flight bucket is exactly what produces the + "expected 0.0, got 1.0" pacing failures under interleaved runs. + """ + saved_cache = dict(library._rate_cache) + saved_prefs = p2p._prefs_path + library._rate_cache["ts"] = 0.0 + library._rate_cache["bps"] = 0 + library._download_throttle.reset() + yield + library._rate_cache.clear() + library._rate_cache.update(saved_cache) + library._download_throttle.reset() + p2p._prefs_path = saved_prefs + + +class _FakeClock: + def __init__(self): + self.t = 0.0 + + def __call__(self): + return self.t + + def advance(self, dt): + self.t += dt + + +# ──────────────────────────────────────────────────────────────────────────── +# Throttle math +# ──────────────────────────────────────────────────────────────────────────── + + +def test_zero_rate_never_throttles(): + th = library._DownloadThrottle() + assert th.consume(1_000_000, 0) == 0.0 + assert th.consume(1_000_000, -5) == 0.0 + + +def test_first_chunk_within_budget_no_sleep(): + clk = _FakeClock() + th = library._DownloadThrottle(clock=clk) + # 100 KB/s = 102400 B/s. A 64 KB chunk fits in the first second's burst. + assert th.consume(65536, 102400) == 0.0 + + +def test_overspend_returns_proportional_sleep(): + clk = _FakeClock() + th = library._DownloadThrottle(clock=clk) + rate = 100_000 # bytes/sec + # Burst allowance caps at one second (100k). First consume drains it to 0. + assert th.consume(100_000, rate) == 0.0 + # Next consume with no elapsed time goes 50k into deficit -> 0.5s sleep. + assert th.consume(50_000, rate) == pytest.approx(0.5, abs=1e-6) + + +def test_elapsed_time_refills_bucket(): + clk = _FakeClock() + th = library._DownloadThrottle(clock=clk) + rate = 100_000 + th.consume(100_000, rate) # drain burst to 0 + clk.advance(0.5) # refills 50k + # 50k available now -> a 50k chunk is free. + assert th.consume(50_000, rate) == pytest.approx(0.0, abs=1e-9) + + +def test_burst_allowance_capped_at_one_second(): + clk = _FakeClock() + th = library._DownloadThrottle(clock=clk) + rate = 100_000 + th.consume(1, rate) # seed _last + clk.advance(1000) # huge idle — must NOT bank 1000s of credit + # Only one second's worth (100k) is available; a 200k read pays for 100k. + assert th.consume(200_000, rate) == pytest.approx(1.0, abs=1e-6) + + +def test_aggregate_rate_across_two_streams(): + """Two 'threads' sharing one bucket are paced to the aggregate rate.""" + clk = _FakeClock() + th = library._DownloadThrottle(clock=clk) + rate = 100_000 + th.consume(100_000, rate) # stream A drains the burst + # Stream B, same instant, gets no free credit -> must wait. + assert th.consume(100_000, rate) == pytest.approx(1.0, abs=1e-6) + + +def test_reset_clears_state(): + clk = _FakeClock() + th = library._DownloadThrottle(clock=clk) + th.consume(100_000, 100_000) + th.reset() + # Fresh bucket: a within-budget read is free again. + assert th.consume(100_000, 100_000) == 0.0 + + +# ──────────────────────────────────────────────────────────────────────────── +# Rate lookup + caching + global-cap wiring +# ──────────────────────────────────────────────────────────────────────────── + + +def test_download_rate_bps_reads_global_cap(monkeypatch): + library._rate_cache["ts"] = 0.0 # force refresh + monkeypatch.setattr(p2p, "get_download_limit_kb", lambda: 256) + assert library._download_rate_bps() == 256 * 1024 + + +def test_download_rate_bps_zero_is_unlimited(monkeypatch): + library._rate_cache["ts"] = 0.0 + monkeypatch.setattr(p2p, "get_download_limit_kb", lambda: 0) + assert library._download_rate_bps() == 0 + + +def test_download_limit_mirrors_bt_down(monkeypatch, tmp_path): + """The global download cap and the BT down limit are one number.""" + prefs = tmp_path / "prefs.json" + p2p.set_prefs_path(str(prefs)) + monkeypatch.delenv("ZIMI_BT_DOWN_KB", raising=False) + assert p2p.set_pref("bt_down_kb", 512) + assert p2p.get_download_limit_kb() == 512 + assert p2p.get_bt_down_limit_kb() == 512 diff --git a/tests/test_health.py b/tests/test_health.py index 01f88889..cd2db19e 100644 --- a/tests/test_health.py +++ b/tests/test_health.py @@ -11,7 +11,11 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) -from conftest_zim import build_fixture_zim # noqa: E402 +from conftest_zim import ( # noqa: E402 + build_empty_text_fixture_zim, + build_fixture_zim, + build_media_fixture_zim, +) import zimi.server as server # noqa: E402 import zimi.health as health # noqa: E402 @@ -85,6 +89,101 @@ def test_report_flags_broken_and_healthy(tmp_path, monkeypatch): assert st["summary"]["warnings"] == 1 +def test_zero_byte_media_entry_flagged(tmp_path, monkeypatch): + """A ZIM that opens fine and has entries can still ship broken media — a + 0-byte video the count and size-vs-catalog checks never see. The media + sampler must count it and flag the ZIM (issue #38 follow-up: the shape of + ted_en_technology_2023-09).""" + zdir = tmp_path / "zims" + zdir.mkdir() + build_media_fixture_zim(str(zdir / "talks_en_2026-06.zim")) + ddir = tmp_path / "data" + ddir.mkdir() + monkeypatch.setattr(server, "ZIM_DIR", str(zdir)) + monkeypatch.setattr(server, "ZIMI_DATA_DIR", str(ddir)) + server._archive_pool.clear() + server.load_cache(force=True) + + st = _run_check() + row = {r["name"]: r for r in st["report"]}["talks"] + assert row["opens"] is True + assert row["media_sampled"] == 2 # one real + one empty + assert row["media_empty"] == 1 + assert row["status"] == "warn" + assert any("empty" in i and "0-byte" in i for i in row["issues"]) + assert "videos/2/video.webm" in (row.get("media_examples") or []) + + +def test_healthy_media_not_flagged(tmp_path, monkeypatch): + """A ZIM whose media all carry bytes stays healthy — the sampler counts + them but raises no issue and never demotes an otherwise-clean ZIM.""" + zdir = tmp_path / "zims" + zdir.mkdir() + # Rebuild with both videos non-empty by writing a second real-media ZIM. + from conftest_zim import _Article, _MediaItem, _StringProvider # noqa: F401 + from libzim.writer import Creator + + p = str(zdir / "goodtalks_en_2026-06.zim") + with Creator(p).config_indexing(True, "eng") as creator: + creator.set_mainpath("A/Talks") + creator.add_item(_Article("A/Talks", "Talks", b"ok")) + creator.add_item(_MediaItem("videos/1/video.webm", "video/webm", b"realbytes1")) + creator.add_item(_MediaItem("videos/2/video.webm", "video/webm", b"realbytes2")) + creator.add_metadata("Title", "Good Talks") + creator.add_metadata("Language", "eng") + creator.add_metadata("Description", "media fixture") + ddir = tmp_path / "data" + ddir.mkdir() + monkeypatch.setattr(server, "ZIM_DIR", str(zdir)) + monkeypatch.setattr(server, "ZIMI_DATA_DIR", str(ddir)) + server._archive_pool.clear() + server.load_cache(force=True) + + st = _run_check() + row = {r["name"]: r for r in st["report"]}["goodtalks"] + assert row["media_sampled"] == 2 + assert row["media_empty"] == 0 + assert row["status"] == "ok" + assert not row["issues"] + + +def test_empty_articles_flagged_without_media(tmp_path, monkeypatch): + """A ZIM that opens, has entries, and carries no media can still be a broken + scrape — every article a 0-byte shell. The universal text-sanity sampler + must catch it (the media sampler never fires here) and demote it to warn.""" + zdir = tmp_path / "zims" + zdir.mkdir() + build_empty_text_fixture_zim(str(zdir / "empties_en_2026-06.zim")) + ddir = tmp_path / "data" + ddir.mkdir() + monkeypatch.setattr(server, "ZIM_DIR", str(zdir)) + monkeypatch.setattr(server, "ZIMI_DATA_DIR", str(ddir)) + server._archive_pool.clear() + server.load_cache(force=True) + + st = _run_check() + row = {r["name"]: r for r in st["report"]}["empties"] + assert row["opens"] is True + assert row["entries"] and row["entries"] > 0 + assert row["text_sampled"] and row["text_sampled"] > 0 + assert row["text_empty"] == row["text_sampled"] + assert row["media_sampled"] is None # no media entries at all + assert row["status"] == "warn" + assert any("articles empty" in i for i in row["issues"]) + + +def test_healthy_text_not_flagged(tmp_path, monkeypatch): + """The text-sanity sampler must never demote a normal content ZIM: the + survival fixture's articles all carry bytes, so it stays healthy.""" + _setup(tmp_path, monkeypatch) + st = _run_check() + good = {r["name"]: r for r in st["report"]}["survival"] + assert good["text_sampled"] and good["text_sampled"] > 0 + assert good["text_empty"] == 0 + assert good["status"] == "ok" + assert not good["issues"] + + def test_second_start_is_rejected_while_running(tmp_path, monkeypatch): _setup(tmp_path, monkeypatch) # Occupy the lock to simulate an in-flight run. diff --git a/tests/test_iframe_link_chaperon.py b/tests/test_iframe_link_chaperon.py index 2694eb56..c4c09463 100644 --- a/tests/test_iframe_link_chaperon.py +++ b/tests/test_iframe_link_chaperon.py @@ -69,21 +69,27 @@ def test_iframe_click_handler_uses_capture_phase(): ) -def test_iframe_contextmenu_uses_no_rewrite_trick(): - """The right-click contextmenu handler also resolves hrefs from the - iframe — must use the same `_no_rewrite=true` pattern as the left- - click handler, otherwise wombat ZIMs would have the same doubling - bug on right-click "Open article" (incomplete fix for #17).""" +def test_no_custom_contextmenu_inside_article_frame(): + """Right-click coherence (1.8.1): right-clicking INSIDE article content + must yield ONLY the browser's own context menu, which is load-bearing on + a ZIM page (copy, open-link-in-new-tab, translate, image save, look up…). + + An earlier build attached a contextmenu listener to the reader iframe that + intercepted right-click on in-archive links and swapped in Zimi's own "open + article" menu. That was removed: Zimi's custom link menu is now offered ONLY + on CHROME article links (search results / home tiles) in the PARENT document. + This guards against a regression that re-adds an in-frame interceptor. + """ src = _read_app_js() - # Both occurrences should share the pattern. Easy invariant: the - # number of "_no_rewrite = true" assignments matches the number of - # iframe-document listeners that read a.href (click + contextmenu). - flag_sets = src.count("_no_rewrite = true") - assert flag_sets >= 2, ( - f"expected ≥2 `_no_rewrite = true` assignments (click + " - f"contextmenu handlers); found {flag_sets}. The contextmenu " - f"handler must also use the trick or right-click on wombat " - f"ZIMs will double the path." + assert "frame.contentDocument.addEventListener('contextmenu'" not in src, ( + "no contextmenu listener may be attached to the reader iframe that shows " + "Zimi's own menu — the system menu is load-bearing inside article content " + "(1.8.1 right-click coherence)" + ) + # The exact removed call — a link menu positioned in frame-relative coords. + assert "_showLinkCtxMenu(e.clientX + frameRect" not in src, ( + "the reader frame must not open Zimi's link context menu on right-click; " + "that affordance lives on parent-document chrome links only" ) diff --git a/tests/test_interlang.mjs b/tests/test_interlang.mjs index 8945c157..babf2761 100644 --- a/tests/test_interlang.mjs +++ b/tests/test_interlang.mjs @@ -1,5 +1,5 @@ // Cross-language article navigation tests -// Run against a remote host: BASE_URL=http://knowledge.example.lan npx playwright test tests/test_interlang.mjs --config=playwright.config.mjs +// Run against a remote host: BASE_URL=http://knowledge.example.lan npx playwright test tests/test_interlang.mjs --config=tests/playwright.config.mjs import { test, expect } from '@playwright/test'; diff --git a/tests/test_library_layout.py b/tests/test_library_layout.py index 687976b3..01b9b94c 100644 --- a/tests/test_library_layout.py +++ b/tests/test_library_layout.py @@ -96,6 +96,53 @@ def test_order_replaces_not_merges(monkeypatch, tmp_path): assert body["section_order"] == ["cat:Wikimedia"] +def test_other_key_is_orderable(monkeypatch, tmp_path): + # The uncategorized catch-all rides section_order via the reserved `other` + # key so it can be positioned like any real section. + _setup(monkeypatch, tmp_path) + order = ["other", "cat:Books"] + status, body = _post(_Handler(), {"section_order": order}) + assert status == 200 + assert body["section_order"] == order + + +def test_sections_round_trip(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + status, body = _post(_Handler(), {"sections": ["Survival", "Field Guides"]}) + assert status == 200 + assert body["sections"] == ["Survival", "Field Guides"] + assert server._load_library_layout()["sections"] == ["Survival", "Field Guides"] + + +def test_sections_replace_and_dedupe(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + _post(_Handler(), {"sections": ["A", "B"]}) + # Fully replaces (not merges) and drops case-insensitive duplicates. + _, body = _post(_Handler(), {"sections": ["C", "c", "C "]}) + assert body["sections"] == ["C"] + + +def test_sections_independent_of_overrides_and_order(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + _post(_Handler(), {"overrides": {"z": "Books"}, "section_order": ["cat:Books"]}) + _, body = _post(_Handler(), {"sections": ["Empty"]}) + assert body["overrides"] == {"z": "Books"} + assert body["section_order"] == ["cat:Books"] + assert body["sections"] == ["Empty"] + + +def test_sections_not_a_list_400(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + status, _ = _post(_Handler(), {"sections": "Books"}) + assert status == 400 + + +def test_sections_empty_string_400(monkeypatch, tmp_path): + _setup(monkeypatch, tmp_path) + status, _ = _post(_Handler(), {"sections": ["ok", ""]}) + assert status == 400 + + def test_override_and_order_are_independent(monkeypatch, tmp_path): _setup(monkeypatch, tmp_path) _post(_Handler(), {"overrides": {"z": "Books"}}) @@ -187,15 +234,23 @@ def test_corrupt_layout_reads_as_empty(monkeypatch, tmp_path): data_dir = _setup(monkeypatch, tmp_path) (data_dir / "library_layout.json").write_text("{ this is not json") layout = server._load_library_layout() - assert layout == {"overrides": {}, "section_order": []} + assert layout == {"overrides": {}, "section_order": [], "sections": []} def test_missing_layout_reads_as_empty(monkeypatch, tmp_path): _setup(monkeypatch, tmp_path) - assert server._load_library_layout() == {"overrides": {}, "section_order": []} + assert server._load_library_layout() == { + "overrides": {}, + "section_order": [], + "sections": [], + } def test_wrong_shape_layout_reads_as_empty(monkeypatch, tmp_path): data_dir = _setup(monkeypatch, tmp_path) (data_dir / "library_layout.json").write_text(json.dumps([1, 2, 3])) - assert server._load_library_layout() == {"overrides": {}, "section_order": []} + assert server._load_library_layout() == { + "overrides": {}, + "section_order": [], + "sections": [], + } diff --git a/tests/test_libtorrent_backend.py b/tests/test_libtorrent_backend.py index 220ac3fa..406a9056 100644 --- a/tests/test_libtorrent_backend.py +++ b/tests/test_libtorrent_backend.py @@ -281,6 +281,40 @@ def test_zero_means_unlimited(self, backend, tmp_path): assert backend._ses.settings["download_rate_limit"] == 0 +class TestConnectionLimit: + def test_session_start_applies_connections_limit( + self, backend, tmp_path, monkeypatch + ): + # The real, enforced knob: connections_limit lands on the session at + # startup (not active_downloads/active_seeds — those are inert for + # Zimi's manually-managed, non-auto-managed torrents). + monkeypatch.setattr(p2p, "_prefs_path", None) + monkeypatch.delenv("ZIMI_BT", raising=False) + backend._ensure_session() + assert backend._ses.settings["connections_limit"] == p2p.DEFAULT_MAX_CONNECTIONS + + def test_set_connections_limit_applies_live(self, backend, tmp_path): + backend.add_torrent(MAGNET, dest_dir=str(tmp_path / "staging")) + backend.set_connections_limit(333) + assert backend._ses.settings["connections_limit"] == 333 + + def test_apply_session_limits_pushes_current_cap( + self, backend, tmp_path, monkeypatch + ): + # apply_session_limits() reads the configured cap and pushes it to the + # already-running backend (peek_backend, not get_backend). + backend.add_torrent(MAGNET, dest_dir=str(tmp_path / "staging")) + monkeypatch.setattr(p2p, "peek_backend", lambda: backend) + monkeypatch.setattr(p2p, "_prefs_path", None) + monkeypatch.setenv("ZIMI_BT", "on,conns=777") + p2p.apply_session_limits() + assert backend._ses.settings["connections_limit"] == 777 + + def test_connections_limit_floor(self, backend, tmp_path): + backend.set_connections_limit(1) + assert backend._ses.settings["connections_limit"] == 10 + + class TestResume: def test_resume_round_trip(self, backend, tmp_path): tid = backend.add_torrent( diff --git a/tests/test_login_navigation.spec.mjs b/tests/test_login_navigation.spec.mjs index 32e8591f..5b43db55 100644 --- a/tests/test_login_navigation.spec.mjs +++ b/tests/test_login_navigation.spec.mjs @@ -13,7 +13,7 @@ // ZIM_DIR=/tmp/zimi-empty ZIMI_DATA_DIR=/tmp/zimi-auth ZIMI_MANAGE=1 \ // python3 -m zimi serve --port 8878 // Run: -// BASE_URL=http://localhost:8878 npx playwright test tests/test_login_navigation.spec.mjs +// BASE_URL=http://localhost:8878 npx playwright test --config=tests/playwright.config.mjs tests/test_login_navigation.spec.mjs import { test, expect } from '@playwright/test'; diff --git a/tests/test_p2p.py b/tests/test_p2p.py index 1d249963..904c9942 100644 --- a/tests/test_p2p.py +++ b/tests/test_p2p.py @@ -106,6 +106,70 @@ def test_staging_dir_override(monkeypatch): assert p2p.get_staging_dir("/data") == "/fast-ssd/zimi-tmp" +# ──────────────────────────────────────────────────────────────────────────── +# Concurrency + connection caps +# ──────────────────────────────────────────────────────────────────────────── + + +@pytest.fixture +def _clean_caps_env(monkeypatch): + for k in ("ZIMI_BT", "ZIMI_MAX_CONCURRENT_DOWNLOADS"): + monkeypatch.delenv(k, raising=False) + monkeypatch.setattr(p2p, "_prefs_path", None) + + +def test_max_active_downloads_default(_clean_caps_env): + assert p2p.get_max_active_downloads() == p2p.DEFAULT_MAX_ACTIVE_DOWNLOADS + assert p2p.is_max_active_downloads_env_locked() is False + + +def test_max_active_downloads_legacy_env_wins_and_locks(_clean_caps_env, monkeypatch): + monkeypatch.setenv("ZIMI_MAX_CONCURRENT_DOWNLOADS", "7") + assert p2p.get_max_active_downloads() == 7 + assert p2p.is_max_active_downloads_env_locked() is True + + +def test_max_active_downloads_bt_subkey(_clean_caps_env, monkeypatch): + monkeypatch.setenv("ZIMI_BT", "on,active=6") + assert p2p.get_max_active_downloads() == 6 + assert p2p.is_max_active_downloads_env_locked() is True + + +@pytest.mark.parametrize("raw,expected", [("0", 1), ("99", 20), ("x", 4)]) +def test_max_active_downloads_clamps(_clean_caps_env, monkeypatch, raw, expected): + monkeypatch.setenv("ZIMI_MAX_CONCURRENT_DOWNLOADS", raw) + assert p2p.get_max_active_downloads() == expected + + +def test_max_connections_default(_clean_caps_env): + assert p2p.get_bt_max_connections() == p2p.DEFAULT_MAX_CONNECTIONS + assert p2p.is_bt_max_connections_env_locked() is False + + +def test_max_connections_bt_subkey_wins_and_locks(_clean_caps_env, monkeypatch): + monkeypatch.setenv("ZIMI_BT", "on,conns=500") + assert p2p.get_bt_max_connections() == 500 + assert p2p.is_bt_max_connections_env_locked() is True + + +@pytest.mark.parametrize("raw,expected", [("5", 10), ("99999", 2000), ("x", 200)]) +def test_max_connections_clamps(_clean_caps_env, monkeypatch, raw, expected): + monkeypatch.setenv("ZIMI_BT", f"on,conns={raw}") + assert p2p.get_bt_max_connections() == expected + + +def test_caps_read_from_persisted_prefs(_clean_caps_env, monkeypatch, tmp_path): + prefs = tmp_path / "prefs.json" + monkeypatch.setattr(p2p, "_prefs_path", str(prefs)) + assert p2p.set_pref("max_active_downloads", 9) + assert p2p.set_pref("bt_max_connections", 321) + assert p2p.get_max_active_downloads() == 9 + assert p2p.get_bt_max_connections() == 321 + # A pref (no env) leaves the UI control unlocked. + assert p2p.is_max_active_downloads_env_locked() is False + assert p2p.is_bt_max_connections_env_locked() is False + + # ──────────────────────────────────────────────────────────────────────────── # get_backend() — fail-soft to None, else the libtorrent singleton # ──────────────────────────────────────────────────────────────────────────── diff --git a/tests/test_password_flow.mjs b/tests/test_password_flow.mjs index f19e2d2e..ed040fe6 100644 --- a/tests/test_password_flow.mjs +++ b/tests/test_password_flow.mjs @@ -1,6 +1,6 @@ // Password flow validation - run against a local server WITHOUT ZIMI_MANAGE_PASSWORD env var // Start: ZIM_DIR=/tmp/zimi-test-zims ZIMI_DATA_DIR=/tmp/zimi-test-data ZIMI_MANAGE=1 python3 -m zimi serve --port 8877 -// Run: BASE_URL=http://localhost:8877 npx playwright test tests/test_password_flow.mjs +// Run: BASE_URL=http://localhost:8877 npx playwright test --config=tests/playwright.config.mjs tests/test_password_flow.mjs import { test, expect } from '@playwright/test'; diff --git a/tests/test_private_mode_login.spec.mjs b/tests/test_private_mode_login.spec.mjs new file mode 100644 index 00000000..52dbc29c --- /dev/null +++ b/tests/test_private_mode_login.spec.mjs @@ -0,0 +1,161 @@ +// Private (sign-in-required) mode: the boot gate must paint the login form as +// its FIRST frame (no empty library-chrome flash), and a sign-in must STICK +// across a reload over plain http — for BOTH a named user (session cookie) and +// the admin (Bearer token in client storage). +// +// Regression (1.8.1 private-mode field test): +// 1. Empty home rendered before the 401/whoami swapped in the login overlay. +// 2. Admin login "wouldn't stick": /whoami was probed WITHOUT the admin's +// Bearer token, so the server saw anonymous+login_required and the client +// re-gated a just-signed-in admin on reload. (The user/cookie path stuck; +// the token-admin path did not.) +// +// Run against a private-mode server on plain http. Recommended engine: webkit +// (approximates private Safari, the reported environment). +// ZIM_DIR=./zims ZIMI_DATA_DIR=/tmp/zimi-private ZIMI_MANAGE=1 \ +// python3 -m zimi serve --port 8877 +// BASE_URL=http://localhost:8877 npx playwright test --project=webkit \ +// --config=tests/playwright.config.mjs tests/test_private_mode_login.spec.mjs + +import { test, expect } from '@playwright/test'; + +const BASE = process.env.BASE_URL || 'http://localhost:8877'; +const ADMIN_PW = 'adminpw'; +const USER = 'alice'; +const USER_PW = 'wonderland'; + +// Loopback is a private client, so it may set the password + seed a user while +// the instance is still passwordless/open, then flip to private mode. +test.beforeAll(async ({ request }) => { + await request.post(`${BASE}/manage/set-password`, { + headers: { 'Content-Type': 'application/json' }, + data: { password: ADMIN_PW }, + }); + const auth = { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer ' + ADMIN_PW, + }; + await request.post(`${BASE}/manage/users`, { + headers: auth, + data: { action: 'create', name: USER, password: USER_PW }, + }); + await request.post(`${BASE}/manage/public-access`, { + headers: auth, + data: { mode: 'private' }, + }); +}); + +// Sample every animation frame from first paint, recording whether library +// chrome (loading spinner / home output) is ever visible WITHOUT the opaque +// login gate covering the page — i.e. the "empty flash". +async function armFlashSampler(page) { + await page.addInitScript(() => { + window.__frames = []; + const snap = () => { + const out = document.getElementById('output'); + const gateCovering = !!document.querySelector('#pw-overlay.open') && + document.body.classList.contains('login-gate'); + const outLen = ((out && out.innerText) || '').trim().length; + window.__frames.push({ gateCovering, outLen, hasLoading: !!document.querySelector('.loading') }); + if (window.__frames.length < 300) requestAnimationFrame(snap); + }; + requestAnimationFrame(snap); + }); +} + +test('private boot paints the login form first — no empty library flash', async ({ page }) => { + await armFlashSampler(page); + await page.goto(BASE); + await page.waitForFunction(() => window._loginRequired === true, { timeout: 8000 }); + await expect(page.locator('#pw-overlay.open')).toBeVisible(); + const frames = await page.evaluate(() => window.__frames || []); + const flashes = frames.filter(f => (f.hasLoading || f.outLen > 0) && !f.gateCovering); + expect(flashes, 'library chrome must never paint before the gate covers it').toHaveLength(0); +}); + +test('named-user sign-in sticks across reload (session cookie, plain http)', async ({ page }) => { + await page.goto(BASE); + await page.waitForFunction(() => window._loginRequired === true, { timeout: 8000 }); + await page.fill('#pw-username', USER); + await page.fill('#pw-input', USER_PW); + await page.evaluate(() => submitPw()); + // submitPw reloads on a gate sign-in; wait until the gate is gone. + await expect.poll(() => page.evaluate(() => window._loginRequired), { timeout: 8000 }).toBeFalsy(); + await page.goto(BASE); // explicit reopen + await page.waitForFunction(() => typeof _loginRequired !== 'undefined', { timeout: 8000 }); + await page.waitForTimeout(500); + expect(await page.evaluate(() => window._loginRequired)).toBeFalsy(); + await expect(page.locator('#pw-overlay.open')).toHaveCount(0); +}); + +test('admin sign-in sticks across reload (Bearer token, not re-gated)', async ({ page }) => { + await page.goto(BASE); + await page.waitForFunction(() => window._loginRequired === true, { timeout: 8000 }); + await page.fill('#pw-username', 'admin'); + await page.fill('#pw-input', ADMIN_PW); + await page.evaluate(() => submitPw()); + await expect.poll(() => page.evaluate(() => window._loginRequired), { timeout: 8000 }).toBeFalsy(); + await page.goto(BASE); // reload: boot gate must recognise the token-admin + await page.waitForFunction(() => typeof _loginRequired !== 'undefined', { timeout: 8000 }); + await page.waitForTimeout(500); + expect(await page.evaluate(() => window._loginRequired)).toBeFalsy(); + await expect(page.locator('#pw-overlay.open')).toHaveCount(0); +}); + +// Read the server's identity + library-access as the CLIENT sees it right now, +// through the (SW-controlled) fetch path. This is the security contract that +// matters — not DOM text, which depends on how many ZIMs the fixture installs. +async function serverView(page) { + return page.evaluate(async () => { + const who = await (await fetch('/whoami', { credentials: 'same-origin' })).json(); + const listStatus = (await fetch('/list?layout=1', { credentials: 'same-origin' })).status; + return { role: who.role, listStatus }; + }); +} + +// BUG 2 (field): "Private mode I had to sign in twice and saw nothing still." +// A single sign-in must clear the gate AND leave the client authenticated with +// live library access. The root cause was the service worker serving a STALE +// anonymous /whoami after the post-login reload, which re-showed the gate and +// left the client seeing an anonymous (empty/401) library — see +// tests/test_sw_route_classification.py for the SW-level guard. +test('named-user sign-in authenticates on the FIRST try (no re-gate, live access)', async ({ page }) => { + await page.goto(BASE); + await page.waitForFunction(() => window._loginRequired === true, { timeout: 8000 }); + await page.fill('#pw-username', USER); + await page.fill('#pw-input', USER_PW); + await page.evaluate(() => submitPw()); + // Gate must clear and STAY clear — no second prompt. + await expect.poll(() => page.evaluate(() => window._loginRequired), { timeout: 8000 }).toBeFalsy(); + await page.waitForTimeout(500); + expect(await page.evaluate(() => window._loginRequired)).toBeFalsy(); + await expect(page.locator('#pw-overlay.open')).toHaveCount(0); + // The client is authenticated and the library is accessible — NOT the stale + // anonymous view the SW used to serve after the reload. + const view = await serverView(page); + expect(view.role).toBe('user'); + expect(view.listStatus).toBe(200); +}); + +// BUG 1 (field): "I set private access, logged out and saw everything." Logging +// out must return straight to the non-dismissible gate AND cut off library +// access. The bug was that logout dropped credentials but never re-ran the boot +// gate, so the full library the session had already loaded stayed on screen and +// the client still believed it was authorized. +test('logout in private mode returns to the gate and cuts off access', async ({ page }) => { + await page.goto(BASE); + await page.waitForFunction(() => window._loginRequired === true, { timeout: 8000 }); + await page.fill('#pw-username', USER); + await page.fill('#pw-input', USER_PW); + await page.evaluate(() => submitPw()); + await expect.poll(() => page.evaluate(() => window._loginRequired), { timeout: 8000 }).toBeFalsy(); + expect((await serverView(page)).role).toBe('user'); + // Log out (userLogout reloads); the boot gate must re-show the login overlay. + await page.evaluate(() => userLogout()); + await page.waitForFunction(() => window._loginRequired === true, { timeout: 8000 }); + await expect(page.locator('#pw-overlay.open')).toBeVisible(); + // Anonymous again: the server denies the library (401), and the client agrees. + const view = await serverView(page); + expect(view.role).toBe('anonymous'); + expect(view.listStatus).toBe(401); +}); diff --git a/tests/test_public_access.py b/tests/test_public_access.py new file mode 100644 index 00000000..852695c3 --- /dev/null +++ b/tests/test_public_access.py @@ -0,0 +1,673 @@ +"""Anonymous-access policy (1.8.1): open / limited / private. + +The public-access policy decides what an ANONYMOUS (not logged-in) visitor may +see. It reuses the multi-user allowlist machinery — anonymous simply gets an +allow-set instead of the all-access sentinel — so every existing choke point +(get_zim_files / list_zims / zim_allowed / search-cache key) filters it with no +new leak surface. This suite pins: + +- storage: default open, round-trip, env override, fail-closed on corruption +- request_allow per mode × identity (anonymous / admin / logged-in user) +- the private-mode request gate (login surface reachable, reads 401) +- leak checks under `limited`: the same choke points filter anonymous, and the + /languages- and almanac-style bypass paths (zim_allowed) stay filtered too +- admin endpoints: GET/POST /manage/public-access are admin-only and round-trip +""" + +import json +import os +import sys +import tempfile +import unittest +from types import SimpleNamespace + +sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +import zimi.server as _srv # noqa: E402 +from zimi import manage, users # noqa: E402 +from zimi.http import SESSION_COOKIE_MAX_AGE, ZimHandler # noqa: E402 + + +class _FakeHandler: + """Minimal ZimHandler stand-in: headers + client privacy + _json capture. + + Borrows the real cookie builders (they only read ``self.headers``) so paths + that Set-Cookie — the admin whoami/login — exercise the true header, and + records each emitted cookie in ``set_cookies`` for assertions.""" + + _session_cookie = ZimHandler._session_cookie + _expire_cookie = ZimHandler._expire_cookie + + def __init__(self, headers=None, private=True): + self.headers = headers or {} + self._private = private + self.responses = [] + self.set_cookies = [] + + def _is_private_client(self): + return self._private + + def _json(self, code, data): + self.responses.append((code, data)) + return None + + def _json_cookie(self, code, data, set_cookie): + self.set_cookies.append(set_cookie) + self.responses.append((code, data)) + return None + + @property + def last(self): + return self.responses[-1] if self.responses else None + + +def _bearer(token, user=None): + h = {"Authorization": "Bearer " + token} + if user is not None: + h["X-Zimi-User"] = user + return h + + +def _cookie(token): + return {"Cookie": "zimi_session=" + token} + + +def _gate(handler, path): + """Invoke the real private-mode gate against a fake handler.""" + return ZimHandler._private_access_block(handler, SimpleNamespace(path=path)) + + +class _AccessBase(unittest.TestCase): + def setUp(self): + self._tmp = tempfile.mkdtemp() + self._orig_data_dir = _srv.ZIMI_DATA_DIR + _srv.ZIMI_DATA_DIR = self._tmp + for var in ( + "ZIMI_MANAGE_PASSWORD", + "ZIMI_MANAGE_USER", + "ZIMI_API_TOKEN", + "ZIMI_PUBLIC_ACCESS", + ): + os.environ.pop(var, None) + manage._env_pw_hash_cache = None + _srv.clear_request_allow() + + def tearDown(self): + _srv.ZIMI_DATA_DIR = self._orig_data_dir + for var in ( + "ZIMI_MANAGE_PASSWORD", + "ZIMI_MANAGE_USER", + "ZIMI_API_TOKEN", + "ZIMI_PUBLIC_ACCESS", + ): + os.environ.pop(var, None) + manage._env_pw_hash_cache = None + _srv.clear_request_allow() + import shutil + + shutil.rmtree(self._tmp, ignore_errors=True) + + +# ── Storage: default, round-trip, env override, fail-closed ──────────────── + + +class TestPolicyStorage(_AccessBase): + def test_default_is_open_when_no_file(self): + # Legacy install: no access.json → open (whole library to anonymous). + mode, allow = users.get_public_access() + self.assertEqual(mode, "open") + self.assertEqual(allow, []) + + def test_set_and_get_limited_round_trip(self): + ok, err = users.set_public_access("limited", ["a", "b", "b"]) # de-dup + self.assertTrue(ok, err) + mode, allow = users.get_public_access() + self.assertEqual(mode, "limited") + self.assertEqual(sorted(allow), ["a", "b"]) + + def test_open_and_private_ignore_allowlist(self): + users.set_public_access("private", ["a", "b"]) + _, allow = users.get_public_access() + self.assertEqual(allow, []) # not stored for non-limited modes + + def test_invalid_mode_rejected(self): + ok, err = users.set_public_access("wideopen") + self.assertFalse(ok) + self.assertIn("mode", err) + + def test_env_override_wins_over_file(self): + users.set_public_access("open") + os.environ["ZIMI_PUBLIC_ACCESS"] = "private" + mode, _ = users.get_public_access() + self.assertEqual(mode, "private") + + def test_env_override_ignored_when_invalid(self): + users.set_public_access("limited", ["a"]) + os.environ["ZIMI_PUBLIC_ACCESS"] = "bogus" + mode, allow = users.get_public_access() + self.assertEqual(mode, "limited") + self.assertEqual(allow, ["a"]) + + def test_corrupt_file_fails_closed_to_private(self): + # A present-but-unreadable policy must NOT silently fall open. + with open(users._access_path(), "w", encoding="utf-8") as f: + f.write("{not valid json") + mode, _ = users.get_public_access() + self.assertEqual(mode, "private") + + def test_corrupt_file_with_env_open_respects_env(self): + # The admin's env escape hatch still works over a corrupt file. + with open(users._access_path(), "w", encoding="utf-8") as f: + f.write("garbage") + os.environ["ZIMI_PUBLIC_ACCESS"] = "open" + mode, _ = users.get_public_access() + self.assertEqual(mode, "open") + + def test_unknown_mode_in_file_fails_closed(self): + with open(users._access_path(), "w", encoding="utf-8") as f: + json.dump({"version": 1, "mode": "sideways"}, f) + mode, _ = users.get_public_access() + self.assertEqual(mode, "private") + + def test_status_surfaces_env_control(self): + users.set_public_access("limited", ["a"]) + os.environ["ZIMI_PUBLIC_ACCESS"] = "private" + st = users.public_access_status() + self.assertEqual(st["mode"], "private") # effective + self.assertEqual(st["stored_mode"], "limited") # what was saved + self.assertTrue(st["env_controlled"]) + self.assertEqual(st["env_mode"], "private") + + +# ── request_allow across mode × identity ─────────────────────────────────── + + +class TestRequestAllowByMode(_AccessBase): + def test_open_anonymous_all_access(self): + users.set_public_access("open") + self.assertIsNone(users.request_allow(_FakeHandler(private=False))) + + def test_limited_anonymous_gets_public_allowlist(self): + users.set_public_access("limited", ["a", "b"]) + # A non-private anonymous client (e.g. WAN visitor) is restricted. + allow = users.request_allow(_FakeHandler(private=False)) + self.assertEqual(allow, {"a", "b"}) + + def test_private_anonymous_gets_empty_set(self): + users.set_public_access("private") + allow = users.request_allow(_FakeHandler(private=False)) + self.assertEqual(allow, set()) # defence in depth; gate 401s first + + def test_admin_all_access_in_limited(self): + manage._set_manage_password("adminpw") + users.set_public_access("limited", ["a"]) + h = _FakeHandler(_bearer("adminpw"), private=False) + self.assertIsNone(users.request_allow(h)) + + def test_admin_all_access_in_private(self): + manage._set_manage_password("adminpw") + users.set_public_access("private") + h = _FakeHandler(_bearer("adminpw"), private=False) + self.assertIsNone(users.request_allow(h)) + + def test_logged_in_limited_user_unaffected_by_open_policy(self): + users.set_public_access("open") + users.create_user("Kid", "pw", allowlist=["x"], role="limited") + token = users.create_session("Kid") + allow = users.request_allow(_FakeHandler(_cookie(token))) + self.assertEqual(allow, {"x"}) + + def test_logged_in_user_own_allowlist_not_public_one(self): + # A logged-in user keeps THEIR allowlist even under limited public mode. + users.set_public_access("limited", ["public_only"]) + users.create_user("Kid", "pw", allowlist=["kid_only"], role="limited") + token = users.create_session("Kid") + allow = users.request_allow(_FakeHandler(_cookie(token))) + self.assertEqual(allow, {"kid_only"}) + + def test_all_access_user_stays_all_access_under_limited(self): + users.set_public_access("limited", ["a"]) + users.create_user("Grown", "pw", role="user") + token = users.create_session("Grown") + self.assertIsNone(users.request_allow(_FakeHandler(_bearer(token)))) + + +# ── Private-mode request gate ────────────────────────────────────────────── + + +class TestPrivateGate(_AccessBase): + def setUp(self): + super().setUp() + users.set_public_access("private") + + def test_login_surface_paths_pass(self): + for p in ( + "/", + "/whoami", + "/health", + "/login", + "/logout", + "/favicon.png", + "/static/app.js", + "/static/i18n/en.json", + "/manage/has-password", + ): + h = _FakeHandler(private=False) + self.assertFalse(_gate(h, p), p) + self.assertEqual(h.responses, [], p) + + def test_read_endpoints_blocked_for_anonymous(self): + # The full read/data surface, not a cherry-pick: every endpoint that can + # reveal library contents must 401 an anonymous visitor in private mode. + # A new read endpoint that isn't on the tiny login allowlist lands here + # automatically (the gate denies everything it doesn't explicitly permit). + for p in ( + "/search", + "/list", + "/read", + "/suggest", + "/w/wiki/Foo", + "/random", + "/chunks", + "/almanac-links", + "/languages", + "/article-languages", + "/snippet", + "/openapi.json", + ): + h = _FakeHandler(private=False) + self.assertTrue(_gate(h, p), p) + code, body = h.last + self.assertEqual(code, 401, p) + self.assertTrue(body.get("login_required"), p) + + def test_admin_bypasses_gate(self): + manage._set_manage_password("adminpw") + h = _FakeHandler(_bearer("adminpw"), private=False) + self.assertFalse(_gate(h, "/search")) + self.assertEqual(h.responses, []) + + def test_logged_in_user_bypasses_gate(self): + users.create_user("Kid", "pw", allowlist=["a"], role="limited") + token = users.create_session("Kid") + h = _FakeHandler(_cookie(token), private=False) + self.assertFalse(_gate(h, "/search")) + self.assertEqual(h.responses, []) + + def test_open_mode_never_gates(self): + users.set_public_access("open") + h = _FakeHandler(private=False) + self.assertFalse(_gate(h, "/search")) + + def test_limited_mode_never_gates(self): + # limited filters via the allow-set, it does NOT 401 — reads still work. + users.set_public_access("limited", ["a"]) + h = _FakeHandler(private=False) + self.assertFalse(_gate(h, "/search")) + + +# ── Leak checks under `limited`: anonymous is filtered by every choke point ─ + + +class TestLimitedLeakChecks(_AccessBase): + def setUp(self): + super().setUp() + _srv._zim_files_cache = {"a": "/z/a.zim", "b": "/z/b.zim", "c": "/z/c.zim"} + _srv._zim_list_cache = [ + {"name": "a", "entries": 500, "language": "en", "title": "Alpha"}, + {"name": "b", "entries": 500, "language": "en", "title": "Beta"}, + {"name": "c", "entries": 500, "language": "fr", "title": "Gamma"}, + ] + users.set_public_access("limited", ["a"]) + # Simulate the do_GET preamble: the request-allow context is set from the + # anonymous policy for a non-private (WAN) visitor. + self._allow = users.request_allow(_FakeHandler(private=False)) + _srv.set_request_allow(self._allow) + + def tearDown(self): + _srv._zim_files_cache = None + _srv._zim_list_cache = None + super().tearDown() + + def test_allow_set_is_public_allowlist(self): + self.assertEqual(self._allow, {"a"}) + + def test_get_zim_files_filtered(self): + self.assertEqual(set(_srv.get_zim_files()), {"a"}) + + def test_list_zims_filtered(self): + self.assertEqual({z["name"] for z in _srv.list_zims()}, {"a"}) + + def test_zim_allowed_bypass_paths_filtered(self): + # /languages, /article-languages and almanac-links go through zim_allowed + # rather than get_zim_files — assert they see the same filtered view. + self.assertTrue(_srv.zim_allowed("a")) + self.assertFalse(_srv.zim_allowed("b")) + self.assertFalse(_srv.zim_allowed("c")) + + def test_get_archive_fails_closed_for_forbidden(self): + _srv._archive_pool["b"] = object() + try: + self.assertIsNone(_srv.get_archive("b")) + finally: + _srv._archive_pool.pop("b", None) + + def test_shared_cache_not_mutated(self): + _srv.get_zim_files() + _srv.clear_request_allow() + self.assertEqual(set(_srv.get_zim_files()), {"a", "b", "c"}) + + +# ── Admin endpoints for the policy ───────────────────────────────────────── + + +class TestPublicAccessEndpoints(_AccessBase): + def setUp(self): + super().setUp() + manage._set_manage_password("adminpw") + _srv._zim_files_cache = {"a": "/z/a.zim", "b": "/z/b.zim"} + _srv._zim_list_cache = [ + {"name": "a", "language": "en", "title": "Alpha", "article_count": 10}, + {"name": "b", "language": "fr", "title": "Beta", "article_count": 20}, + ] + + def tearDown(self): + _srv._zim_files_cache = None + _srv._zim_list_cache = None + super().tearDown() + + def _admin(self): + return _FakeHandler(_bearer("adminpw"), private=False) + + def _post(self, data, path="/manage/public-access"): + h = self._admin() + manage.handle_manage_post(h, SimpleNamespace(path=path), data) + return h.last + + def _get(self, path="/manage/public-access"): + h = self._admin() + manage.handle_manage_get(h, SimpleNamespace(path=path), {}) + return h.last + + def test_get_returns_status_and_picker_options(self): + code, body = self._get() + self.assertEqual(code, 200) + self.assertEqual(body["public_access"]["mode"], "open") + opts = {o["name"]: o for o in body["zim_options"]} + self.assertEqual(opts["a"]["title"], "Alpha") + self.assertEqual(opts["a"]["language"], "en") + self.assertEqual(opts["a"]["article_count"], 10) + + def test_post_sets_limited_and_persists(self): + code, body = self._post({"mode": "limited", "allowlist": ["a"]}) + self.assertEqual(code, 200) + self.assertEqual(body["public_access"]["mode"], "limited") + self.assertEqual(body["public_access"]["allowlist"], ["a"]) + # Persisted to disk. + self.assertEqual(users.get_public_access()[0], "limited") + + def test_post_invalid_mode_rejected(self): + code, _ = self._post({"mode": "everything"}) + self.assertEqual(code, 400) + + def test_users_get_includes_policy_and_options(self): + users.set_public_access("limited", ["b"]) + code, body = self._get("/manage/users") + self.assertEqual(code, 200) + self.assertEqual(body["public_access"]["mode"], "limited") + self.assertIn("zim_options", body) + + def test_endpoints_reject_non_admin_user(self): + users.create_user("Kid", "pw", allowlist=["a"], role="limited") + token = users.create_session("Kid") + h = _FakeHandler(_bearer(token, "Kid"), private=False) + manage.handle_manage_post( + h, SimpleNamespace(path="/manage/public-access"), {"mode": "open"} + ) + code, _ = h.last + self.assertEqual(code, 401) + # The policy never changed. + self.assertEqual(users.get_public_access()[0], "open") + + def test_get_rejects_non_admin_user(self): + users.create_user("Kid", "pw", allowlist=["a"], role="limited") + token = users.create_session("Kid") + h = _FakeHandler(_bearer(token, "Kid"), private=False) + manage.handle_manage_get(h, SimpleNamespace(path="/manage/public-access"), {}) + code, _ = h.last + self.assertEqual(code, 401) + + +# ── Session-cookie attributes (login persistence over plain http) ────────── + + +class TestSessionCookieAttributes(_AccessBase): + """The ``zimi_session`` cookie carries ``Secure`` ONLY behind an HTTPS proxy. + + A LAN instance is plain http, and a browser silently DROPS a ``Secure`` + cookie set over http:// — so gating Secure on the forwarded proto is what + lets a login stick on the LAN. ``HttpOnly`` + ``SameSite=Lax`` are always + present; ``Max-Age`` appears only when 'remember' is set (else it is a + session cookie the browser clears on close). + """ + + def _cookie(self, remember, proto=None): + headers = {} + if proto is not None: + headers["X-Forwarded-Proto"] = proto + h = _FakeHandler(headers, private=False) + return ZimHandler._session_cookie(h, "TOK", remember) + + def test_plain_http_omits_secure(self): + parts = self._cookie(remember=True).split("; ") + self.assertNotIn("Secure", parts) + self.assertIn("HttpOnly", parts) + self.assertIn("SameSite=Lax", parts) + self.assertEqual(parts[0], "zimi_session=TOK") + + def test_https_proxy_sets_secure(self): + parts = self._cookie(remember=True, proto="https").split("; ") + self.assertIn("Secure", parts) + + def test_https_proto_case_insensitive(self): + self.assertIn("Secure", self._cookie(remember=True, proto="HTTPS").split("; ")) + + def test_http_forwarded_proto_no_secure(self): + # An explicit ``http`` forwarded proto (proxy that terminates TLS + # elsewhere but forwards http to us) must NOT set Secure. + self.assertNotIn( + "Secure", self._cookie(remember=True, proto="http").split("; ") + ) + + def test_remember_sets_max_age(self): + self.assertIn( + "Max-Age=" + str(SESSION_COOKIE_MAX_AGE), self._cookie(remember=True) + ) + + def test_no_remember_is_session_cookie(self): + self.assertNotIn("Max-Age", self._cookie(remember=False)) + + def test_expire_cookie_clears_with_max_age_zero(self): + c = ZimHandler._expire_cookie(_FakeHandler()) + self.assertIn("zimi_session=;", c) + self.assertIn("Max-Age=0", c) + + +# ── whoami recognises a token-authed admin (client boot-gate contract) ────── + + +class TestWhoamiAdminToken(_AccessBase): + """The admin's credential is a Bearer token, not the session cookie the + named-user path rides on. In private mode the boot gate sends that token on + /whoami; the server MUST answer role=admin (never anonymous+login_required), + or a just-signed-in admin gets bounced back to the login screen on reload. + """ + + def setUp(self): + super().setUp() + self._orig_manage = _srv.ZIMI_MANAGE + _srv.ZIMI_MANAGE = True + manage._set_manage_password("adminpw") + users.set_public_access("private") + + def tearDown(self): + _srv.ZIMI_MANAGE = self._orig_manage + super().tearDown() + + def test_admin_bearer_token_resolves_to_admin(self): + h = _FakeHandler(_bearer("adminpw"), private=False) + ZimHandler._handle_whoami(h) + code, body = h.last + self.assertEqual(code, 200) + self.assertEqual(body.get("role"), "admin") + self.assertNotIn("login_required", body) + + def test_anonymous_gets_login_required(self): + h = _FakeHandler({}, private=False) + ZimHandler._handle_whoami(h) + code, body = h.last + self.assertEqual(code, 200) + self.assertEqual(body.get("role"), "anonymous") + self.assertTrue(body.get("login_required")) + + +# ── Admin session cookie: the header-less-transport fix ──────────────────── + + +class TestAdminSessionToken(_AccessBase): + """The primary admin authenticates with a password Bearer, but the reader + iframe (/w/) and the plain-fetch data endpoints (/list, /search) send NO + Authorization header — only cookies. Without an admin session cookie a + private/limited-mode admin loaded an EMPTY library and blank article iframes + (the 1.8.1 ship blocker). create_admin_session mints an HttpOnly cookie that + _primary_admin_authorized accepts on both transports.""" + + def setUp(self): + super().setUp() + self._orig_manage = _srv.ZIMI_MANAGE + _srv.ZIMI_MANAGE = True + manage._set_manage_password("adminpw") + + def tearDown(self): + _srv.ZIMI_MANAGE = self._orig_manage + super().tearDown() + + # --- session primitives --- + def test_admin_session_recognised(self): + tok = users.create_admin_session() + self.assertTrue(users.is_admin_session(tok)) + + def test_admin_session_fails_closed_on_junk(self): + self.assertFalse(users.is_admin_session("")) + self.assertFalse(users.is_admin_session(None)) + self.assertFalse(users.is_admin_session("not-a-real-token")) + + def test_admin_session_is_not_a_named_user(self): + # An admin session must never resolve as a user (no allowlist confusion). + tok = users.create_admin_session() + self.assertIsNone(users.resolve_session(tok)) + self.assertIsNone(users.resolve_request_user(_FakeHandler(_cookie(tok)))) + + def test_user_session_is_not_an_admin_session(self): + users.create_user("Kid", "pw", allowlist=["x"], role="limited") + tok = users.create_session("Kid") + self.assertFalse(users.is_admin_session(tok)) + + # --- transport: cookie-only requests resolve as admin --- + def test_cookie_only_request_is_primary_admin(self): + tok = users.create_admin_session() + h = _FakeHandler(_cookie(tok), private=False) # NO Authorization header + self.assertTrue(manage._primary_admin_authorized(h)) + self.assertIsNone(manage._check_manage_auth(h)) + self.assertEqual(manage.admin_kind(h), "primary") + + def test_bearer_admin_session_token_also_works(self): + tok = users.create_admin_session() + h = _FakeHandler(_bearer(tok), private=False) + self.assertTrue(manage._primary_admin_authorized(h)) + + # --- the actual bug: admin sees the full library on data endpoints --- + def test_private_admin_cookie_sees_all(self): + users.set_public_access("private") + tok = users.create_admin_session() + h = _FakeHandler(_cookie(tok), private=False) + self.assertIsNone(users.request_allow(h)) # all-access, not empty set + + def test_limited_admin_cookie_sees_all(self): + users.set_public_access("limited", ["a"]) + tok = users.create_admin_session() + h = _FakeHandler(_cookie(tok), private=False) + self.assertIsNone(users.request_allow(h)) # not just {"a"} + + # --- the second transport gap: the /w/ iframe gate lets the admin in --- + def test_private_gate_passes_admin_cookie_iframe(self): + users.set_public_access("private") + tok = users.create_admin_session() + h = _FakeHandler(_cookie(tok), private=False) + # A /w/ content request carries only the cookie; the gate must NOT 401. + self.assertFalse(_gate(h, "/w/wikipedia/A/Some_Article")) + + def test_private_gate_still_401s_anonymous_iframe(self): + # Regression guard: the fix must not open the gate for anonymous. + users.set_public_access("private") + h = _FakeHandler({}, private=False) + self.assertTrue(_gate(h, "/w/wikipedia/A/Some_Article")) + self.assertEqual(h.last[0], 401) + + # --- login/logout wiring --- + def test_admin_login_sets_httponly_session_cookie(self): + users.set_public_access("private") + h = _FakeHandler({}, private=False) + ZimHandler._handle_login( + h, {"username": "admin", "password": "adminpw", "remember": False} + ) + code, body = h.last + self.assertEqual(code, 200) + self.assertEqual(body.get("role"), "admin") + self.assertTrue(h.set_cookies, "admin login must Set-Cookie") + cookie = h.set_cookies[-1] + self.assertIn("zimi_session=", cookie) + self.assertIn("HttpOnly", cookie) + # And that cookie authenticates a subsequent cookie-only request. + tok = cookie.split("zimi_session=", 1)[1].split(";", 1)[0] + self.assertTrue(users.is_admin_session(tok)) + + def test_whoami_mints_cookie_for_bearer_admin_without_one(self): + users.set_public_access("private") + h = _FakeHandler(_bearer("adminpw"), private=False) + ZimHandler._handle_whoami(h) + self.assertEqual(h.last[1].get("role"), "admin") + self.assertTrue(h.set_cookies, "whoami must mint an admin cookie") + tok = h.set_cookies[-1].split("zimi_session=", 1)[1].split(";", 1)[0] + self.assertTrue(users.is_admin_session(tok)) + + def test_whoami_does_not_remint_when_cookie_present(self): + users.set_public_access("private") + tok = users.create_admin_session() + headers = {"Authorization": "Bearer adminpw", "Cookie": "zimi_session=" + tok} + h = _FakeHandler(headers, private=False) + ZimHandler._handle_whoami(h) + self.assertEqual(h.last[1].get("role"), "admin") + self.assertFalse(h.set_cookies, "no re-mint when a live admin cookie exists") + + def test_password_rotation_revokes_admin_sessions(self): + # An old admin cookie must NOT outlive a password change — the pre-cookie + # model (Bearer == password) revoked instantly; this preserves that. + tok = users.create_admin_session() + self.assertTrue(users.is_admin_session(tok)) + manage._set_manage_password("newpw") + self.assertFalse(users.is_admin_session(tok)) + + def test_logout_drops_admin_session_server_side(self): + tok = users.create_admin_session() + self.assertTrue(users.is_admin_session(tok)) + h = _FakeHandler(_cookie(tok), private=False) + ZimHandler._handle_logout(h) + self.assertFalse( + users.is_admin_session(tok) + ) # dropped, not just expired client-side + self.assertIn("Max-Age=0", h.set_cookies[-1]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_reader3.spec.mjs b/tests/test_reader3.spec.mjs index 424b9b6f..81bb4a01 100644 --- a/tests/test_reader3.spec.mjs +++ b/tests/test_reader3.spec.mjs @@ -7,7 +7,7 @@ // Start a server first (uses the bundled devdocs ZIM): // ZIM_DIR=./zims python3 -m zimi serve --port 8877 // Run: -// BASE_URL=http://localhost:8877 npx playwright test tests/test_reader3.spec.mjs +// BASE_URL=http://localhost:8877 npx playwright test --config=tests/playwright.config.mjs tests/test_reader3.spec.mjs import { test, expect } from '@playwright/test'; diff --git a/tests/test_snippet_boilerplate.py b/tests/test_snippet_boilerplate.py new file mode 100644 index 00000000..4f9b5498 --- /dev/null +++ b/tests/test_snippet_boilerplate.py @@ -0,0 +1,118 @@ +"""Tests for snippet boilerplate-skip (previews.extract_snippet). + +iFixit device pages bake one repeated (a featured-guide +blurb) into every page. extract_snippet must prefer the page's own summary +block over that boilerplate, without regressing ZIM types whose meta +description IS the right snippet (wikipedia/gutenberg/ted-style). + +Fixtures are trimmed to the load-bearing structure of the real iFixit ZIM +markup fetched from the NAS (banner-blurb / itemprop="description" span, with +the wrong SSD meta description in ). +""" + +import os +import sys + +sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from zimi.previews import extract_snippet # noqa: E402 + +# Real iFixit device-page shape (trimmed). The is the +# repeated featured-guide boilerplate; the banner-blurb span is the truth. +IFIXIT_AMERIWATER = """ +Paris (French pronunciation) is the capital of France.
""" + snip = extract_snippet(html, "wikipedia_en_all") + assert snip == "Paris is the capital and most populous city of France." + + +def test_og_description_variant_used(): + html = """""" + snip = extract_snippet(html, "ted_en") + assert snip == "A talk about the future of biology and life." + + +def test_gutenberg_meta_description_used(): + html = """ + """ + snip = extract_snippet(html, "gutenberg_en") + assert "Pride and Prejudice" in snip + + +def test_no_meta_falls_back_to_main_body_skipping_nav(): + html = """ + +Table of contents Introduction Steps Comments
+ - Quote text
- Attribution
- blocks that contain nested
- tag
- quote_html = re.sub(r'^\s*
- for author name, fall back to page title.
- if tilde_author and 2 < len(tilde_author) < 60 and re.match(r'^[A-Z]', tilde_author):
+ if (
+ tilde_author
+ and 2 < len(tilde_author) < 60
+ and re.match(r"^[A-Z]", tilde_author)
+ ):
result["attribution"] = tilde_author[:100]
break
page_title = result.get("title") or entry_title
@@ -203,27 +328,36 @@ def _extract_preview_wikiquote(html_str, result, entry_title):
# Fallback: if
- parsing found nothing, try
- blocks or
- after "Quotes" heading if not result.get("blurb"): # Try
', quotes_section.group(1), re.DOTALL): + for li_m in re.finditer( + r"- blocks (definition list format used on some wikiquote pages) - for dd_m in re.finditer(r'
- (.*?)
', html_str, re.DOTALL): + for dd_m in re.finditer(r"- (.*?)
", html_str, re.DOTALL): dd_text = strip_html(dd_m.group(1)).strip() if 30 < len(dd_text) < 400 and _is_real_quote(dd_text): - if not dd_text.startswith(("Category:", "See also", "External", "Retrieved", "Source")): + if not dd_text.startswith( + ("Category:", "See also", "External", "Retrieved", "Source") + ): result["blurb"] = "\u201c" + dd_text[:250] + "\u201d" _pg = result.get("title") or entry_title - if ' ' in _pg and re.match(r'^[A-Z][a-z]+ [A-Z]', _pg): + if " " in _pg and re.match(r"^[A-Z][a-z]+ [A-Z]", _pg): result["attribution"] = _pg break if not result.get("blurb"): # Try text after a "Quotes" section heading - quotes_section = re.search(r'- (.*?)
", quotes_section.group(1), re.DOTALL + ): li_text = strip_html(li_m.group(1)).strip() if 30 < len(li_text) < 400 and _is_real_quote(li_text): - if not li_text.startswith(("Category:", "See also", "External", "Retrieved")): + if not li_text.startswith( + ("Category:", "See also", "External", "Retrieved") + ): result["blurb"] = "\u201c" + li_text[:250] + "\u201d" _pg = result.get("title") or entry_title - if ' ' in _pg and re.match(r'^[A-Z][a-z]+ [A-Z]', _pg): + if " " in _pg and re.match(r"^[A-Z][a-z]+ [A-Z]", _pg): result["attribution"] = _pg break @@ -237,21 +371,32 @@ def _extract_preview_ted(html_str, archive, zim_name, path, result): """ speaker = None last_name = None - sp_m = re.search(r'with alt/src containing "flag" - for flag_m in re.finditer(r'
/
or '234' for
/
/
. Populates result["part_of_speech"], result["blurb"], result["boring"] in place. """ - pos_pattern = r'
- — skip boring inflected forms - _boring_def = re.compile(r'^(plural of |third-person |simple past |past participle |present participle |alternative |archaic |obsolete |misspelling |eye dialect |nonstandard )', re.IGNORECASE) - for def_m in re.finditer(r'
', section_html, re.DOTALL): + _boring_def = re.compile( + r"^(plural of |third-person |simple past |past participle |present participle |alternative |archaic |obsolete |misspelling |eye dialect |nonstandard )", + re.IGNORECASE, + ) + for def_m in re.finditer( + r" ", section_html, re.DOTALL
+ ):
def_text = strip_html(def_m.group(1)).strip()
- def_text = re.split(r'\n', def_text)[0].strip()
- if len(def_text) > 5 and not def_text.startswith(('Category:', 'See also')):
+ def_text = re.split(r"\n", def_text)[0].strip()
+ if len(def_text) > 5 and not def_text.startswith(("Category:", "See also")):
if _boring_def.match(def_text):
result["boring"] = True # signal to retry
else:
@@ -417,11 +612,13 @@ def _extract_preview_wiktionary(html_str, zim_name, result):
if eng_m:
# Slice from English header to next - blocks or
-
- _extract_wiktionary_pos_and_def(eng_section, result, '34')
+ _extract_wiktionary_pos_and_def(eng_section, result, "34")
else:
# No
— could be Simple Wiktionary (monolingual, no language headers) # or a non-English entry. Check if page has any
- definitions.
@@ -430,11 +627,16 @@ def _extract_preview_wiktionary(html_str, zim_name, result):
# Simple Wiktionary: treat entire page as English content
eng_section = html_str[:30000]
# Part of speech: Simple Wiktionary uses
for POS (not nested under language) - _extract_wiktionary_pos_and_def(eng_section, result, '234') + _extract_wiktionary_pos_and_def(eng_section, result, "234") if not result.get("part_of_speech"): # Try inline pattern: (noun), (verb), etc. - pos_inline = re.search(r'\((\w+)\)', eng_section[:3000]) - if pos_inline and pos_inline.group(1).lower() in ('noun', 'verb', 'adjective', 'adverb'): + pos_inline = re.search(r"\((\w+)\)", eng_section[:3000]) + if pos_inline and pos_inline.group(1).lower() in ( + "noun", + "verb", + "adjective", + "adverb", + ): result["part_of_speech"] = pos_inline.group(1).capitalize() else: # Full Wiktionary, no English section — flag for the random endpoint to skip @@ -456,8 +658,11 @@ def _extract_preview_blurb(html_str): if m and len(m.group(1).strip()) > 20: return html.unescape(m.group(1).strip())[:200] # First substantial
text (skip tiny nav/footer paragraphs and boilerplate) - _skip_blurb = re.compile(r'(Creative Commons|This work is licensed|free to copy and share|All rights reserved|Copyright \d|DMCA)', re.IGNORECASE) - for pm in re.finditer(r'
', html_str, re.DOTALL | re.IGNORECASE): + _skip_blurb = re.compile( + r"(Creative Commons|This work is licensed|free to copy and share|All rights reserved|Copyright \d|DMCA)", + re.IGNORECASE, + ) + for pm in re.finditer(r"or og:title if entry.title is a slug -- @@ -597,6 +816,8 @@ def _extract_preview(archive, zim_name, path): # -- Generic thumbnail fallback -- if not result["thumbnail"]: - result["thumbnail"] = _extract_preview_thumbnail(html_str, archive, zim_name, path) + result["thumbnail"] = _extract_preview_thumbnail( + html_str, archive, zim_name, path + ) return result diff --git a/zimi/search.py b/zimi/search.py index ebfd8a4e..3d5b8cc0 100644 --- a/zimi/search.py +++ b/zimi/search.py @@ -1158,7 +1158,33 @@ def _dedup_results_by_title(results): # is at least this many times more common — Norvig-style confidence that lets # us fix a typo that itself snuck into the vocab (e.g. a misspelled title) # without ever touching a genuinely common word. -_VOCAB_MAX_WORDS = 200_000 # cap on distinct vocabulary words held in memory +# Peak in-memory ceiling on distinct words held DURING the build (not the +# size of what's persisted — see _VOCAB_MAX_PERSIST_WORDS). The whole library +# holds ~6M distinct sampled tokens (measured), the vast majority count==1 +# junk from huge Q&A/dictionary indexes. This cap is a memory guard, not an +# early-stop: hitting it triggers a non-terminating tiered eviction (see +# _evict_to_free) that frees room and lets the scan CONTINUE through every +# remaining index, instead of the old 200k cap that saturated after ~3 of 68 +# files and froze the scan — which is exactly why spread-thin words like +# "mitochondria" and "photosynthesis" never made it in. 4M keeps peak build +# RSS around ~600MB, comfortable inside the 4GB container alongside the live +# server. +_VOCAB_MAX_WORDS = 4_000_000 +# Safety ceiling on the PERSISTED vocab (and the in-memory dict the corrector +# uses). After the scan, singletons are pruned; only if MORE than this many +# count>=2 words remain are the top-K by frequency kept. Sized so it does NOT +# bite for a normal library — the measured 53-file/16.8GB NAS keeps ~1.26M +# count>=2 words (a ~19MB cache), all retained — so every word appearing even +# twice survives, honoring the "coverage grows with your title indexes" +# promise with room to spare (the old cache was 181k words / 2.4MB). The cap +# only guards against an unbounded dict on a pathologically large library; +# because it's frequency-ranked, high-count words are never the ones dropped. +_VOCAB_MAX_PERSIST_WORDS = 1_500_000 +# Highest count-tier _evict_to_free will sweep before giving up and freezing +# new admissions (it keeps counting/scanning either way). Singletons (tier 1) +# dominate the junk, so tier 1 almost always frees plenty; tiers 2-3 are a +# safety valve for pathological libraries. +_VOCAB_EVICT_MAX_TIER = 3 _VOCAB_MIN_WORD_LEN = 3 # ignore 1-2 char fragments (noise, not misspellings) # One-time ceiling on the lazy vocab scan when there's no usable cache on # disk (see _vocab_cache_load / _vocab_cache_save below). Generous on @@ -1182,24 +1208,54 @@ def _dedup_results_by_title(results): # file a real chance to be sampled and survive lossy-counting eviction. _VOCAB_MAX_ROWS_PER_FILE = 3_000_000 _VOCAB_FETCH_BATCH_SIZE = 5000 # sqlite fetchmany() page size during the scan -# Lossy-counting admission: when the word cap is hit, count==1 entries (the -# one-off proper nouns and IDs that dominate large title sets) are swept out -# to make room, and scanning continues — this is what lets genuinely common -# words admitted later in the scan still get counted, instead of the cap -# freezing on whichever words happened to appear first. If a sweep frees -# less than this fraction of the cap, the vocab has saturated (what's left -# is mostly count>=2) and the scan stops for good. +# When the peak word cap is hit, tiered eviction (see _evict_to_free) must +# free at least this fraction of the cap so the sweep is worth its O(N) scan +# and the vocab doesn't thrash — evicting a few thousand entries only to +# refill them a batch later. count==1 junk almost always clears far more than +# this; the fraction only decides how deep the tier escalation goes. _VOCAB_EVICT_MIN_FRACTION = 0.10 _VOCAB_CACHE_FILENAME = "dym_vocab.json" _VOCAB_CACHE_PATH = os.path.join(_srv.ZIMI_DATA_DIR, _VOCAB_CACHE_FILENAME) # Bump whenever the vocab-building algorithm changes in a way that makes an # on-disk cache from an older version invalid even though the underlying -# title indexes haven't changed — lossy-counting admission and stride -# sampling (see _vocab_stride) each changed which words a scan of the same -# files produces. Folded into _vocab_signature so a stale-algorithm cache is -# rebuilt transparently rather than loaded forever. -_VOCAB_BUILDER_VERSION = 3 -_DIST2_MAX_LEN = 7 # only try edit-distance-2 on words this short or shorter +# title indexes haven't changed — lossy-counting admission, stride sampling, +# and (v4) non-terminating tiered eviction + top-K persist each changed which +# words a scan of the same files produces. Folded into _vocab_signature so a +# stale-algorithm cache is rebuilt transparently rather than loaded forever. +# v4 is the release-note "coverage grows with your title indexes" rebuild: +# every production instance re-scans once on upgrade and picks up the +# previously-missing spread-thin words. +_VOCAB_BUILDER_VERSION = 4 +# Words this length or shorter get EXHAUSTIVE edit-distance-2 via _edits2 (the +# candidate set stays small enough to enumerate within budget). Longer words +# would blow the 50ms budget that way — a 13-char word generates ~450k +# distance-2 strings (~700ms) — so they go through the trigram index instead +# (see _trigram_dist2_candidates), which is how "fotosynthesis" reaches +# "photosynthesis" (distance 2, 14 chars) without enumerating its neighborhood. +_DIST2_MAX_LEN = 7 +# Long-word distance-2 correction. A character-trigram inverted index over the +# vocab turns "which vocab words are within edit distance 2 of this long typo?" +# into a bounded posting-list intersection instead of an unbounded edit-2 +# enumeration. Only words longer than the exhaustive path handles are indexed +# and corrected this way, so the two paths partition cleanly by length. +_TRIGRAM_MIN_LEN = _DIST2_MAX_LEN + 1 # 8 +# Trigrams appearing in more vocab words than this are dropped from a query's +# candidate gather — they're uninformative (every long word shares "ing", +# "tion", …) and their posting lists dominate the cost. Measured worst-case +# query stays ~15ms with this set. +_TRIGRAM_SKIP_POSTING = 15_000 +_TRIGRAM_MAX_SCAN = 40_000 # hard ceiling on postings walked per query (budget guard) +_TRIGRAM_MAX_VERIFY = 40 # edit-distance-verify only the N best trigram-overlap words +# Ceiling on how many long words go INTO the trigram index, decoupling +# long-word distance-2 latency from the size of the persisted vocab. The vocab +# can grow to _VOCAB_MAX_PERSIST_WORDS (cheap O(1) dist-1 coverage), but only +# the highest-count long words are indexed for dist-2 — a rare count==2 long +# word is almost never the right correction, yet each one lengthens the +# posting lists every query walks. Measured: ~284k long words on the real NAS +# library gives a ~31ms worst-case long-word query; leaving the index +# uncapped, a synthetic 1.3M-word vocab (~984k long words) pushed that to +# ~44ms. Capping here keeps the worst case flat as the library grows. +_TRIGRAM_MAX_INDEX_WORDS = 400_000 _DYM_ALPHABET = "abcdefghijklmnopqrstuvwxyz0123456789" _word_split_re = re.compile(r"[^a-z0-9]+") # Split a query into alternating [gap, word, gap, word, ...]; odd indices are @@ -1213,6 +1269,13 @@ def _dedup_results_by_title(results): _vocab = None # {word: count}; None until built, a dict once built (empty on failure) _vocab_lock = threading.Lock() _vocab_builder_thread = None # daemon thread building the vocab; test hook for .join() +# {trigram: [word, ...]} inverted index over the long (>= _TRIGRAM_MIN_LEN) +# words of _vocab, built by the same background worker right after the vocab is +# ready. None until then; long-word distance-2 correction is simply skipped +# while it's absent (fail-soft, like the vocab itself). Not persisted — it's +# cheap to rebuild (~2-3s) from the loaded vocab, so the cache format is +# unchanged. +_trigram_index = None def _ascii_fold(s): @@ -1227,15 +1290,61 @@ def _ascii_fold(s): def _evict_singleton_words(vocab): """Sweep-delete every count==1 entry from `vocab`, in place. - Returns the number removed. Used both mid-scan (lossy-counting admission - when the word cap is hit) and once at the end (final prune — singletons - are noise for correction and just bloat the persisted cache).""" + Returns the number removed. Used for the final prune — singletons are + noise for correction and just bloat the persisted cache.""" singles = [w for w, c in vocab.items() if c == 1] for w in singles: del vocab[w] return len(singles) +def _evict_to_free(vocab, min_free): + """Free at least `min_free` entries from a full vocab WITHOUT stopping the + scan, in place. Returns (removed, top_tier). + + Drops the lowest-count tier first (count==1 singletons — the one-off + proper nouns, IDs and typos that dominate huge Q&A/dictionary indexes), + escalating to count==2, ==3, … only when a tier doesn't free enough, + bounded by _VOCAB_EVICT_MAX_TIER. Unlike the old saturation-stop this is + NOT a signal to end the scan: the caller keeps reading every remaining + index afterward, so a word evicted here is simply re-admitted when it + recurs, and — critically — spread-thin words that only appear in + later-scanned indexes still get their chance. Singletons almost always + clear far more than min_free in one tier; escalation is a safety valve. + If even the top tier can't free enough, the caller freezes NEW admissions + but still finishes counting existing words and scanning the library.""" + removed = 0 + tier = 0 + while removed < min_free and tier < _VOCAB_EVICT_MAX_TIER: + tier += 1 + victims = [w for w, c in vocab.items() if c == tier] + for w in victims: + del vocab[w] + removed += len(victims) + return removed, tier + + +def _cap_vocab_to_top_k(vocab, k): + """Keep only the `k` highest-count words in `vocab`, in place. No-op when + the vocab already fits. Returns the number dropped. + + Bounds the persisted cache and load time without touching the words a user + is likely to type: correction candidates are generated by edit distance, + not looked up by rank, so dropping the long low-count tail costs coverage + only for words seen a mere handful of times library-wide. Ties at the + cutoff count are broken by the word text so the result is deterministic + (same indexes → same cache → stable signature).""" + if len(vocab) <= k: + return 0 + # Sort by (count desc, word asc); keep the first k. + keep = sorted(vocab.items(), key=lambda kv: (-kv[1], kv[0]))[:k] + dropped = len(vocab) - len(keep) + kept = dict(keep) + vocab.clear() + vocab.update(kept) + return dropped + + def _vocab_stride(conn, cap): """Row stride for near-uniform sampling of one title index. @@ -1263,25 +1372,30 @@ def _build_vocab(): """Scan the SQLite title indexes into a {word: count} vocabulary. Opens a FRESH connection per index (sqlite objects aren't shareable across - threads). Bounded three ways: a distinct-word cap, a per-file row cap, and - an overall wall-clock budget — whichever hits first stops that file (row - cap) or the whole scan (word cap / budget). Files are scanned largest-first - (by byte size) so the richest indexes (Wikipedia-scale) contribute first; - each file's rows are then STRIDE-SAMPLED (see _vocab_stride) rather than - read as a contiguous prefix, so the per-file row cap buys breadth across - the WHOLE file, not just its first N rows — a word occurring only - occasionally across a huge index still has a real chance to be sampled. - The word cap uses lossy-counting admission (see - _evict_singleton_words): hitting it triggers a singleton sweep rather - than freezing outright, so words seen later in the scan can still be - counted — a first-come cap otherwise fills entirely with one-off proper - nouns from a huge index before anything looks "common". A final sweep - after the whole scan drops any remaining singletons (noise for - correction, dead weight in the persisted cache). Returns whatever was - gathered (possibly empty). Never raises; a broken index is skipped. - Always logs the outcome at info level, including the empty case, so a - starved scan is visible in production rather than silently returning - nothing.""" + threads). Files are scanned largest-first (by byte size) so the richest + indexes contribute first if the wall-clock budget is ever hit; each file's + rows are STRIDE-SAMPLED (see _vocab_stride) rather than read as a + contiguous prefix, so the per-file row cap buys breadth across the WHOLE + file — a word occurring only occasionally across a huge index still has a + real chance to be sampled. + + The build is bounded by memory, not by a first-come word cap that stops + the scan. Hitting the peak word cap triggers NON-TERMINATING tiered + eviction (see _evict_to_free): the lowest count-tiers are swept to free + room and the scan keeps going through every remaining index. This is the + v4 fix for the coverage promise — the old design saturated a 200k cap + after ~3 of 68 files and froze, so spread-thin words ("mitochondria", + "photosynthesis") that only accumulate once the dictionary/encyclopedia + indexes are reached never made it in. Only if eviction genuinely can't + free room (a library of almost all high-count words) are NEW admissions + frozen — existing words keep counting and every file is still read. + + After the scan: singletons are pruned (noise for correction, dead weight + in the cache), then if more than _VOCAB_MAX_PERSIST_WORDS remain, only the + top-K by frequency are kept so the persisted cache and load time stay + bounded. Returns whatever was gathered (possibly empty). Never raises; a + broken index is skipped. Always logs the outcome at info level, including + the empty case, so a starved scan is visible in production.""" deadline = time.monotonic() + _VOCAB_BUILD_BUDGET_S vocab = {} index_dir = _TITLE_INDEX_DIR @@ -1297,9 +1411,15 @@ def _build_vocab(): total_files = len(fnames) files_scanned = 0 rows_scanned = 0 - at_cap = False + evictions = 0 + admissions_frozen = ( + False # set only if eviction can't free room; never stops the scan + ) + # At least 1 so a tiny cap (tests, degenerate libraries) still frees room + # rather than looping on a no-op sweep. + min_free = max(1, int(_VOCAB_MAX_WORDS * _VOCAB_EVICT_MIN_FRACTION)) for fname in fnames: - if at_cap or time.monotonic() > deadline: + if time.monotonic() > deadline: break db_path = os.path.join(index_dir, fname) try: @@ -1320,8 +1440,7 @@ def _build_vocab(): else: cur = conn.execute("SELECT title_lower FROM titles") while ( - not at_cap - and rows_this_file < _VOCAB_MAX_ROWS_PER_FILE + rows_this_file < _VOCAB_MAX_ROWS_PER_FILE and time.monotonic() <= deadline ): rows = cur.fetchmany(_VOCAB_FETCH_BATCH_SIZE) @@ -1338,12 +1457,16 @@ def _build_vocab(): continue if w in vocab: vocab[w] += 1 - elif not at_cap: + elif not admissions_frozen: vocab[w] = 1 if len(vocab) >= _VOCAB_MAX_WORDS: - freed = _evict_singleton_words(vocab) - if freed < _VOCAB_MAX_WORDS * _VOCAB_EVICT_MIN_FRACTION: - at_cap = True + freed, _tier = _evict_to_free(vocab, min_free) + evictions += 1 + # Couldn't free enough even at the top tier: + # stop admitting NEW words, but keep counting + # existing ones and scanning every file. + if freed < min_free: + admissions_frozen = True except Exception as e: log.debug("Vocab: scan failed for %s: %s", fname, e) finally: @@ -1356,16 +1479,20 @@ def _build_vocab(): pruned = _evict_singleton_words( vocab ) # final prune: singletons are noise, drop them + capped = _cap_vocab_to_top_k(vocab, _VOCAB_MAX_PERSIST_WORDS) log.info( - "Did-you-mean vocab: %d words (%d singletons pruned) from %d/%d index " - "files, %d rows (budget_hit=%s, at_cap=%s)", + "Did-you-mean vocab: %d words (%d singletons pruned, %d capped by top-K) " + "from %d/%d index files, %d rows (budget_hit=%s, evictions=%d, " + "admissions_frozen=%s)", len(vocab), pruned, + capped, files_scanned, total_files, rows_scanned, budget_hit, - at_cap, + evictions, + admissions_frozen, ) return vocab @@ -1455,6 +1582,7 @@ def _vocab_build_worker(): len(cached), _VOCAB_CACHE_PATH, ) + _rebuild_trigram_index(cached) return try: built = _build_vocab() @@ -1467,6 +1595,7 @@ def _vocab_build_worker(): sig = _vocab_signature(_TITLE_INDEX_DIR) if sig is not None: _vocab_cache_save(built, sig) + _rebuild_trigram_index(_vocab) def _ensure_vocab(): @@ -1504,11 +1633,12 @@ def _join_vocab_build(timeout=5.0): def _reset_vocab(): """Drop the cached vocabulary so the next call rebuilds. Tests only.""" - global _vocab, _vocab_builder_thread + global _vocab, _vocab_builder_thread, _trigram_index _join_vocab_build() # let any in-flight builder finish before we clear state with _vocab_lock: _vocab = None _vocab_builder_thread = None + _trigram_index = None def _edits1(word): @@ -1521,11 +1651,131 @@ def _edits1(word): return set(deletes + transposes + replaces + inserts) +def _trigrams(word): + """Set of character 3-grams in `word` (the whole word, itself for len<3).""" + if len(word) < 3: + return {word} + return {word[i : i + 3] for i in range(len(word) - 2)} + + +def _edit_distance_le2(a, b): + """Levenshtein distance between `a` and `b`, capped: returns the true + distance when it is <= 2, otherwise 3. Rows are computed with early-exit + once every cell exceeds 2, so this stays cheap for the long words the + trigram path verifies.""" + la, lb = len(a), len(b) + if abs(la - lb) > 2: + return 3 + prev = list(range(lb + 1)) + for i in range(1, la + 1): + cur = [i] + [0] * lb + row_best = i + ai = a[i - 1] + for j in range(1, lb + 1): + cost = 0 if ai == b[j - 1] else 1 + v = prev[j] + 1 + if cur[j - 1] + 1 < v: + v = cur[j - 1] + 1 + if prev[j - 1] + cost < v: + v = prev[j - 1] + cost + cur[j] = v + if v < row_best: + row_best = v + if row_best > 2: + return 3 + prev = cur + return prev[lb] if prev[lb] <= 2 else 3 + + +def _build_trigram_index(vocab): + """Inverted trigram index over the long words of `vocab`: {trigram:[word]}. + + Only words >= _TRIGRAM_MIN_LEN are indexed — shorter words are corrected by + exhaustive edit-distance-2 and never need this — and at most + _TRIGRAM_MAX_INDEX_WORDS of them, the highest-count ones, so query latency + stays flat as the vocab grows (see that constant). Posting lists hold the + same string objects that key `vocab` (references, not copies), so the index + adds only ~pointer-per-posting overhead. Returns the dict (possibly empty).""" + longs = [w for w in vocab if len(w) >= _TRIGRAM_MIN_LEN] + if len(longs) > _TRIGRAM_MAX_INDEX_WORDS: + # Keep the most frequent long words (count desc, word asc for a + # deterministic cutoff). + longs = sorted(longs, key=lambda w: (-vocab[w], w))[:_TRIGRAM_MAX_INDEX_WORDS] + idx = {} + for w in longs: + for g in _trigrams(w): + idx.setdefault(g, []).append(w) + return idx + + +def _rebuild_trigram_index(vocab): + """Build the trigram index from `vocab` and publish it. Fail-soft: any + error just leaves long-word distance-2 correction disabled (index None), + never raising into the background worker.""" + global _trigram_index + try: + idx = _build_trigram_index(vocab) if vocab else None + except Exception as e: + log.info("Did-you-mean trigram index: build failed: %s", e) + idx = None + with _vocab_lock: + _trigram_index = idx + if idx is not None: + log.info("Did-you-mean trigram index: %d trigrams over long words", len(idx)) + + +def _trigram_dist2_candidates(word, deadline=None): + """Vocab words within edit distance 2 of a long `word`, via the trigram + index. Returns only the CLOSEST such words (all at the minimum distance + found, which is <= 2), or [] if none / no index / word too short. + + Bounded for the 50ms budget: only selective trigrams are consulted (the + ultra-common ones are skipped), their posting lists are walked + shortest-first up to a hard scan ceiling, and edit distance is verified on + only the best-overlapping candidates.""" + idx = _trigram_index + if idx is None or len(word) < _TRIGRAM_MIN_LEN: + return [] + grams = [ + g for g in _trigrams(word) if 0 < len(idx.get(g, ())) <= _TRIGRAM_SKIP_POSTING + ] + grams.sort(key=lambda g: len(idx[g])) # most selective first + counts = {} + scanned = 0 + for g in grams: + posting = idx[g] + if scanned + len(posting) > _TRIGRAM_MAX_SCAN: + break + scanned += len(posting) + for w in posting: + counts[w] = counts.get(w, 0) + 1 + if deadline is not None and time.monotonic() > deadline: + break + if not counts or (deadline is not None and time.monotonic() > deadline): + return [] + ranked = sorted(counts, key=lambda w: counts[w], reverse=True)[:_TRIGRAM_MAX_VERIFY] + best_d = 3 + best = [] + for w in ranked: + if w == word: + continue + d = _edit_distance_le2(word, w) + if d < best_d: + best_d = d + best = [w] + elif d == best_d and d <= 2: + best.append(w) + return best if best_d <= 2 else [] + + def _best_correction(word, vocab, deadline=None, freq_ratio=None): """Best in-vocab correction for `word`, or None. Frequency breaks ties. - Distance-1 first; distance-2 only for short words (candidate set stays - bounded) and only if the time budget allows. + Distance-1 first, then distance-2 if the time budget allows: short words + (<= _DIST2_MAX_LEN) enumerate their full edit-2 neighborhood; longer words + use the trigram index instead (see _trigram_dist2_candidates), which keeps + long-word correction like "fotosynthesis" -> "photosynthesis" inside the + budget an exhaustive enumeration would blow. If `word` is itself in `vocab`, it's left alone UNLESS `freq_ratio` is given: then a same-or-lower-distance candidate must be at least @@ -1552,15 +1802,17 @@ def _pick(cands): picked = _pick(cands) if picked: return picked - if len(word) <= _DIST2_MAX_LEN and ( - deadline is None or time.monotonic() <= deadline - ): - cands2 = set() - for e1 in _edits1(word): - for e2 in _edits1(e1): - if e2 in vocab and e2 != word: - cands2.add(e2) - return _pick(cands2) + if deadline is None or time.monotonic() <= deadline: + if len(word) <= _DIST2_MAX_LEN: + cands2 = set() + for e1 in _edits1(word): + for e2 in _edits1(e1): + if e2 in vocab and e2 != word: + cands2.add(e2) + return _pick(cands2) + # Long word: trigram index returns only the closest (<=2) vocab words, + # so _pick's frequency tie-break chooses among equally-near candidates. + return _pick(_trigram_dist2_candidates(word, deadline)) return None @@ -2091,12 +2343,22 @@ def get_catalog(zim_name): docs = [] for doc in catalog: fps = doc.get("fp", []) + path = f"files/{fps[0]}" if fps else None + # Cheap size hint: the PDF entry's item.size is metadata (no decompress). + # Runs under _zim_lock (caller holds it) so touching libzim here is safe. + size = None + if path: + try: + size = archive.get_entry_by_path(path).get_item().size + except Exception: + size = None docs.append( { "title": doc.get("ti", "?"), "description": doc.get("dsc", ""), "author": doc.get("aut", ""), - "path": f"files/{fps[0]}" if fps else None, + "path": path, + "size": size, } ) return {"zim": zim_name, "documents": docs, "count": len(docs)} diff --git a/zimi/server.py b/zimi/server.py index 36e88ab7..afbdb674 100644 --- a/zimi/server.py +++ b/zimi/server.py @@ -87,7 +87,7 @@ # SSL context using certifi CA bundle (PyInstaller bundles lack system certs) SSL_CTX = ssl.create_default_context(cafile=certifi.where()) -ZIMI_VERSION = "1.8.0" +ZIMI_VERSION = "1.8.1" # Standing maintenance cadence: catalog TTL is 24h and UPnP leases are # 24h — run every 12h so both stay fresh at half-life. @@ -172,6 +172,9 @@ def _init_p2p_background(): from zimi import library as _lib _lib.resume_pending_downloads() + # Watcher that releases night-window-scheduled downloads when the + # window opens (no-op unless the user enabled download scheduling). + _lib.start_download_scheduler() # Mirror mode seeds the whole installed library; either way, # drop seeds whose file an update has replaced, and bring # session-resumed seeds under the CURRENT settings (a seed @@ -453,6 +456,11 @@ def _migrate_stray_torrent_files(): 50 * 1024 * 1024 ) # 50 MB — refuse to serve entries larger than this (prevents OOM) MAX_POST_BODY = 65536 # max bytes accepted in POST requests (64KB — handles ~500 URLs for batch resolve) +# Backup bundles and per-user data blobs (bookmarks/history/preferences) are the +# one class of POST that legitimately runs large — a full-server backup carries +# users, history and every per-user blob. They get their own ceiling so the tight +# 64 KB cap keeps guarding every other endpoint. +MAX_BACKUP_BODY = 8 * 1024 * 1024 # 8 MB — backup import + /userdata save _BYTES_PER_GB = 1024**3 @@ -653,6 +661,14 @@ def _load_history(): return [] +def _save_history(entries): + """Replace the persistent event history with ``entries`` (capped, newest + first). Used by the full-server backup restore. Thread-safe.""" + with _history_lock: + clean = [e for e in entries if isinstance(e, dict)][:_HISTORY_MAX] + _atomic_write_json(_history_file_path(), clean) + + def _append_history(event): """Append an event dict to persistent history. Thread-safe.""" with _history_lock: @@ -698,18 +714,25 @@ def _save_collections(data): # ── Library layout: per-ZIM category overrides + home section order (#37) ── # # Storage: ZIMI_DATA_DIR/library_layout.json — -# {"overrides": {"<zim name>": "<category>"}, "section_order": ["cat:<key>"|"col:<name>", ...]} +# {"overrides": {"<zim name>": "<category>"}, +# "section_order": ["cat:<key>"|"col:<name>"|"other", ...], +# "sections": ["<category name>", ...]} # Overrides win over the _categorize_zim heuristic; section_order drives the -# home page ordering (unlisted sections append in default order). Reads are -# public (ride /list); writes are auth-gated /manage endpoints. +# home page ordering (unlisted sections append in default order); `sections` +# holds user-declared empty categories that should be offered as Move-to targets +# and reorder rows before any ZIM lives in them. Reads are public (ride /list); +# writes are auth-gated /manage endpoints. _library_layout_lock = threading.Lock() #: Section-order keys are namespaced so categories and collections can share one #: ordered list without colliding (a collection named "Books" != category Books). -_SECTION_KEY_RE = re.compile(r"^(cat:|col:).+") +#: The bare `other` key is the reserved slot for the uncategorized catch-all, so +#: it can be ordered like any real section instead of being pinned last. +_SECTION_KEY_RE = re.compile(r"^(?:(?:cat:|col:).+|other)$") #: Defensive caps so a hostile/buggy client can't write an unbounded file. _LAYOUT_MAX_OVERRIDES = 5000 _LAYOUT_MAX_ORDER = 500 +_LAYOUT_MAX_SECTIONS = 200 _LAYOUT_STR_MAX = 128 @@ -721,11 +744,12 @@ def _library_layout_file_path(): def _load_library_layout(): """Load library layout from disk. Fail-soft to the empty default. - A missing or corrupt file must degrade to ``{"overrides": {}, "section_order": []}`` - rather than 500 /list — the whole home page renders from this, so a bad read - can never be allowed to blank the library. + A missing or corrupt file must degrade to the empty default + (``{"overrides": {}, "section_order": [], "sections": []}``) rather than 500 + /list — the whole home page renders from this, so a bad read can never be + allowed to blank the library. """ - empty = {"overrides": {}, "section_order": []} + empty = {"overrides": {}, "section_order": [], "sections": []} try: with open(_library_layout_file_path(), encoding="utf-8") as f: data = json.load(f) @@ -733,9 +757,11 @@ def _load_library_layout(): return empty overrides = data.get("overrides") order = data.get("section_order") + sections = data.get("sections") return { "overrides": overrides if isinstance(overrides, dict) else {}, "section_order": order if isinstance(order, list) else [], + "sections": sections if isinstance(sections, list) else [], } except FileNotFoundError: pass # fresh install — no layout yet @@ -1006,7 +1032,12 @@ def open_archive(path): return Archive(path) -from zimi.previews import strip_html, _extract_preview, _resolve_img_path # noqa: E402 +from zimi.previews import ( # noqa: E402 + strip_html, + _extract_preview, + _resolve_img_path, + extract_snippet, +) # ============================================================================ # ZIM Listing & Metadata Cache @@ -1628,6 +1659,13 @@ def main(): elif args.command == "desktop" or (args.command == "serve" and args.ui): try: + # The desktop entry-point lives in the repo's desktop/ dir (a sibling + # of this package), not on the default import path — add it first. + _desktop_dir = os.path.join( + os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "desktop" + ) + if _desktop_dir not in sys.path: + sys.path.insert(0, _desktop_dir) from zimi_desktop import main as desktop_main except ImportError: print( diff --git a/zimi/static/almanac-links.js b/zimi/static/almanac-links.js index 54871139..866ded10 100644 --- a/zimi/static/almanac-links.js +++ b/zimi/static/almanac-links.js @@ -359,6 +359,12 @@ 'russiaday': { q: 'Q1432329', en: 'Russia Day' }, 'unityday': { q: 'Q1355116', en: 'Unity Day (Russia)' }, + // ── Round-2 region-pack matches (1.8.1): pack labels that now resolve. ── + 'stbrigidsday': { q: 'Q376333', en: 'Imbolc' }, // IE — enwiki merges St Brigid's Day into Imbolc + 'blackconsciousnessday': { q: 'Q3082990', en: 'National Day of Zumbi and Black Consciousness' }, // BR + 'youthday_cn': { q: 'Q10881633', en: 'Youth Day (China)' }, + 'youthday_za': { q: 'Q946446', en: 'Youth Day' }, // ZA + // ── Worldwide observances (the base Gregorian set) ── 'epiphany': { q: 'Q61556', en: 'Epiphany' }, 'holocaustremembranceday': { q: 'Q152960', en: 'International Holocaust Remembrance Day' }, @@ -392,6 +398,32 @@ 'worldchildrensday': { q: 'Q37081', en: "Children's Day" }, 'humanrightsday': { q: 'Q206206', en: 'Human Rights Day' }, + // ── Round-2 base-observance matches (1.8.1): keys are _norm(label). ── + 'worldbrailleday': { q: 'Q11880318', en: 'World Braille Day' }, + 'internationaldayofeducation': { q: 'Q59530956', en: 'International Day of Education' }, + 'worldcancerday': { q: 'Q551942', en: 'World Cancer Day' }, + 'intldayofwomeninscience': { q: 'Q22084569', en: 'International Day of Women and Girls in Science' }, + 'worldwildlifeday': { q: 'Q15813320', en: 'World Wildlife Day' }, + 'internationaldayofhappiness': { q: 'Q5305947', en: 'International Day of Happiness' }, + 'worldpoetryday': { q: 'Q857171', en: 'World Poetry Day' }, + 'worldtheatreday': { q: 'Q2076105', en: 'World Theatre Day' }, + 'worldartday': { q: 'Q15725894', en: 'World Art Day' }, + 'internationaldanceday': { q: 'Q855927', en: 'International Dance Day' }, + 'worldpressfreedomday': { q: 'Q592588', en: 'World Press Freedom Day' }, + 'internationaldayoffamilies': { q: 'Q246959', en: 'International Day of Families' }, + 'worldbeeday': { q: 'Q47008694', en: 'World Bee Day' }, + 'worldrefugeeday': { q: 'Q757285', en: 'World Refugee Day' }, + 'worldmusicday': { q: 'Q1129327', en: 'F\u00eate de la Musique' }, + 'internationalfriendshipday': { q: 'Q14551661', en: 'Friendship Day' }, + 'internationalcatday': { q: 'Q25457495', en: 'International Cat Day' }, + 'worldhumanitarianday': { q: 'Q2723440', en: 'World Humanitarian Day' }, + 'internationaldogday': { q: 'Q113627236', en: 'International Dog Day' }, + 'internationaldayofsignlanguages': { q: 'Q47002373', en: 'International Day of Sign Languages' }, + 'worldteachersday': { q: 'Q864881', en: "World Teachers' Day" }, + 'worldtelevisionday': { q: 'Q2495614', en: 'World Television Day' }, + 'intldayofpersonswithdisabilities': { q: 'Q339544', en: "United Nations' International Day of Persons with Disabilities" }, + 'internationalvolunteerday': { q: 'Q490486', en: 'International Volunteer Day' }, + // ── Native-calendar observances beyond the base set (famous ones only) ── 'tubishvat': { q: 'Q748816', en: 'Tu BiShvat' }, 'lagbaomer': { q: 'Q748801', en: 'Lag BaOmer' }, @@ -589,8 +621,44 @@ 'rosetta:georgia-guidestones': { q: 'Q958391', en: 'Georgia Guidestones' } }; + // World-clock cities (1.8.1) — the fixed cities of the timezone grid + // (_TZ_CITIES in almanac.js), keyed 'city:<key>'. Q-IDs verified both + // directions against Wikidata (exact enwiki sitelink). Registered for the + // closed set now; like the drawn-only constellations they become live links + // once the clock render calls wrap('city:'+key, ...). + var CITIES = { + 'city:honolulu': { q: 'Q18094', en: 'Honolulu' }, + 'city:anchorage': { q: 'Q39450', en: 'Anchorage, Alaska' }, + 'city:los_angeles': { q: 'Q65', en: 'Los Angeles' }, + 'city:denver': { q: 'Q16554', en: 'Denver' }, + 'city:mexico_city': { q: 'Q1489', en: 'Mexico City' }, + 'city:chicago': { q: 'Q1297', en: 'Chicago' }, + 'city:new_york': { q: 'Q60', en: 'New York City' }, + 'city:buenos_aires': { q: 'Q1486', en: 'Buenos Aires' }, + 'city:sao_paulo': { q: 'Q174', en: 'S\u00e3o Paulo' }, + 'city:london': { q: 'Q84', en: 'London' }, + 'city:paris': { q: 'Q90', en: 'Paris' }, + 'city:lagos': { q: 'Q8673', en: 'Lagos' }, + 'city:cairo': { q: 'Q85', en: 'Cairo' }, + 'city:johannesburg': { q: 'Q34647', en: 'Johannesburg' }, + 'city:moscow': { q: 'Q649', en: 'Moscow' }, + 'city:tehran': { q: 'Q3616', en: 'Tehran' }, + 'city:dubai': { q: 'Q612', en: 'Dubai' }, + 'city:karachi': { q: 'Q8660', en: 'Karachi' }, + 'city:mumbai': { q: 'Q1156', en: 'Mumbai' }, + 'city:kathmandu': { q: 'Q3037', en: 'Kathmandu' }, + 'city:dhaka': { q: 'Q1354', en: 'Dhaka' }, + 'city:bangkok': { q: 'Q1861', en: 'Bangkok' }, + 'city:singapore': { q: 'Q334', en: 'Singapore' }, + 'city:shanghai': { q: 'Q8686', en: 'Shanghai' }, + 'city:tokyo': { q: 'Q1490', en: 'Tokyo' }, + 'city:adelaide': { q: 'Q5112', en: 'Adelaide' }, + 'city:sydney': { q: 'Q3130', en: 'Sydney' }, + 'city:auckland': { q: 'Q37100', en: 'Auckland' } + }; + var MAP = {}; - [PLANETS, PROBES, CONSTELLATIONS, SHOWERS, ECLIPSES, CALENDARS, ZODIAC, STARS, HOLIDAYS, TERMS, SEASONS, BELTS, EVENTS, MESSAGES] + [PLANETS, PROBES, CONSTELLATIONS, SHOWERS, ECLIPSES, CALENDARS, ZODIAC, STARS, HOLIDAYS, TERMS, SEASONS, BELTS, EVENTS, MESSAGES, CITIES] .forEach(function (group) { for (var k in group) if (group.hasOwnProperty(k)) MAP[k] = group[k]; }); // Register curated holidays under a "holiday:<norm>" key so wrapHoliday() can diff --git a/zimi/static/almanac-sky.js b/zimi/static/almanac-sky.js index b498c5d1..2d3eb112 100644 --- a/zimi/static/almanac-sky.js +++ b/zimi/static/almanac-sky.js @@ -75,6 +75,7 @@ function _skyFrame(now, lat, lon, cw, ch) { var moonPos0 = _moonPosition(now, lat, lon); var moonM0 = _moonPhase(now); var projStars = _projectStars(now, lat, lon, cw, ch); + var projField = _projectFieldStars(now, lat, lon, cw, ch); var altStr = sunPos.altitude.toFixed(1); var labelText = sunPos.altitude > 0 ? t('alm_sun') + ' ' + altStr + '°' @@ -84,7 +85,7 @@ function _skyFrame(now, lat, lon, cw, ch) { } else { labelText += ' · ' + t('alm_moon') + ' ' + t('alm_below_horizon'); } - return { sunPos: sunPos, moonData: { pos: moonPos0, phase: moonM0 }, projStars: projStars, labelText: labelText }; + return { sunPos: sunPos, moonData: { pos: moonPos0, phase: moonM0 }, projStars: projStars, projField: projField, labelText: labelText }; } // `animateMoon` -- true only for a repaint that reinitializes this same canvas @@ -116,7 +117,7 @@ function _initSkyScene(now, lat, lon, animateMoon) { _skyStartTime = ts; _skyState = { canvas: canvas, dpr: dpr, now: now, nowTime: now.getTime(), lat: lat, lon: lon, - sunPos: f.sunPos, moonData: f.moonData, projStars: f.projStars, labelText: f.labelText, + sunPos: f.sunPos, moonData: f.moonData, projStars: f.projStars, projField: f.projField, labelText: f.labelText, moonAnim: null }; if (priorMoon) _skyState.moonAnim = { from: priorMoon, to: f.moonData, start: ts, fromTime: priorTime, toTime: now.getTime() }; @@ -127,7 +128,7 @@ function _initSkyScene(now, lat, lon, animateMoon) { if (!s) return; var elapsed = (ts - _skyStartTime) / 1000; var moonNow = _skyMoonAt(s, ts); - _drawSkyScene(s.canvas, s.dpr, s.sunPos, s.now, s.lat, s.lon, elapsed, s.labelText, s.projStars, moonNow); + _drawSkyScene(s.canvas, s.dpr, s.sunPos, s.now, s.lat, s.lon, elapsed, s.labelText, s.projStars, moonNow, s.projField); // Drive the hero moon's time-travel sweep from this same loop (no second // rAF). Defined in almanac.js, which loads after this file. if (typeof _heroMoonTick === 'function') _heroMoonTick(ts); @@ -152,6 +153,7 @@ function _skySetInstant(now) { s.sunPos = f.sunPos; _skyMoonRetarget(s, f.moonData, performance.now(), fromTime, now.getTime()); s.projStars = f.projStars; + s.projField = f.projField; s.labelText = f.labelText; } @@ -212,6 +214,132 @@ var _STARS = [ [22.96,-29.62,1.16],[2.53,89.26,1.98],[2.12,23.46,2.00],[9.76,23.77,2.98] ]; +// Real background field — the naked-eye sky beyond the named catalog above. +// Bright-star catalogue (HYG v41), every star to magnitude 4.0, culled of the +// ~58 already in _STARS; each row is [RA hours, Dec degrees, magnitude, colour +// index]. Projected by the SAME horizon geometry as the named stars +// (_projectFieldStars) so the whole scene is astronomically real and drifts +// with time/location — this REPLACES the old procedural _ensureSkyBgStars +// filler, which had no real position and did not move with the sky. Colour +// index tints each star warm (high B–V) to blue-white (low B–V). +var _SKY_FIELD_STARS = [ + [1.63,-57.24,0.45,-0.16],[14.06,-60.37,0.61,-0.23],[9.22,-69.72,1.67,0.07],[22.14,-46.96,1.73,-0.07], + [8.16,-47.34,1.75,-0.14],[3.41,49.86,1.79,0.48],[18.40,-34.38,1.79,-0.03],[8.38,-59.51,1.86,1.20], + [5.99,44.95,1.90,0.08],[16.81,-69.03,1.91,1.45],[6.63,16.40,1.93,0.00],[8.75,-54.71,1.93,0.04], + [20.43,-56.74,1.94,-0.12],[9.46,-8.66,1.99,1.44],[0.73,-17.99,2.04,1.02],[18.92,-26.30,2.05,-0.13], + [14.11,-36.37,2.06,1.01],[0.14,29.09,2.07,-0.04],[1.16,35.62,2.07,1.58],[14.85,74.16,2.07,1.47], + [22.71,-46.88,2.07,1.61],[17.58,12.56,2.08,0.15],[3.14,40.96,2.09,-0.00],[2.06,42.33,2.10,1.37], + [12.69,-48.96,2.20,-0.02],[8.06,-40.00,2.21,-0.27],[9.28,-59.28,2.21,0.19],[15.58,26.71,2.22,0.03], + [9.13,-43.43,2.23,1.67],[17.94,51.49,2.24,1.52],[13.66,-53.47,2.29,-0.17],[14.70,-47.39,2.30,-0.15], + [14.59,-42.16,2.33,-0.16],[14.75,27.07,2.35,0.97],[21.74,9.88,2.38,1.52],[17.71,-39.03,2.39,-0.17], + [0.44,-42.31,2.40,1.08],[17.17,-15.72,2.43,0.06],[23.06,28.08,2.44,1.66],[7.40,-29.30,2.45,-0.08], + [21.31,62.59,2.45,0.26],[9.37,-55.01,2.47,-0.14],[23.08,15.21,2.49,-0.00],[3.04,4.09,2.54,1.63], + [16.62,-10.57,2.54,0.04],[13.93,-47.29,2.55,-0.18],[5.55,-17.82,2.58,0.21],[12.14,-50.72,2.58,-0.13], + [12.26,-17.54,2.58,-0.11],[19.04,-29.88,2.60,0.06],[15.28,-9.38,2.61,-0.07],[15.74,6.43,2.63,1.17], + [1.91,20.81,2.64,0.17],[5.66,-34.07,2.65,-0.12],[6.00,37.21,2.65,-0.08],[12.57,-23.40,2.65,0.89], + [13.91,18.40,2.68,0.58],[14.98,-43.13,2.68,-0.18],[4.95,33.17,2.69,1.49],[10.78,-49.42,2.69,0.90], + [12.62,-69.14,2.69,-0.18],[17.51,-37.30,2.70,-0.18],[7.29,-37.10,2.71,1.62],[18.35,-29.83,2.72,1.38], + [19.77,10.61,2.72,1.51],[16.24,-3.69,2.73,1.58],[16.40,61.51,2.73,0.91],[10.72,-64.39,2.74,-0.22], + [12.69,-1.45,2.74,0.37],[5.59,-5.91,2.75,-0.21],[13.34,-36.71,2.75,0.07],[14.85,-16.04,2.75,0.15], + [17.72,4.57,2.76,1.17],[5.13,-5.09,2.78,0.16],[16.50,21.49,2.78,0.95],[17.24,14.39,2.78,1.16], + [17.51,52.30,2.79,0.95],[15.59,-41.17,2.80,-0.22],[5.47,-20.76,2.81,0.81],[16.69,31.60,2.81,0.65], + [0.43,-77.25,2.82,0.62],[16.60,-28.22,2.82,-0.21],[18.47,-25.42,2.82,1.02],[0.22,15.18,2.83,-0.19], + [8.13,-24.30,2.83,0.46],[15.92,-63.43,2.83,0.32],[3.90,31.88,2.84,0.27],[17.42,-55.53,2.84,1.48], + [17.53,-49.88,2.84,-0.14],[3.79,24.11,2.85,-0.09],[13.04,10.96,2.85,0.93],[21.78,-16.13,2.85,0.18], + [1.98,-61.57,2.86,0.29],[6.38,22.51,2.87,1.62],[15.32,-68.68,2.87,0.01],[22.31,-60.26,2.87,1.39], + [2.97,-40.30,2.88,0.13],[19.16,-21.02,2.88,0.38],[7.45,8.29,2.89,-0.10],[12.93,38.32,2.89,-0.12], + [3.96,40.01,2.90,-0.20],[16.35,-25.59,2.90,0.30],[21.53,-5.57,2.90,0.83],[3.08,53.51,2.91,0.72], + [9.79,-65.07,2.92,0.27],[22.72,30.22,2.93,0.85],[6.83,-50.61,2.94,1.21],[12.50,-16.52,2.94,-0.01], + [22.10,-0.32,2.95,0.97],[3.97,-13.51,2.97,1.59],[5.63,21.14,2.97,-0.15],[18.10,-30.42,2.98,0.98], + [13.32,-23.17,2.99,0.92],[17.79,-40.13,2.99,0.51],[19.09,13.86,2.99,0.01],[2.16,34.99,3.00,0.14], + [11.16,44.50,3.00,1.14],[15.35,71.83,3.00,0.06],[16.86,-38.05,3.00,-0.20],[21.90,-37.36,3.00,-0.08], + [3.72,47.79,3.01,-0.12],[6.34,-30.06,3.02,-0.16],[7.05,-23.83,3.02,-0.08],[12.17,-22.62,3.02,1.33], + [5.03,43.82,3.03,0.54],[12.77,-68.11,3.04,-0.18],[14.53,38.31,3.04,0.19],[20.35,-14.78,3.05,0.79], + [6.73,25.13,3.06,1.38],[10.37,41.50,3.06,1.60],[19.21,67.66,3.07,0.99],[18.29,-36.76,3.10,1.58], + [8.92,5.95,3.11,0.98],[10.83,-16.19,3.11,1.23],[11.60,-63.02,3.11,-0.04],[20.63,-47.29,3.11,1.00], + [5.85,-35.77,3.12,1.15],[8.99,48.04,3.12,0.22],[16.98,-55.99,3.12,1.55],[17.25,24.84,3.12,0.08], + [14.99,-42.10,3.13,-0.21],[9.35,34.39,3.14,1.55],[9.52,-57.03,3.16,1.54],[17.25,36.81,3.16,1.44], + [6.63,-43.20,3.17,-0.10],[9.55,51.68,3.17,0.47],[17.15,65.71,3.17,-0.12],[18.76,-26.99,3.17,-0.11], + [5.11,41.23,3.18,-0.15],[14.71,-64.98,3.18,0.26],[4.83,6.96,3.19,0.48],[5.09,-22.37,3.19,1.46], + [16.96,9.38,3.19,1.16],[17.83,-37.04,3.19,1.19],[21.22,30.23,3.21,0.99],[23.66,77.63,3.21,1.03], + [15.36,-40.65,3.22,-0.23],[16.31,-4.69,3.23,0.97],[18.36,-2.90,3.23,0.94],[21.48,70.56,3.23,-0.20], + [6.80,-61.94,3.24,0.23],[20.19,-0.82,3.24,-0.07],[7.49,-43.30,3.25,1.51],[14.11,-26.68,3.25,1.09], + [15.07,-25.28,3.25,1.67],[18.98,32.69,3.25,-0.05],[3.79,-74.24,3.26,1.59],[0.66,30.86,3.27,1.27], + [17.37,-25.00,3.27,-0.19],[22.91,-15.82,3.27,0.07],[5.22,-16.21,3.29,-0.11],[10.23,-70.04,3.29,-0.07], + [15.42,58.97,3.29,1.17],[4.57,-55.04,3.30,-0.08],[10.53,-61.69,3.30,-0.09],[6.25,22.51,3.31,1.60], + [17.42,-56.38,3.31,-0.15],[1.10,-46.72,3.32,0.89],[3.09,38.84,3.32,1.53],[17.20,-43.24,3.32,0.44], + [17.98,-9.77,3.32,0.99],[19.12,-27.67,3.32,1.17],[4.24,-62.47,3.33,0.92],[11.24,15.43,3.33,-0.00], + [7.82,-24.86,3.34,1.22],[5.41,-2.40,3.35,-0.24],[6.75,12.90,3.35,0.44],[8.50,60.72,3.35,0.86], + [19.42,3.11,3.36,0.32],[15.38,-44.69,3.37,-0.19],[8.78,6.42,3.38,0.69],[13.58,-0.60,3.38,0.11], + [5.59,9.93,3.39,-0.16],[10.28,-61.33,3.39,1.54],[12.93,3.40,3.39,1.57],[22.18,58.20,3.39,1.56], + [4.48,15.87,3.40,0.18],[17.17,-15.73,3.40,0.60],[1.47,-43.32,3.41,1.54],[4.01,12.49,3.41,-0.10], + [13.83,-41.69,3.41,-0.23],[15.20,-52.10,3.41,0.92],[20.75,61.84,3.41,0.91],[22.69,10.83,3.41,-0.09], + [1.88,29.58,3.42,0.49],[16.00,-38.40,3.42,-0.21],[17.77,27.72,3.42,0.75],[20.75,-66.20,3.42,0.16], + [9.18,-58.97,3.43,-0.19],[10.28,23.42,3.43,0.31],[19.10,-4.88,3.43,-0.10],[10.28,42.91,3.45,0.03], + [0.82,57.82,3.46,0.59],[1.14,-10.18,3.46,1.16],[7.95,-52.98,3.46,-0.18],[15.26,33.31,3.46,0.96], + [2.72,3.24,3.47,0.09],[13.83,-42.47,3.47,-0.17],[10.12,16.76,3.48,-0.03],[16.71,38.92,3.48,0.92], + [1.73,-15.94,3.49,0.73],[7.03,-27.93,3.49,1.73],[11.31,33.09,3.49,1.40],[15.03,40.39,3.49,0.96], + [18.45,-45.97,3.49,-0.18],[22.81,-51.32,3.49,0.08],[6.83,-32.51,3.50,-0.12],[7.34,21.98,3.50,0.37], + [22.83,66.20,3.50,1.05],[19.98,19.49,3.51,1.57],[22.83,24.60,3.51,0.93],[3.72,-9.76,3.52,0.92], + [9.69,9.89,3.52,0.52],[9.95,-54.57,3.52,-0.07],[18.83,33.36,3.52,0.00],[18.96,-21.11,3.52,1.15], + [22.17,6.20,3.52,0.09],[12.69,-1.45,3.52,0.60],[4.48,19.18,3.53,1.01],[8.28,9.19,3.53,1.48], + [11.55,-31.86,3.54,0.95],[15.83,-3.43,3.54,-0.04],[17.63,-15.40,3.54,0.26],[4.30,-33.80,3.55,-0.11], + [5.78,-14.82,3.55,0.10],[14.32,-46.06,3.55,-0.18],[18.35,72.73,3.55,0.49],[20.15,-66.18,3.55,0.75], + [0.32,-8.82,3.56,1.21],[2.28,-51.51,3.56,-0.12],[11.32,-14.78,3.56,1.11],[16.87,-38.02,3.56,-0.21], + [7.74,24.40,3.57,0.93],[9.06,47.16,3.57,0.01],[14.53,30.37,3.57,1.30],[15.36,-36.26,3.57,1.53], + [7.30,16.54,3.58,0.11],[20.30,-12.54,3.58,0.88],[1.63,48.63,3.59,1.27],[5.29,-6.84,3.59,-0.12], + [5.74,-22.45,3.59,0.48],[11.84,1.76,3.59,0.52],[12.36,-60.40,3.59,1.39],[1.40,-8.18,3.60,1.06], + [6.88,33.96,3.60,0.10],[8.67,-52.92,3.60,-0.17],[9.51,-40.47,3.60,0.37],[15.62,-28.14,3.60,1.36], + [17.52,-60.68,3.60,-0.10],[2.83,27.26,3.61,-0.10],[3.41,9.03,3.61,0.89],[10.18,-12.35,3.61,1.01], + [13.04,-71.55,3.61,1.19],[17.76,-64.72,3.61,1.16],[1.52,15.35,3.62,0.97],[3.82,24.05,3.62,-0.07], + [7.75,-37.97,3.62,1.71],[16.91,-42.36,3.62,1.39],[23.03,42.33,3.62,-0.10],[11.76,-66.73,3.63,0.16], + [20.63,14.60,3.64,0.42],[4.33,15.63,3.65,0.98],[9.53,63.06,3.65,0.36],[15.77,15.42,3.65,0.07], + [18.11,-50.09,3.65,-0.10],[22.48,-0.02,3.65,0.41],[15.46,29.11,3.66,0.32],[15.64,-29.78,3.66,-0.18], + [14.07,64.38,3.67,-0.05],[20.91,-58.45,3.67,1.25],[4.85,5.61,3.68,-0.16],[8.73,-33.19,3.68,-0.18], + [19.79,18.53,3.68,1.31],[23.16,-21.17,3.68,1.20],[0.62,53.90,3.69,-0.20],[1.93,-51.61,3.69,0.84], + [5.04,41.08,3.69,1.15],[9.75,-62.51,3.69,1.01],[11.77,47.78,3.69,1.18],[21.67,-16.66,3.69,0.32], + [3.33,-21.76,3.70,1.61],[17.96,29.25,3.70,0.94],[23.29,3.28,3.70,0.92],[4.90,2.44,3.71,-0.18], + [5.94,-14.17,3.71,0.34],[7.87,-40.58,3.71,1.01],[15.85,4.48,3.71,0.15],[18.12,9.56,3.71,0.16], + [19.92,6.41,3.71,0.85],[3.55,-9.46,3.72,0.88],[3.75,24.11,3.72,-0.10],[5.99,54.28,3.72,1.01], + [21.08,43.93,3.72,1.61],[3.45,9.73,3.73,-0.08],[14.77,1.89,3.73,-0.01],[17.89,56.87,3.73,1.18], + [21.69,-77.39,3.73,1.01],[22.88,-7.58,3.73,1.63],[1.86,-10.34,3.74,1.14],[16.37,19.15,3.74,0.30], + [21.25,38.05,3.74,0.39],[9.07,-47.10,3.75,1.17],[17.80,2.71,3.75,0.04],[5.56,-62.49,3.76,0.64], + [5.86,-20.88,3.76,0.98],[6.48,-7.03,3.76,-0.11],[19.08,-21.74,3.76,1.01],[19.50,51.73,3.76,0.15], + [22.52,50.28,3.76,0.03],[2.84,55.90,3.77,1.69],[3.75,42.58,3.77,0.42],[4.38,17.54,3.77,0.98], + [5.65,-2.60,3.77,-0.19],[8.43,-66.14,3.77,1.13],[8.68,-46.65,3.77,0.67],[16.83,-59.04,3.77,1.56], + [20.66,15.91,3.77,-0.06],[21.44,-22.41,3.77,1.00],[22.12,25.35,3.77,0.43],[7.15,-70.50,3.78,1.01], + [7.43,27.80,3.78,1.02],[9.85,59.04,3.78,0.29],[10.89,-58.85,3.78,0.94],[14.69,13.73,3.78,0.04], + [20.79,-9.50,3.78,0.00],[3.16,44.86,3.79,0.98],[10.89,34.21,3.79,1.04],[3.20,-28.99,3.80,0.54], + [7.65,-26.80,3.80,-0.16],[15.58,10.54,3.80,0.27],[19.29,53.37,3.80,0.95],[20.23,46.74,3.80,1.27], + [4.59,-30.56,3.81,0.96],[10.46,-58.74,3.81,0.32],[15.71,26.30,3.81,0.02],[23.63,46.46,3.81,0.98], + [2.03,2.76,3.82,0.02],[9.31,36.80,3.82,0.07],[11.52,69.33,3.82,1.61],[16.52,1.98,3.82,0.02], + [17.66,46.01,3.82,-0.18],[10.43,-16.84,3.83,1.46],[13.97,-42.10,3.83,-0.22],[14.80,-79.04,3.83,1.43], + [3.74,-64.81,3.84,1.13],[3.74,32.29,3.84,0.02],[4.48,15.96,3.84,0.95],[8.92,-60.64,3.84,-0.10], + [10.55,9.31,3.84,-0.15],[10.62,-48.23,3.84,0.30],[12.54,-72.13,3.84,-0.16],[18.13,28.76,3.84,-0.02], + [18.23,-21.06,3.84,0.20],[19.80,70.27,3.84,0.89],[4.23,-42.29,3.85,1.08],[5.79,-51.07,3.85,0.17], + [6.37,-33.44,3.85,0.86],[10.25,-42.12,3.85,0.05],[12.56,69.79,3.85,-0.12],[12.63,-48.54,3.85,0.05], + [15.94,15.66,3.85,0.48],[18.39,21.77,3.85,1.17],[18.59,-8.24,3.85,1.32],[0.95,38.50,3.86,0.13], + [4.64,-14.30,3.86,1.08],[5.52,-35.47,3.86,1.13],[16.26,-63.69,3.86,1.10],[16.56,-78.90,3.86,0.92], + [17.94,37.25,3.86,1.35],[22.36,-1.39,3.86,-0.06],[3.76,24.37,3.87,-0.06],[8.77,-46.04,3.87,0.01], + [13.98,-44.80,3.87,-0.21],[14.72,-5.66,3.87,0.39],[15.95,-29.21,3.87,-0.20],[19.87,1.01,3.87,0.63], + [0.16,-45.75,3.88,1.01],[1.89,19.29,3.88,-0.05],[9.88,26.01,3.88,1.22],[15.20,-48.74,3.88,-0.03], + [23.17,-45.25,3.88,1.00],[2.94,-8.90,3.89,1.09],[6.90,-24.18,3.89,1.74],[9.24,2.31,3.89,-0.06], + [12.33,-0.67,3.89,0.03],[19.94,35.08,3.89,1.02],[9.66,-1.14,3.90,1.31],[11.35,-54.49,3.90,-0.16], + [13.52,-39.41,3.90,1.19],[4.05,5.99,3.91,0.03],[8.43,-3.91,3.91,-0.01],[12.47,-50.23,3.91,-0.19], + [15.09,-47.05,3.91,-0.14],[15.59,-14.79,3.91,1.01],[16.33,46.31,3.91,-0.15],[17.00,30.93,3.92,-0.02], + [19.36,-17.85,3.92,0.23],[21.26,5.25,3.92,0.55],[0.44,-43.68,3.93,0.17],[1.52,-49.07,3.93,0.97], + [2.90,52.76,3.93,0.76],[4.61,-3.35,3.93,-0.21],[7.70,-72.61,3.93,1.03],[11.14,-58.98,3.93,1.23], + [16.11,-20.67,3.93,-0.05],[18.01,2.93,3.93,0.03],[1.14,-55.25,3.94,-0.12],[7.69,-9.55,3.94,1.02], + [7.73,-28.95,3.94,0.16],[8.74,18.15,3.94,1.08],[20.95,41.17,3.94,0.03],[2.06,72.42,3.95,-0.00], + [6.61,-19.26,3.95,1.04],[4.14,47.71,3.96,-0.03],[5.99,-42.82,3.96,1.15],[9.01,41.78,3.96,0.46], + [9.19,-62.32,3.96,-0.18],[19.38,-44.46,3.96,-0.09],[19.40,-40.62,3.96,-0.10],[20.26,47.71,3.96,1.45], + [23.38,-20.10,3.96,1.08],[4.40,-34.02,3.97,1.47],[5.86,39.15,3.97,1.13],[7.28,-67.96,3.97,0.76], + [8.67,-35.31,3.97,0.94],[12.19,-52.37,3.97,-0.16],[15.85,-33.63,3.97,-0.04],[20.01,-72.91,3.97,-0.03], + [22.49,-43.50,3.97,1.02],[22.78,23.57,3.97,1.07],[3.98,35.79,3.98,0.02],[21.57,45.59,3.98,0.89], + [2.00,-21.08,3.99,1.55],[6.25,-6.27,3.99,1.32],[10.41,-74.03,3.99,0.37],[23.29,-58.24,3.99,0.41], + [9.04,-66.40,4.00,0.14],[11.40,10.53,4.00,0.42],[16.20,-19.46,4.00,0.08], +]; + // Constellation connecting lines — pairs of _STARS indices var _CONST_LINES = [ [0,2],[0,5],[2,3],[3,4],[4,5],[3,1],[5,6], // Orion @@ -253,35 +381,73 @@ function _starLinkKey(idx) { return 'star:' + nm.toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+$/, ''); } -// Project catalog stars to canvas coordinates for current time/location -function _projectStars(now, lat, lon, W, H) { +// Local sidereal time (radians) for an instant + longitude — the one value +// every star projection in the scene shares. +function _skyLST(now, lon) { var JD = _dateToJD(now.getTime()); var GMST = (280.46061837 + 360.98564736629 * (JD - JD_J2000)) % 360; - var LST = (GMST + lon) * DEG_TO_RAD; - var latR = lat * DEG_TO_RAD; + return (GMST + lon) * DEG_TO_RAD; +} + +// Project one star (RA hours, Dec degrees) onto the horizon-scene canvas for a +// precomputed LST and observer latitude (sin/cos passed in so a whole catalogue +// pass computes them once). Returns {x, y, alt} or null when the star falls +// below the scene's horizon band or outside its 60°–300° azimuth window. Shared +// by the named catalog (_projectStars) and the real field (_projectFieldStars) +// so both use byte-for-byte identical geometry. +function _projectStarXY(raHours, decDeg, LST, sinLat, cosLat, W, H) { + var ra = raHours * 15 * DEG_TO_RAD; + var dec = decDeg * DEG_TO_RAD; + var sinDec = Math.sin(dec), cosDec = Math.cos(dec); + var HA = LST - ra; + HA = ((HA % (2 * Math.PI)) + 3 * Math.PI) % (2 * Math.PI) - Math.PI; + var sinAlt = sinLat * sinDec + cosLat * cosDec * Math.cos(HA); + var altitude = Math.asin(sinAlt) * 180 / Math.PI; + if (altitude < -2) return null; + var cosAz = (sinDec - sinLat * sinAlt) / (cosLat * Math.cos(Math.asin(sinAlt))); + cosAz = Math.max(-1, Math.min(1, cosAz)); + if (isNaN(cosAz)) cosAz = 0; + var azimuth = Math.acos(cosAz) * 180 / Math.PI; + if (HA > 0) azimuth = 360 - azimuth; + var xFrac = (azimuth - 60) / 240; + if (xFrac < -0.05 || xFrac > 1.05) return null; + xFrac = Math.max(0, Math.min(1, xFrac)); + return { x: xFrac * W, y: Math.max(0, Math.min(H * 0.66, H * 0.66 - (altitude / 90) * H * 0.56)), alt: altitude }; +} + +// Project the named catalog stars to canvas coordinates for current +// time/location. `alt` rides along so the a11y description can count how many +// are truly above the horizon. +function _projectStars(now, lat, lon, W, H) { + var LST = _skyLST(now, lon); + var latR = lat * DEG_TO_RAD, sinLat = Math.sin(latR), cosLat = Math.cos(latR); var result = []; for (var i = 0; i < _STARS.length; i++) { var s = _STARS[i]; - var ra = s[0] * 15 * DEG_TO_RAD; - var dec = s[1] * DEG_TO_RAD; - var HA = LST - ra; - HA = ((HA % (2 * Math.PI)) + 3 * Math.PI) % (2 * Math.PI) - Math.PI; - var sinAlt = Math.sin(latR) * Math.sin(dec) + Math.cos(latR) * Math.cos(dec) * Math.cos(HA); - var altitude = Math.asin(sinAlt) * 180 / Math.PI; - if (altitude < -2) continue; - var cosAz = (Math.sin(dec) - Math.sin(latR) * sinAlt) / (Math.cos(latR) * Math.cos(Math.asin(sinAlt))); - cosAz = Math.max(-1, Math.min(1, cosAz)); - if (isNaN(cosAz)) cosAz = 0; - var azimuth = Math.acos(cosAz) * 180 / Math.PI; - if (HA > 0) azimuth = 360 - azimuth; - var xFrac = (azimuth - 60) / 240; - if (xFrac < -0.05 || xFrac > 1.05) continue; - xFrac = Math.max(0, Math.min(1, xFrac)); - result.push({ x: xFrac * W, y: Math.max(0, Math.min(H * 0.66, H * 0.66 - (altitude / 90) * H * 0.56)), mag: s[2], idx: i }); + var p = _projectStarXY(s[0], s[1], LST, sinLat, cosLat, W, H); + if (p) result.push({ x: p.x, y: p.y, alt: p.alt, mag: s[2], idx: i }); } return result; } +// Project the real background field (_SKY_FIELD_STARS) the same way. Only stars +// genuinely above the horizon are kept; each survivor carries a warm/cool tint +// from its colour index and a deterministic twinkle phase seeded from its RA, so +// the shimmer is stable across rebuilds. Rebuilt only when _skyFrame recomputes +// (init / time jump / drift cadence), never per animation frame. +function _projectFieldStars(now, lat, lon, W, H) { + var LST = _skyLST(now, lon); + var latR = lat * DEG_TO_RAD, sinLat = Math.sin(latR), cosLat = Math.cos(latR); + var out = []; + for (var i = 0; i < _SKY_FIELD_STARS.length; i++) { + var fs = _SKY_FIELD_STARS[i]; + var p = _projectStarXY(fs[0], fs[1], LST, sinLat, cosLat, W, H); + if (!p || p.alt < 0) continue; + out.push({ x: p.x, y: p.y, mag: fs[2], ci: fs[3], phase: (fs[0] * 137.508) % 6.2832 }); + } + return out; +} + function _drawConstellations(ctx, alpha, t, projStars) { var byIdx = {}; for (var i = 0; i < projStars.length; i++) byIdx[projStars[i].idx] = projStars[i]; @@ -300,33 +466,19 @@ function _drawConstellations(ctx, alpha, t, projStars) { ctx.restore(); } -// Decorative dim background starfield for the horizon scene — generated once -// per canvas size (cached, like the orrery's own background stars) rather than -// re-rolled every animation frame. These are pure ambiance (no real RA/Dec, no -// link), filling out the naked-eye-dense look a ~60-catalog-star sky can't on -// its own; _lcgRand (almanac-orrery.js) keeps them deterministic. -var _skyBgStars = null; - -function _ensureSkyBgStars(W, H, dpr) { - if (_skyBgStars && _skyBgStars.W === W && _skyBgStars.H === H) return _skyBgStars.stars; - var sr = _lcgRand(42); - var count = 220; - var stars = []; - for (var i = 0; i < count; i++) { - stars.push({ - x: sr() * W, - y: sr() * H * 0.55, - r: (0.25 + sr() * 0.35) * dpr, - freq: 0.8 + sr() * 2.0, - phase: sr() * 6.28, - base: 0.03 + sr() * 0.12 - }); - } - _skyBgStars = { W: W, H: H, stars: stars }; - return stars; +// "r,g,b" tint for a star from its B–V colour index: hot blue-white stars have +// a low (even negative) index, cool amber stars a high one. Buckets, not a +// gradient — plenty at this scale, and cheap. Shared by the field draw. +function _starTint(ci) { + if (ci == null) return '220,230,255'; + if (ci < 0.0) return '202,222,255'; // blue-white (O/B) + if (ci < 0.3) return '226,236,255'; // white (A) + if (ci < 0.6) return '248,248,235'; // yellow-white (F) + if (ci < 1.0) return '255,240,208'; // yellow (G/K) + return '255,214,170'; // orange-red (K/M) } -function _drawSkyScene(canvas, dpr, sunPos, now, lat, lon, elapsed, labelText, projStars, moonData) { +function _drawSkyScene(canvas, dpr, sunPos, now, lat, lon, elapsed, labelText, projStars, moonData, projField) { var t = elapsed || 0; // 't' is animation time in seconds — not the i18n t() function var ctx = canvas.getContext('2d'); var W = canvas.width, H = canvas.height; @@ -384,19 +536,24 @@ function _drawSkyScene(canvas, dpr, sunPos, now, lat, lon, elapsed, labelText, p if (alt < 8) { var starOpacity = alt < -14 ? 1 : alt < -2 ? (-2 - alt) / 12 : Math.max(0, (8 - alt) / 20); - // Dim background stars — a cached deterministic field (only the twinkle, - // a sine over each star's cached phase/frequency, is recomputed per frame; - // the layout itself is generated once per canvas size, not re-rolled every - // RAF tick — see _ensureSkyBgStars). - var bgStars = _ensureSkyBgStars(W, H, dpr); - for (var si = 0; si < bgStars.length; si++) { - var bs = bgStars[si]; - var twinkle = Math.sin(t * bs.freq + bs.phase) * 0.15; - var bsa = starOpacity * Math.max(0.03, bs.base + twinkle); - ctx.beginPath(); - ctx.arc(bs.x, bs.y, bs.r, 0, Math.PI * 2); - ctx.fillStyle = 'rgba(200,210,230,' + bsa.toFixed(3) + ')'; - ctx.fill(); + // Real background field — the naked-eye sky at astronomically correct + // positions (_projectFieldStars, mag ≤ 4.0), replacing the old procedural + // filler that never moved with the sky. Positions are cached (rebuilt only + // on a time/location change, never per frame); only the twinkle recomputes + // each RAF tick, and each star's colour-index tint makes hot stars blue and + // cool stars amber, as the real sky is. + if (projField) { + for (var si = 0; si < projField.length; si++) { + var fp = projField[si]; + var fr = Math.max(0.35, (4.5 - fp.mag) * 0.28) * dpr; + var ftw = Math.sin(t * (1.0 + (si % 7) * 0.3) + fp.phase) * 0.12; + var fbase = 0.1 + (4.5 - fp.mag) / 4.5 * 0.5; + var fsa = starOpacity * Math.max(0.05, Math.min(0.85, fbase + ftw)); + ctx.beginPath(); + ctx.arc(fp.x, fp.y, fr, 0, Math.PI * 2); + ctx.fillStyle = 'rgba(' + _starTint(fp.ci) + ',' + fsa.toFixed(3) + ')'; + ctx.fill(); + } } // Catalog stars at astronomically correct positions @@ -1027,10 +1184,12 @@ function _renderStarChart(baseNow) { _drawStarChart(baseNow); } -// Decorative dim background starfield for the planisphere disc — same idea as -// _ensureSkyBgStars for the horizon scene: a cached, deterministic field (not -// astronomically real, not linkable) so the disc reads as a real night sky -// instead of the ~25-35 catalog stars typically above the horizon at once. +// Decorative dim background starfield for the planisphere disc — a cached, +// deterministic field (not astronomically real, not linkable) so the schematic +// chart disc reads as a dense night sky rather than the ~25-35 catalog stars +// typically above the horizon at once. (The horizon SCENE uses real positions — +// see _projectFieldStars — but the planisphere is a labelled diagram, where an +// even ambient fill behind the named stars reads better than 460 mag dots.) // Cached by disc size only (not lat/lon/time), so panning/scrubbing is free. var _starChartBgStars = null; diff --git a/zimi/static/almanac.css b/zimi/static/almanac.css index 80bf8285..b9204c3c 100644 --- a/zimi/static/almanac.css +++ b/zimi/static/almanac.css @@ -63,7 +63,20 @@ keeps the cursor on it and hover repaints the amber border grey. */ .alm-tz-city-card.alm-tz-city-active, .alm-tz-city-card.alm-tz-city-active:hover { border: 2px solid var(--amber); background: var(--amber-glow); box-shadow: 0 0 10px var(--amber-glow); padding: 5px 3px; } -.alm-cal-region { text-align: center; font-size: 11px; color: var(--text3); margin-top: 8px; } +/* Holiday scope pill — centered directly under the calendar grid it filters. + A recessed segmented pill (Regional/Worldwide) sets the scope explicitly, + amber-filled when active — same control language as the app-theme picker + (app.css .app-theme-seg) so the two families read as one system. The + location affordance lives on the sun-map, so there is no caption. */ +.alm-hol-row { display: flex; justify-content: center; align-items: center; margin-top: 14px; } +.alm-scope-seg { display: flex; gap: 3px; padding: 3px; border-radius: 999px; background: var(--surface2); border: 1px solid var(--border); } +.alm-scope-btn { + border: none; border-radius: 999px; padding: 3px 12px; font: inherit; font-size: 11px; + background: none; color: var(--text3); cursor: pointer; line-height: 1.4; + transition: color 0.15s, background 0.15s; +} +.alm-scope-btn:hover { color: var(--amber); } +.alm-scope-btn.active { background: var(--amber); color: #000; font-weight: 600; } .alm-tz-city-active .alm-tz-city-name { color: var(--amber); font-weight: 600; } .alm-tz-city-active .alm-tz-city-time { color: var(--amber); } .almanac-hero { display: flex; flex-direction: column; align-items: center; margin-bottom: 32px; position: relative; } diff --git a/zimi/static/almanac.js b/zimi/static/almanac.js index e74168fd..5bebc5e4 100644 --- a/zimi/static/almanac.js +++ b/zimi/static/almanac.js @@ -65,6 +65,21 @@ function _saveLocation(lat, lon, name) { _almSelectedTz = _almTzForLocation(lat, lon); } +// Holiday scope — 'region' (default: the one national pack for the chosen or +// detected location) or 'worldwide' (all national packs layered at once, each +// entry tagged with its country). Session-scoped like the location itself: the +// almanac is ephemeral, so a refresh returns to the location-following default. +var _ALM_HOLIDAY_SCOPE_KEY = 'zimi_almanac_holiday_scope'; +function _almHolidayScope() { + try { return sessionStorage.getItem(_ALM_HOLIDAY_SCOPE_KEY) === 'worldwide' ? 'worldwide' : 'region'; } + catch (e) { return 'region'; } +} +function _almSetHolidayScope(scope) { + if (scope === _almHolidayScope()) return; + try { sessionStorage.setItem(_ALM_HOLIDAY_SCOPE_KEY, scope); } catch (e) {} + if (typeof _drawAlmanacGrid === 'function') _drawAlmanacGrid(); +} + function _signalDelay(au) { var sec = au * 499; return { h: Math.floor(sec / 3600), m: Math.floor((sec % 3600) / 60) }; @@ -2843,6 +2858,7 @@ var _MAP_CITIES = [ { name: 'Melbourne, Victoria, Australia', lat: -37.81, lon: 144.96 }, { name: 'Brisbane, Queensland, Australia', lat: -27.47, lon: 153.03 }, { name: 'Perth, Western Australia, Australia', lat: -31.95, lon: 115.86 }, + { name: 'Adelaide, South Australia, Australia', lat: -34.93, lon: 138.60 }, { name: 'Auckland, New Zealand', lat: -36.85, lon: 174.76 }, { name: 'Wellington, New Zealand', lat: -41.29, lon: 174.78 }, { name: 'Suva, Fiji', lat: -17.77, lon: 177.97 } @@ -3082,7 +3098,158 @@ var _SEARCH_CITIES = [ { name: 'Wellington, New Zealand', lat: -41.29, lon: 174.78 }, { name: 'Christchurch, New Zealand', lat: -43.53, lon: 172.64 }, { name: 'Suva, Fiji', lat: -18.14, lon: 178.44 }, - { name: 'Port Moresby, Papua New Guinea', lat: -9.44, lon: 147.18 } + { name: 'Port Moresby, Papua New Guinea', lat: -9.44, lon: 147.18 }, + // ── Wider world coverage (1.8.1): major cities by population, coordinates + // from the GeoNames cities15000 dataset; deduped against the lists above. ── + { name: 'Aden, Yemen', lat: 12.78, lon: 45.04 }, + { name: 'Al Basrah al Qadimah, Iraq', lat: 30.50, lon: 47.82 }, + { name: 'Al Mawsil al Jadidah, Iraq', lat: 36.33, lon: 43.11 }, + { name: 'Aleppo, Syria', lat: 36.20, lon: 37.16 }, + { name: 'Andijon, Uzbekistan', lat: 40.78, lon: 72.35 }, + { name: 'Ankara, Turkey', lat: 39.92, lon: 32.85 }, + { name: 'Antananarivo, Madagascar', lat: -18.91, lon: 47.54 }, + { name: 'Antsirabe, Madagascar', lat: -19.87, lon: 47.03 }, + { name: 'Arequipa, Peru', lat: -16.40, lon: -71.54 }, + { name: 'Arhus, Denmark', lat: 56.16, lon: 10.21 }, + { name: 'Ashgabat, Turkmenistan', lat: 37.95, lon: 58.38 }, + { name: 'Asmara, Eritrea', lat: 15.34, lon: 38.93 }, + { name: 'Bamako, Mali', lat: 12.61, lon: -7.98 }, + { name: 'Bamenda, Cameroon', lat: 5.96, lon: 10.15 }, + { name: 'Bangui, Central African Republic', lat: 4.36, lon: 18.55 }, + { name: 'Banja Luka, Bosnia and Herzegovina', lat: 44.78, lon: 17.21 }, + { name: 'Benghazi, Libya', lat: 32.11, lon: 20.07 }, + { name: 'Bharatpur, Nepal', lat: 27.68, lon: 84.44 }, + { name: 'Bissau, Guinea-Bissau', lat: 11.86, lon: -15.60 }, + { name: 'Blantyre, Malawi', lat: -15.78, lon: 35.01 }, + { name: 'Bo, Sierra Leone', lat: 7.96, lon: -11.74 }, + { name: 'Bobo-Dioulasso, Burkina Faso', lat: 11.18, lon: -4.29 }, + { name: 'Borama, Somalia', lat: 9.94, lon: 43.18 }, + { name: 'Bouake, Ivory Coast', lat: 7.69, lon: -5.03 }, + { name: 'Bujumbura, Burundi', lat: -3.38, lon: 29.36 }, + { name: 'Bulawayo, Zimbabwe', lat: -20.15, lon: 28.58 }, + { name: 'Bursa, Turkey', lat: 40.20, lon: 29.06 }, + { name: 'Camagueey, Cuba', lat: 21.38, lon: -77.92 }, + { name: 'Chisinau, Moldova', lat: 47.01, lon: 28.86 }, + { name: 'Ciudad del Este, Paraguay', lat: -25.50, lon: -54.65 }, + { name: 'Cochabamba, Bolivia', lat: -17.38, lon: -66.16 }, + { name: 'Conakry, Guinea', lat: 9.54, lon: -13.68 }, + { name: 'Constantine, Algeria', lat: 36.37, lon: 6.61 }, + { name: 'Cork, Ireland', lat: 51.90, lon: -8.47 }, + { name: 'Cotonou, Benin', lat: 6.37, lon: 2.42 }, + { name: 'Cuenca, Ecuador', lat: -2.90, lon: -79.00 }, + { name: 'Damascus, Syria', lat: 33.51, lon: 36.29 }, + { name: 'Danli, Honduras', lat: 14.03, lon: -86.58 }, + { name: 'Dasoguz, Turkmenistan', lat: 41.84, lon: 59.97 }, + { name: 'Djibouti, Djibouti', lat: 11.59, lon: 43.15 }, + { name: 'Dodoma, Tanzania', lat: -6.17, lon: 35.74 }, + { name: 'Douala, Cameroon', lat: 4.05, lon: 9.70 }, + { name: 'Dushanbe, Tajikistan', lat: 38.54, lon: 68.78 }, + { name: 'Fes, Morocco', lat: 34.03, lon: -5.00 }, + { name: 'Freetown, Sierra Leone', lat: 8.49, lon: -13.24 }, + { name: 'Gaborone, Botswana', lat: -24.65, lon: 25.91 }, + { name: 'Ganja, Azerbaijan', lat: 40.68, lon: 46.36 }, + { name: 'Gaza, Palestinian Territory', lat: 31.50, lon: 34.47 }, + { name: 'Georgetown, Guyana', lat: 6.80, lon: -58.16 }, + { name: 'Gonder, Ethiopia', lat: 12.60, lon: 37.47 }, + { name: 'Graz, Austria', lat: 47.07, lon: 15.44 }, + { name: 'Haiphong, Vietnam', lat: 20.86, lon: 106.68 }, + { name: 'Hamhung, North Korea', lat: 39.92, lon: 127.54 }, + { name: 'Hargeysa, Somalia', lat: 9.56, lon: 44.06 }, + { name: 'Herat, Afghanistan', lat: 34.35, lon: 62.20 }, + { name: 'Homs, Syria', lat: 34.72, lon: 36.73 }, + { name: 'Homyel\', Belarus', lat: 52.43, lon: 30.98 }, + { name: 'Hrodna, Belarus', lat: 53.68, lon: 23.83 }, + { name: 'Iasi, Romania', lat: 47.17, lon: 27.60 }, + { name: 'Ibadan, Nigeria', lat: 7.38, lon: 3.91 }, + { name: 'Irbid, Jordan', lat: 32.56, lon: 35.85 }, + { name: 'Isfara, Tajikistan', lat: 40.13, lon: 70.63 }, + { name: 'Istaravshan, Tajikistan', lat: 39.91, lon: 69.00 }, + { name: 'Jijiga, Ethiopia', lat: 9.35, lon: 42.80 }, + { name: 'Juba, South Sudan', lat: 4.85, lon: 31.58 }, + { name: 'Kakamega, Kenya', lat: 0.28, lon: 34.75 }, + { name: 'Kano, Nigeria', lat: 12.00, lon: 8.52 }, + { name: 'Kaunas, Lithuania', lat: 54.90, lon: 23.91 }, + { name: 'Kenema, Sierra Leone', lat: 7.88, lon: -11.19 }, + { name: 'Kigali, Rwanda', lat: -1.95, lon: 30.06 }, + { name: 'Kingston, Jamaica', lat: 18.00, lon: -76.79 }, + { name: 'Kitwe, Zambia', lat: -12.80, lon: 28.21 }, + { name: 'Kosice, Slovakia', lat: 48.71, lon: 21.26 }, + { name: 'Koutiala, Mali', lat: 12.39, lon: -5.47 }, + { name: 'Kumasi, Ghana', lat: 6.69, lon: -1.62 }, + { name: 'Libreville, Gabon', lat: 0.39, lon: 9.45 }, + { name: 'Lilongwe, Malawi', lat: -13.97, lon: 33.79 }, + { name: 'Linz, Austria', lat: 48.31, lon: 14.29 }, + { name: 'Lome, Togo', lat: 6.13, lon: 1.22 }, + { name: 'Lubumbashi, Democratic Republic of the Congo', lat: -11.66, lon: 27.48 }, + { name: 'Macau, Macao', lat: 22.20, lon: 113.55 }, + { name: 'Managua, Nicaragua', lat: 12.13, lon: -86.25 }, + { name: 'Mandalay, Myanmar', lat: 21.97, lon: 96.08 }, + { name: 'Maracaibo, Venezuela', lat: 10.64, lon: -71.61 }, + { name: 'Maradi, Niger', lat: 13.50, lon: 7.10 }, + { name: 'Maseru, Lesotho', lat: -29.32, lon: 27.48 }, + { name: 'Mazar-e Sharif, Afghanistan', lat: 36.71, lon: 67.11 }, + { name: 'Mbuji-Mayi, Democratic Republic of the Congo', lat: -6.14, lon: 23.59 }, + { name: 'Minsk, Belarus', lat: 53.90, lon: 27.57 }, + { name: 'Misratah, Libya', lat: 32.38, lon: 15.09 }, + { name: 'Mogadishu, Somalia', lat: 2.04, lon: 45.34 }, + { name: 'Monrovia, Liberia', lat: 6.30, lon: -10.80 }, + { name: 'Mwanza, Tanzania', lat: -2.52, lon: 32.90 }, + { name: 'Mzuzu, Malawi', lat: -11.47, lon: 34.02 }, + { name: 'N\'Djamena, Chad', lat: 12.11, lon: 15.04 }, + { name: 'Namangan, Uzbekistan', lat: 41.00, lon: 71.67 }, + { name: 'Nampula, Mozambique', lat: -15.12, lon: 39.27 }, + { name: 'Nassau, Bahamas', lat: 25.06, lon: -77.34 }, + { name: 'Nay Pyi Taw, Myanmar', lat: 19.75, lon: 96.13 }, + { name: 'Ndola, Zambia', lat: -12.96, lon: 28.64 }, + { name: 'Niamey, Niger', lat: 13.51, lon: 2.11 }, + { name: 'Nicosia, Cyprus', lat: 35.17, lon: 33.35 }, + { name: 'Nis, Serbia', lat: 43.32, lon: 21.90 }, + { name: 'Nouakchott, Mauritania', lat: 18.09, lon: -15.98 }, + { name: 'Novi Sad, Serbia', lat: 45.25, lon: 19.84 }, + { name: 'Nzerekore, Guinea', lat: 7.76, lon: -8.82 }, + { name: 'Oran, Algeria', lat: 35.70, lon: -0.64 }, + { name: 'Osh, Kyrgyzstan', lat: 40.53, lon: 72.80 }, + { name: 'Ostrava, Czechia', lat: 49.83, lon: 18.28 }, + { name: 'Ouagadougou, Burkina Faso', lat: 12.37, lon: -1.53 }, + { name: 'Paramaribo, Suriname', lat: 5.87, lon: -55.17 }, + { name: 'Plovdiv, Bulgaria', lat: 42.15, lon: 24.75 }, + { name: 'Podgorica, Montenegro', lat: 42.44, lon: 19.26 }, + { name: 'Pointe-Noire, Republic of the Congo', lat: -4.78, lon: 11.86 }, + { name: 'Pokhara, Nepal', lat: 28.27, lon: 83.97 }, + { name: 'Port-au-Prince, Haiti', lat: 18.54, lon: -72.34 }, + { name: 'Pristina, Kosovo', lat: 42.67, lon: 21.17 }, + { name: 'Rabat, Morocco', lat: 34.01, lon: -6.83 }, + { name: 'San Miguel, El Salvador', lat: 13.48, lon: -88.18 }, + { name: 'San Pedro Sula, Honduras', lat: 15.51, lon: -88.03 }, + { name: 'San Salvador, El Salvador', lat: 13.69, lon: -89.19 }, + { name: 'Sanaa, Yemen', lat: 15.35, lon: 44.21 }, + { name: 'Santa Cruz de la Sierra, Bolivia', lat: -17.79, lon: -63.18 }, + { name: 'Santiago de Cuba, Cuba', lat: 20.02, lon: -75.82 }, + { name: 'Santiago de los Caballeros, Dominican Republic', lat: 19.45, lon: -70.69 }, + { name: 'Sarajevo, Bosnia and Herzegovina', lat: 43.85, lon: 18.36 }, + { name: 'Serekunda, Gambia', lat: 13.44, lon: -16.68 }, + { name: 'Sfax, Tunisia', lat: 34.74, lon: 10.76 }, + { name: 'Shymkent, Kazakhstan', lat: 42.31, lon: 69.60 }, + { name: 'Sikasso, Mali', lat: 11.32, lon: -5.67 }, + { name: 'Skopje, North Macedonia', lat: 42.00, lon: 21.43 }, + { name: 'Sousse, Tunisia', lat: 35.83, lon: 10.64 }, + { name: 'Taichung, Taiwan', lat: 24.15, lon: 120.68 }, + { name: 'Taiz, Yemen', lat: 13.58, lon: 44.02 }, + { name: 'Takeo, Cambodia', lat: 10.99, lon: 104.78 }, + { name: 'Tamale, Ghana', lat: 9.40, lon: -0.84 }, + { name: 'Tampere, Finland', lat: 61.50, lon: 23.79 }, + { name: 'Tegucigalpa, Honduras', lat: 14.08, lon: -87.21 }, + { name: 'Tirana, Albania', lat: 41.33, lon: 19.82 }, + { name: 'Toamasina, Madagascar', lat: -18.15, lon: 49.40 }, + { name: 'Touba, Senegal', lat: 14.86, lon: -15.88 }, + { name: 'Trondheim, Norway', lat: 63.43, lon: 10.40 }, + { name: 'Tuerkmenabat, Turkmenistan', lat: 39.07, lon: 63.58 }, + { name: 'Varna, Bulgaria', lat: 43.22, lon: 27.91 }, + { name: 'Winejok, South Sudan', lat: 9.01, lon: 27.57 }, + { name: 'Wroclaw, Poland', lat: 51.10, lon: 17.03 }, + { name: 'Yaounde, Cameroon', lat: 3.87, lon: 11.52 }, + { name: 'Yei, South Sudan', lat: 4.09, lon: 30.68 }, + { name: 'Zinder, Niger', lat: 13.81, lon: 8.99 }, ]; // Coastline data removed — using Natural Earth SVG map (/static/world-map.svg) @@ -4015,10 +4182,13 @@ function _almRegion() { return ''; } -function _applyRegionHolidays(region, year, month, add) { +function _applyRegionHolidays(region, year, month, add, worldwide) { var pack = _REGION_HOLIDAYS[region]; if (!pack) return; - var src = _almRegionName(region); + // Region-scoped: the caption already names the country, so each entry's tag is + // just its colour. Worldwide: 18 packs at once, so every entry carries a + // compact country code ("Bastille Day · FR") to say whose day it is. + var src = worldwide ? region : _almRegionName(region); var i; for (i = 0; i < (pack.fixed || []).length; i++) { var fx = pack.fixed[i]; @@ -4030,6 +4200,9 @@ function _applyRegionHolidays(region, year, month, add) { var day = nh[2] === -1 ? _lastWeekday(year, month, nh[1]) : _nthWeekday(year, month, nh[1], nh[2]); add(day, nh[3], 'holiday', '', src, region); } + // Clock changes are location-specific; layering 18 countries' worth would be + // pure noise, so only the single region-scoped pack contributes them. + if (worldwide) return; // Clock changes: labels hold both hemispheres (October IS spring in AU) var dst = pack.dst; if (dst === 'us') { @@ -4044,6 +4217,16 @@ function _applyRegionHolidays(region, year, month, add) { } } +// Worldwide scope: layer every national pack (skipping the EU pseudo-region, +// which carries no national days of its own — only a DST rule). Each entry is +// tagged with its ISO country code via the worldwide path of _applyRegionHolidays. +function _applyAllRegionHolidays(year, month, add) { + for (var iso in _REGION_HOLIDAYS) { + if (iso === 'EU') continue; + _applyRegionHolidays(iso, year, month, add, true); + } +} + // ── Equinoxes & solstices: computed, not hardcoded (Meeus ch. 27) ────── // JDE0 mean-instant polynomials (valid 1000-3000 CE) plus the 24-term // periodic correction — accurate to minutes. The old code pinned fixed @@ -4167,8 +4350,10 @@ function _gregorianBaseEvents(year, month, add) { // (US, CA, AU, DE, IT, BR, IN, CN, JP and others) if (month === 5) { add(_nthWeekday(year, 5, 0, 2), t('hol_mothers_day'), 'holiday'); } if (month === 6) { add(_nthWeekday(year, 6, 0, 3), t('hol_fathers_day'), 'holiday'); } - // National days + clock changes for the detected region - _applyRegionHolidays(_almRegion(), year, month, add); + // National days: every pack when Worldwide is chosen, else the detected + // region's (which also contributes its clock changes). + if (_almHolidayScope() === 'worldwide') _applyAllRegionHolidays(year, month, add); + else _applyRegionHolidays(_almRegion(), year, month, add); // Easter and related var easter = _computeEaster(year); if (easter.month === month) { add(easter.day, 'Easter', 'holiday'); } @@ -4385,7 +4570,10 @@ function _drawAlmanacGrid() { for (var ei = 0; ei < shown; ei++) { var ev = dayEvents[ei]; var escapedLabel = _th(ev.label).replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>'); - var srcTitle = ev.src ? ' title="' + _tLookup('alm_region_holiday', '{c} holiday').replace('{c}', ev.src).replace(/"/g, '"') + '"' : ''; + // Worldwide entries carry a 2-letter ISO code as src; expand it to the full + // country name for the tooltip ("France holiday", not "FR holiday"). + var srcName = (ev.src && ev.src.length === 2) ? (_almRegionName(ev.src) || ev.src) : ev.src; + var srcTitle = ev.src ? ' title="' + _tLookup('alm_region_holiday', '{c} holiday').replace('{c}', srcName).replace(/"/g, '"') + '"' : ''; // Country-specific holidays (those with a region src) get their own // colour so they read apart from the worldwide observances (#33). var evCls = 'alm-ev alm-ev-' + ev.type + (ev.src ? ' alm-ev-country' : ''); @@ -4405,6 +4593,23 @@ function _drawAlmanacGrid() { } html += '</div>'; + // Holiday scope pill — centered directly under the calendar grid it filters. + // A two-segment pill (Regional/Worldwide) sets the scope; the location + // affordance lives on the sun-map, so no caption here. Gregorian only — the + // national packs are keyed to Gregorian month/day, not other systems. + if (_almSystem === 'gregorian') { + var scope = _almHolidayScope(); + html += '<div class="alm-hol-row">' + + '<div class="alm-scope-seg" role="tablist" aria-label="' + + _tLookup('alm_scope_toggle_hint', 'Switch between your region and every country').replace(/"/g, '"') + '">' + + '<button type="button" class="alm-scope-btn' + (scope === 'region' ? ' active' : '') + '" role="tab" aria-selected="' + (scope === 'region') + '" onclick="_almSetHolidayScope(\'region\')">' + + _tLookup('alm_scope_regional', 'Regional') + '</button>' + + '<button type="button" class="alm-scope-btn' + (scope === 'worldwide' ? ' active' : '') + '" role="tab" aria-selected="' + (scope === 'worldwide') + '" onclick="_almSetHolidayScope(\'worldwide\')">' + + _tLookup('alm_scope_worldwide', 'Worldwide') + '</button>' + + '</div>' + + '</div>'; + } + // Selected day detail — full event list for the selected day var selCal = _jdnToCalendar(_almSystem, _almSelectedJDN); if (selCal.year === _almYear && selCal.month === _almMonth) { @@ -4426,19 +4631,6 @@ function _drawAlmanacGrid() { } } - // Quiet caption saying whose national days are shown. Always present on - // the Gregorian calendar — no pack means the worldwide set, and saying - // so beats an unexplained absence of holidays. - if (_almSystem === 'gregorian') { - var regionName = _almRegionName(_almRegion()); - var capText = regionName - ? _tLookup('alm_showing_holidays', 'Showing {c} holidays').replace('{c}', regionName.replace(/</g, '<')) - : _tLookup('alm_showing_worldwide', 'Showing worldwide holidays'); - html += '<div class="alm-cal-region" title="' + - _tLookup('alm_holidays_follow_hint', 'Follows your location on the map').replace(/"/g, '"') + - '">' + capText + '</div>'; - } - // Cross-reference — selected date in all calendar systems (replaces pills) html += _almRenderCrossRef(_almSelectedJDN); diff --git a/zimi/static/app.css b/zimi/static/app.css index d472997e..22b80f32 100644 --- a/zimi/static/app.css +++ b/zimi/static/app.css @@ -3,21 +3,117 @@ :root { --bg: #0a0a0b; --surface: #141416; --surface2: #1c1c20; --border: #27272b; --text: #e8e8ed; --text2: #8a8a94; + /* Border for interactive controls whose outline is their only affordance + (form fields, toggle tracks). On dark it equals --border; the light block + deepens it to clear 3:1 on paper. */ + --border-strong: var(--border); --accent: #f5f5f7; --amber: #f59e0b; --amber2: #d97706; + /* Ink for text/glyphs sitting ON an amber fill (buttons, active pills, + badges, toggle knobs). Dark theme's amber is bright, so black reads best; + the light block flips it to white because light's amber is deep. One + token keeps ~14 call sites from hardcoding a color that's only legible + in one theme. */ + --on-amber: #000; --amber-glow: rgba(245, 158, 11, 0.08); --amber-border: rgba(245, 158, 11, 0.25); /* text3 is reserved for large-text (≥18px or ≥14px bold) only — it's WCAG-AA compliant against --bg at large sizes (3:1) but not at normal body text. Use --text2 for everything else. */ --text3: #6e6e7a; --text-dim: #6e6e7a; --hover: rgba(245, 158, 11, 0.08); --error: #ef4444; + /* Translucent bar/menu surface (topbar frosted glass). Tokenised so the + light theme can flip it without every backdrop rule carrying a literal. */ + --topbar-bg: rgba(10, 10, 11, 0.85); + /* Raised popover/menu fill (context menus, drawers). One token so the + three call sites can't drift, and the light theme flips it in one place. */ + --card-bg: #1a1a1a; + /* Positive/"sharing active" semantics (seed + peer badges). --success is the + text/icon green; the faint translucent fills stay inline (they read on both + themes). Light theme darkens the ink for contrast on paper. */ + --success: #6ec56e; --success-strong: #84d684; --radius: 10px; --shadow-popup: 0 8px 32px rgba(0,0,0,0.5); color-scheme: dark; font-family: -apple-system, BlinkMacSystemFont, "Inter", "Segoe UI", sans-serif; } + /* ── Light theme ── + Warm-paper, soft-contrast counterpart to the default dark palette — NOT + stark white. The amber accent deepens to a burnt amber (#b45309) so it keeps + AA contrast as text/link on paper AND still reads as a warm fill with black + label text; every `var(--amber*)` reference adapts at once (no per-selector + churn). Applied by [data-theme] on <html>, stamped synchronously in the head + bootstrap so there's no dark flash. Auto mode resolves to dark or light and + sets the same attribute, so the CSS has exactly one code path. + Deliberate seam: the almanac overlay + the home "Today"/space cards keep + their dark cosmic identity in both themes (a night sky is a night sky). */ + :root[data-theme="light"] { + --bg: #f2efe8; --surface: #fbfaf6; --surface2: #ffffff; + --border: #e4dfd4; --text: #26241f; --text2: #6a675e; + /* Amber deepened one more step (#b45309 → #9d4a08) so it clears WCAG-AA as + text/link on paper (5.35:1 on --bg) AND as small amber ink on the faint + amber-glow badge fills (updated / installed / multilingual: 4.70:1). The + fills flip their ink to white via --on-amber, so a deeper amber only + helps them too. */ + --accent: #1a1917; --amber: #9d4a08; --amber2: #92400e; + --amber-glow: rgba(180, 83, 9, 0.10); --amber-border: rgba(180, 83, 9, 0.28); + /* On paper the amber fill is deep, so ink on it flips to white (6.15:1). */ + --on-amber: #fff; + /* text3 deepened (#7c786e → #6f6b60) so the muted 10–12px labels that use it + (download sizes, field notes, dropdown sublabels) clear AA at 4.63:1 — + the dark-theme "large text only" caveat doesn't survive on paper. */ + --text3: #6f6b60; --text-dim: #6f6b60; --hover: rgba(180, 83, 9, 0.10); + --error: #dc2626; + /* Interactive-control borders that carry meaning (form fields, toggle + tracks). The decorative --border (#e4dfd4) is only ~1.2:1 on paper — fine + for card separators that also have a fill change, too weak for a control + whose outline is its only affordance. This deeper grey hits 3:1 on --bg + (3.30) and on --surface (3.63). */ + --border-strong: #8c826f; + /* Card definition on paper: a firmer edge than the decorative --border plus + a soft warm shadow, so tiles/detail cards read as cards, not loose blocks. */ + --card-border: #ddd6c8; + --card-shadow: 0 1px 2px rgba(66, 54, 30, 0.06), 0 3px 8px rgba(66, 54, 30, 0.05); + --topbar-bg: rgba(250, 249, 246, 0.85); + --card-bg: #ffffff; + --success: #2f7d32; --success-strong: #256428; + --shadow-popup: 0 8px 32px rgba(60, 50, 30, 0.16); + color-scheme: light; + } + /* Two single-use status inks that are legible on dark but wash out on paper: + the "reused download" teal and the "stale" ochre. Darkened here rather than + tokenised — one call site each, so a token would be ceremony. */ + :root[data-theme="light"] .dl-source-reuse { color: #0f766e; } + :root[data-theme="light"] .ci-hier-freshness { color: #a16207; } + /* Almanac seam (intentional): the almanac is a canvas-driven night-sky app — + its orrery/sky/star-field paint hardcoded cosmic colors that only read on + dark. Rather than ship a half-lit almanac, we keep its whole subtree dark + under the light app. Custom properties inherit, so redefining the token set + on the overlay container re-establishes the dark palette for every child + (cards, text, pills) without touching almanac.css. The result is a light app + chrome over a deliberately dark cosmic panel — a seam by design, not a bug. */ + :root[data-theme="light"] .almanac-view { + --bg: #0a0a0b; --surface: #141416; --surface2: #1c1c20; + --border: #27272b; --text: #e8e8ed; --text2: #8a8a94; + --accent: #f5f5f7; --amber: #f59e0b; --amber2: #d97706; + --amber-glow: rgba(245, 158, 11, 0.08); --amber-border: rgba(245, 158, 11, 0.25); + --text3: #6e6e7a; --text-dim: #6e6e7a; --hover: rgba(245, 158, 11, 0.08); + --error: #ef4444; --card-bg: #1a1a1a; + --success: #6ec56e; --success-strong: #84d684; + color-scheme: dark; + } + html { height: 100%; overflow-y: auto; overscroll-behavior-y: none; } body { background: var(--bg); color: var(--text); min-height: 100%; padding-top: 56px; overflow: visible; } + /* Anti-flash guard. The head bootstrap stamps .theme-boot on <html> while it + (re)applies the theme, then removes it on the next committed paint. While it + is present, every element's transitions are killed so a bfcache restore / + tab re-activation can't animate a dark->light token flip on pills, cards, + and toggles (the residual Safari flash). Animations are left alone — only + the colour transitions cause the flash. */ + html.theme-boot *, + html.theme-boot *::before, + html.theme-boot *::after { transition: none !important; } + /* ── Accessibility ── */ /* Visually-hide content but keep it readable for screen readers. */ .sr-only { @@ -31,7 +127,7 @@ First tab-stop on the page so keyboard users can jump past the topbar. */ .skip-link { position: absolute; top: -100px; left: 12px; - background: var(--amber); color: #000; + background: var(--amber); color: var(--on-amber); padding: 8px 16px; border-radius: 6px; font-weight: 600; font-size: 14px; z-index: 10000; text-decoration: none; @@ -59,7 +155,7 @@ .topbar { position: fixed; top: 0; left: 0; right: 0; z-index: 200; height: 56px; display: flex; align-items: center; gap: 10px; - padding: 0 16px; background: rgba(10, 10, 11, 0.85); backdrop-filter: blur(20px) saturate(180%); + padding: 0 16px; background: var(--topbar-bg); backdrop-filter: blur(20px) saturate(180%); -webkit-backdrop-filter: blur(20px) saturate(180%); border-bottom: 1px solid var(--border); } @@ -96,7 +192,7 @@ /* One-shot coachmark floated beside the book button on first Reader View. */ .reader-coach { position: fixed; z-index: 9999; max-width: 220px; - background: var(--amber); color: #000; font-size: 12.5px; font-weight: 600; + background: var(--amber); color: var(--on-amber); font-size: 12.5px; font-weight: 600; line-height: 1.3; padding: 8px 11px; border-radius: 10px; box-shadow: var(--shadow-popup); cursor: pointer; opacity: 0; transform: translateY(-4px); transition: opacity .2s, transform .2s; @@ -108,6 +204,30 @@ border-bottom: 6px solid var(--amber); } + /* One-shot tip floated bottom-centre on first article open when a wiktionary + is installed — teaches the select-a-word Define gesture. Dismissible. */ + .define-hint { + position: fixed; z-index: 9999; left: 50%; bottom: 24px; + transform: translateX(-50%) translateY(6px); + display: flex; align-items: center; gap: 9px; + max-width: min(360px, calc(100vw - 32px)); + min-height: 44px; box-sizing: border-box; + background: var(--surface); color: var(--text); + border: 1px solid var(--amber-border); + font-size: 13px; line-height: 1.35; font-weight: 500; + padding: 10px 14px; border-radius: 12px; + box-shadow: var(--shadow-popup); cursor: pointer; + opacity: 0; transition: opacity .2s, transform .2s; + } + .define-hint.visible { opacity: 1; transform: translateX(-50%); } + .define-hint .define-hint-icon { color: var(--amber); flex-shrink: 0; display: flex; } + .define-hint .define-hint-icon svg { width: 18px; height: 18px; } + + @media (prefers-reduced-motion: reduce) { + .define-hint { transition: opacity .18s; } + .define-hint.visible { transform: translateX(-50%); } + } + /* ── History trail dropdown ── */ #history-trail { position: fixed; z-index: 9999; min-width: 220px; max-width: 360px; @@ -249,13 +369,13 @@ } .pill:hover, .lang-pill:hover, .ci-variant-btn:hover, .flavor-pill:hover { border-color: var(--amber-border); color: var(--text); background: var(--amber-glow); } - .pill.active, .lang-pill.active { background: linear-gradient(135deg, var(--amber), var(--amber2)); color: #000; border-color: transparent; font-weight: 600; } + .pill.active, .lang-pill.active { background: linear-gradient(135deg, var(--amber), var(--amber2)); color: var(--on-amber); border-color: transparent; font-weight: 600; } /* Count chip: a subtle padded pill so the number reads as a distinct count and never crowds the label or the pill's edge. The parent gap (5px) separates it from the label; the padding gives the digits breathing room inside the chip. */ .pill .pill-count { opacity: 0.7; font-size: 10px; font-weight: 600; margin-left: 1px; padding: 1px 6px; background: rgba(255, 255, 255, 0.07); border-radius: 8px; } /* Dark chip on the amber active pill — amber-on-amber is unreadable */ - .pill.active .pill-count { opacity: 1; background: rgba(0, 0, 0, 0.22); color: #000; padding: 1px 6px; border-radius: 8px; } + .pill.active .pill-count { opacity: 1; background: rgba(0, 0, 0, 0.22); color: var(--on-amber); padding: 1px 6px; border-radius: 8px; } .pill.dimmed, .lang-pill.dimmed { opacity: 0.35; pointer-events: none; } .pills-divider { width: 60px; height: 1px; background: var(--border); margin: 0 auto 4px; opacity: 0.5; } /* Collection pills carry the layers glyph so they read as groupings, not @@ -291,7 +411,7 @@ background: var(--surface2); color: var(--text); font-size: 12px; font-weight: 500; cursor: pointer; white-space: nowrap; transition: all 0.15s; } - .lang-banner-btn:hover { background: var(--amber); color: #000; border-color: transparent; } + .lang-banner-btn:hover { background: var(--amber); color: var(--on-amber); border-color: transparent; } .lang-banner-dismiss { margin-inline-start: auto; background: none; border: none; color: var(--text2); cursor: pointer; font-size: 14px; padding: 2px 6px; } .lang-banner-dismiss:hover { color: var(--text); } @@ -366,9 +486,50 @@ .ms-user-self-actions { flex-shrink: 0; display: flex; gap: 8px; } /* Role badges in the users list. Muted by default; admin gets amber. */ .ms-role-badge { display: inline-block; font-size: 10px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.04em; padding: 1px 7px; border-radius: 10px; color: var(--text2); background: var(--surface2); border: 1px solid var(--border); vertical-align: middle; } - .ms-role-badge.ms-role-admin { color: #000; background: linear-gradient(135deg, var(--amber), var(--amber2)); border-color: transparent; } + .ms-role-badge.ms-role-admin { color: var(--on-amber); background: linear-gradient(135deg, var(--amber), var(--amber2)); border-color: transparent; } /* Role picker reuses .pill; keep it wrapping rather than scrolling in the narrow users pane. */ #new-user-role, #edit-user-role { flex-wrap: wrap; overflow: visible; margin-bottom: 4px; } + /* Limited scope on a user row → clickable shortcut into the allowlist editor. */ + .ms-user-scope-link { color: var(--amber); cursor: pointer; text-decoration: none; border-bottom: 1px dotted var(--amber-border); } + .ms-user-scope-link:hover { border-bottom-color: var(--amber); } + + /* ── Allowlist picker (per-user Limited + public-access Limited) ── + Searchable, legible checklist: real titles, language badge, article count, + select-all/none, live count summary. Comfortable rows, mobile-friendly. */ + .ms-allowlist-picker { border: 1px solid var(--border); border-radius: 10px; background: var(--surface2); overflow: hidden; max-width: 480px; } + .ms-allow-tools { display: flex; align-items: center; gap: 6px; padding: 8px; border-bottom: 1px solid var(--border); flex-wrap: wrap; } + .ms-allow-search { flex: 1; min-width: 120px; padding: 7px 10px; font-size: 13px; font-family: inherit; color: var(--text); background: var(--surface); border: 1px solid var(--border); border-radius: var(--radius); box-sizing: border-box; } + .ms-allow-search:focus { outline: none; border-color: var(--amber-border); box-shadow: 0 0 0 3px var(--amber-glow); } + .ms-allow-link { padding: 5px 9px; font-size: 12px; font-family: inherit; color: var(--text2); background: none; border: 1px solid var(--border); border-radius: var(--radius); cursor: pointer; transition: all 0.15s; white-space: nowrap; } + .ms-allow-link:hover { color: var(--amber); border-color: var(--amber-border); background: var(--amber-glow); } + .ms-allow-summary { padding: 6px 10px; font-size: 12px; color: var(--text2); border-bottom: 1px solid var(--border); } + .ms-allow-list { max-height: 260px; overflow-y: auto; padding: 4px; } + .ms-allow-row { display: flex; align-items: center; gap: 10px; padding: 8px 8px; font-size: 13px; cursor: pointer; border-radius: 6px; } + .ms-allow-row:hover { background: var(--amber-glow); } + .ms-allow-row input { accent-color: var(--amber); flex-shrink: 0; width: 15px; height: 15px; } + .ms-allow-name { flex: 1; min-width: 0; display: flex; align-items: center; gap: 6px; } + .ms-allow-title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } + .ms-allow-lang { flex-shrink: 0; font-size: 9.5px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.03em; padding: 1px 5px; border-radius: 8px; color: var(--text2); background: var(--surface); border: 1px solid var(--border); } + .ms-allow-count { flex-shrink: 0; font-size: 11px; color: var(--text2); font-variant-numeric: tabular-nums; } + .ms-allow-empty { color: var(--text2); font-size: 12px; padding: 4px 0; } + + /* ── Public access card ── governs the anonymous view; sits atop the pane. */ + .ms-pa-card { margin-bottom: 24px; padding-bottom: 20px; border-bottom: 1px solid var(--border); } + .ms-pa-sub { color: var(--text2); font-size: 13px; margin: 2px 0 12px; } + .ms-pa-env { font-size: 12px; color: var(--text2); background: var(--amber-glow); border: 1px solid var(--amber-border); border-radius: var(--radius); padding: 6px 10px; margin-bottom: 12px; } + .ms-pa-env code { font-size: 11px; color: var(--amber); } + .ms-pa-choices { display: flex; flex-direction: column; gap: 8px; max-width: 480px; } + .ms-pa-choice { display: flex; align-items: flex-start; gap: 10px; padding: 10px 12px; border: 1px solid var(--border); border-radius: 10px; cursor: pointer; transition: all 0.15s; } + .ms-pa-choice:hover { border-color: var(--amber-border); background: var(--amber-glow); } + .ms-pa-choice.active { border-color: var(--amber-border); background: var(--amber-glow); } + .ms-pa-choice.disabled { opacity: 0.55; cursor: not-allowed; } + .ms-pa-choice input { accent-color: var(--amber); margin-top: 2px; flex-shrink: 0; width: 15px; height: 15px; } + .ms-pa-choice-body { display: flex; flex-direction: column; gap: 2px; min-width: 0; } + .ms-pa-choice-title { font-size: 13px; font-weight: 600; color: var(--text); } + .ms-pa-choice-desc { font-size: 12px; color: var(--text2); } + .ms-pa-allowlist { margin-top: 12px; max-width: 480px; } + .ms-pa-allowlist[hidden] { display: none; } + .ms-pa-save { margin-top: 12px; } /* ── Reader View settings palette ── */ /* Popover from the book button (desktop) / ⋯ Reader View row (mobile). Anchored @@ -399,6 +560,9 @@ .rv-swatch:hover { border-color: var(--amber-border); color: var(--text); } .rv-swatch.active { border-color: var(--amber); color: var(--text); } .rv-sw-dot { width: 22px; height: 22px; border-radius: 50%; border: 1px solid rgba(255,255,255,0.14); } + /* Auto = follows the app theme: a split dark/light disc, same language as the + app-theme Auto icon. Half-and-half via a hard-stop gradient. */ + .rv-sw-auto .rv-sw-dot { background: linear-gradient(90deg, #0a0a0b 0 50%, #fbfbf9 50% 100%); border-color: rgba(127,127,127,0.4); } .rv-sw-dark .rv-sw-dot { background: #0a0a0b; } .rv-sw-light .rv-sw-dot { background: #fbfbf9; border-color: rgba(0,0,0,0.18); } .rv-sw-sepia .rv-sw-dot { background: #f4ecd8; border-color: rgba(0,0,0,0.14); } @@ -461,6 +625,13 @@ border-radius: 50%; background: #fff; transition: inset-inline-start 0.15s; } .rv-switch.on .rv-knob { inset-inline-start: 18px; } + /* Light theme: same fix as the .switch iOS toggle — the OFF track needs a + warm-grey fill + AA outline, and its white knob (fine on the dark ON amber) + must darken to --text2 when off so it doesn't vanish on the grey track. */ + :root[data-theme="light"] .rv-switch { + background: #e0dacd; border-color: var(--border-strong); + } + :root[data-theme="light"] .rv-switch:not(.on) .rv-knob { background: var(--text2); } .rv-pal-divider { height: 1px; margin: 6px 6px; background: var(--border); } .rv-exit-row, .rv-action-row { display: flex; align-items: center; gap: 10px; width: 100%; text-align: start; @@ -553,6 +724,11 @@ .cat-heading:first-child { margin-top: 0; } .cat-heading.clickable { cursor: pointer; } .cat-heading.clickable:hover { opacity: 0.8; } + /* The Other catch-all heading reads quieter than a named section (it's the + leftover bucket) — flat muted colour instead of the amber gradient. */ + .cat-heading-other { + background: none; -webkit-text-fill-color: initial; color: var(--text2); opacity: 0.7; + } /* The global view toggle rides on the first section header's line, pinned to its trailing edge. Absolute (not flex) so the gradient-clipped heading text is untouched; text-fill-color reset so the toggle glyphs aren't transparent. */ @@ -572,15 +748,46 @@ .sh-desc { font-size: 13px; color: var(--text2); margin-top: 4px; line-height: 1.5; } .sh-actions { margin-top: 10px; display: flex; gap: 8px; flex-wrap: wrap; } .dl-pill { text-decoration: none; display: inline-block; } + /* zimgit "document collection" flag in the source header meta line */ + .sh-chip { + display: inline-block; font-size: 11px; font-weight: 600; letter-spacing: 0.03em; + color: var(--amber); background: var(--amber-glow); border: 1px solid var(--amber-border); + border-radius: 999px; padding: 1px 8px; vertical-align: middle; + } + /* ── zimgit / PDF collection document list ── */ + .zg-filter { + width: 100%; box-sizing: border-box; margin: 0 0 12px; padding: 9px 12px; + background: var(--surface); color: var(--text); font-size: 14px; + border: 1px solid var(--border); border-radius: var(--radius); outline: none; + transition: border-color 0.2s, box-shadow 0.2s; + } + .zg-filter:focus { border-color: var(--amber-border); box-shadow: 0 0 0 1px var(--amber-glow); } + .zg-doc { display: flex; gap: 12px; align-items: flex-start; } + .zg-icon { + flex-shrink: 0; width: 38px; height: 46px; margin-top: 2px; border-radius: 4px; + background: var(--surface2); border: 1px solid var(--border); + display: flex; align-items: center; justify-content: center; + font-size: 9px; font-weight: 700; letter-spacing: 0.05em; color: var(--amber); + } + .zg-meta { font-size: 11px; color: var(--text2); margin-top: 4px; } + .zg-empty { padding: 28px 8px; text-align: center; color: var(--text2); font-size: 13px; } /* ── Source cards ── */ .stats-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(320px, 1fr)); gap: 8px; margin-top: 8px; } .stat-card { background: var(--surface); border-radius: var(--radius); padding: 14px; - border: 1px solid var(--border); + border: 1px solid var(--card-border, var(--border)); + /* On the light cream the 1px border is ~1.2:1 and cards read as loose + icon+text. A soft shadow (--card-shadow, light-only) lifts them into + defined cards; dark keeps the flat surface-contrast look. Hover overrides + both border-color and box-shadow at higher specificity. */ + box-shadow: var(--card-shadow, none); transition: background 0.25s, border-color 0.25s, box-shadow 0.25s, transform 0.25s; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); display: flex; gap: 14px; align-items: stretch; text-decoration: none; color: inherit; cursor: pointer; + /* Long-press opens the context menu (#37) — suppress iOS's own text-selection + callout / magnifier so the press reads as a clean right-click. */ + -webkit-touch-callout: none; } .stat-card:hover, .stat-card:focus-visible { background: var(--surface2); border-color: var(--amber-border); @@ -599,6 +806,11 @@ } .card-icon { width: 48px; height: 48px; flex-shrink: 0; border-radius: 10px; overflow: hidden; background: var(--surface2); display: flex; align-items: center; justify-content: center; align-self: center; } .card-icon img { width: 42px; height: 42px; object-fit: cover; background: #fff; border-radius: 8px; padding: 2px; } + /* On paper, a source whose favicon is white/transparent (e.g. Army Publishing + Directorate) rendered as an invisible white block on a white card. An inset + ring on the icon block gives it a defined edge regardless of the artwork. */ + :root[data-theme="light"] .card-icon { box-shadow: inset 0 0 0 1px rgba(20, 15, 5, 0.10); } + :root[data-theme="light"] .card-icon img { box-shadow: inset 0 0 0 1px rgba(20, 15, 5, 0.06); } .icon-letter { font-size: 20px; font-weight: 700; background: linear-gradient(135deg, var(--amber), #f97316); -webkit-background-clip: text; -webkit-text-fill-color: transparent; background-clip: text; } .card-info { flex: 1; min-width: 0; display: flex; flex-direction: column; padding-right: 28px; } .stat-card .name { font-size: 14px; font-weight: 600; color: var(--accent); margin-bottom: 2px; } @@ -619,21 +831,49 @@ .lib-view-btn:hover { color: var(--text); background: var(--surface2); } .lib-view-btn.active { color: var(--amber); background: var(--amber-glow); } - /* Compact tiles: square-ish cells, icon on top, name under it, several per row. - Reuses .stat-card markup — only the layout changes. Wider min column than - before so titles have room to breathe (mobile stays ~3 across, desktop gets - roomier tiles via the min-width override below). */ + /* Compact tiles: square-ish cells sharing .stat-card markup (same surface, + radius, border, hover as the detail cards — one family, only the layout + differs). A fixed vertical rhythm on a 4px grid keeps every tile reading + the same regardless of title length: + 28px top band (reserved for the corner chips) → icon → two-line-tall + title (anchors the baseline so short titles don't float) → language chip + in normal flow. + The old layout floated the title and pinned the language badge bottom-left, + where it collided with any title that wrapped to two lines. */ .stats-grid.tiles { grid-template-columns: repeat(auto-fill, minmax(112px, 1fr)); gap: 10px; } - .stats-grid.tiles .stat-card { flex-direction: column; align-items: center; gap: 8px; padding: 14px 10px; text-align: center; } + .stats-grid.tiles .stat-card { + flex-direction: column; align-items: center; justify-content: flex-start; + gap: 8px; padding: 20px 12px 12px; text-align: center; + } .stats-grid.tiles .card-icon { align-self: center; } - .stats-grid.tiles .card-info { align-items: center; padding-right: 0; } + .stats-grid.tiles .card-info { align-items: center; padding-right: 0; gap: 6px; flex: 0 0 auto; } .stats-grid.tiles .desc, .stats-grid.tiles .detail, .stats-grid.tiles .card-cat, .stats-grid.tiles .qid-badge { display: none; } - .stats-grid.tiles .name { font-size: 12px; margin-bottom: 0; line-height: 1.35; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; word-break: break-word; } - /* Badges become corner chips on the tile (icon is centred, so corners are - clear): NEW top-left, language bottom-left. The inline margins from the list - layout are dropped since they're absolutely positioned here. */ - .stats-grid.tiles .new-badge { position: absolute; top: 6px; left: 6px; margin: 0; } - .stats-grid.tiles .lang-badge { display: inline-block; position: absolute; bottom: 6px; left: 6px; margin: 0; } + /* The name row becomes a centred column: the title (.zt) on top, the language + chip on its own line below. */ + .stats-grid.tiles .name { + display: flex; flex-direction: column; align-items: center; gap: 6px; margin: 0; + } + /* Reserve two lines (2 x 1.35 line-height) so a one-line title lands at the + same Y as a two-line one — the anchor that stops titles from floating. */ + .stats-grid.tiles .zt { + font-size: 12px; line-height: 1.35; min-height: 2.7em; + display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + overflow: hidden; word-break: break-word; + } + /* Deterministic badge layout: status chip top-left, star top-right — opposite + corners, so they can never collide at any title length. The language chip + flows on its own line under the title (always visible, never clipped by the + title clamp, never overlapping). Consistent tone with the list's inline chip. + The top band is tight (20px pad): the chips sit high enough to slightly + overlap the icon's top corners, which reads as intentional and reclaims a + few px of tile height. */ + .stats-grid.tiles .new-badge { position: absolute; top: 6px; left: 8px; margin: 0; z-index: 1; } + .stats-grid.tiles .star-btn { top: 5px; right: 6px; z-index: 1; } + /* The chip owns its own line under the title and spells the language out in + full ("Français") — no letter-spacing tracking (that's for the terse code + form in list rows), and allow it to wrap rather than overflow the tile. */ + .stats-grid.tiles .lang-badge { margin: 0; } + .stats-grid.tiles .lang-badge-full { letter-spacing: 0; white-space: normal; max-width: 100%; } /* Compact view hides the empty (unfavorited) star — only a filled star or a hover (pointer devices) reveals it, so tiles aren't peppered with grey stars. */ .stats-grid.tiles .star-btn:not(.starred) { opacity: 0; pointer-events: none; } @@ -715,7 +955,10 @@ position: fixed; z-index: 10001; display: none; background: var(--card-bg, #1a1a1a); border: 1px solid var(--border); border-radius: 10px; box-shadow: 0 8px 24px rgba(0,0,0,0.5); - color: var(--text); font-size: 13px; max-width: 320px; + color: var(--text); font-size: 13px; + /* Never wider than the viewport minus the 8px edge margins the JS clamps to, + so a card near the right edge still fits after _definePosition runs. */ + max-width: min(320px, calc(100vw - 16px)); } .define-popover.open { display: block; } /* Stage 1: the compact "Define" trigger button */ @@ -840,7 +1083,7 @@ .cache-top-label { color: var(--text); font-weight: 600; } .manage-btn-action, .desktop-card .btn-primary, - .coll-form button { background: linear-gradient(135deg, var(--amber), var(--amber2)); color: #000; border: none; border-radius: var(--radius); cursor: pointer; } + .coll-form button { background: linear-gradient(135deg, var(--amber), var(--amber2)); color: var(--on-amber); border: none; border-radius: var(--radius); cursor: pointer; } .manage-btn-action:hover, .desktop-card .btn-primary:hover { opacity: 0.85; } .manage-btn-action:disabled, @@ -867,6 +1110,25 @@ .ms-pane .ms-field input:focus { outline: none; border-color: var(--amber-border); } .ms-pane .ms-field input[readonly] { opacity: 0.6; } .ms-pane .ms-hint { font-size: 12px; color: var(--text2); margin-top: 8px; } + /* App-theme segmented control (Auto / Dark / Light). Three equal pills in a + recessed track, amber-filled when active — mirrors the reader palette's + control language so the two theme pickers feel like one family. */ + .ms-theme-label { font-size: 13px; color: var(--text); margin: 4px 0 8px; } + .app-theme-seg { + display: flex; gap: 4px; padding: 4px; border-radius: var(--radius); + background: var(--surface2); border: 1px solid var(--border); max-width: 340px; + } + .app-theme-btn { + flex: 1; display: inline-flex; align-items: center; justify-content: center; gap: 6px; + padding: 7px 8px; border: 1px solid transparent; border-radius: 7px; + background: none; color: var(--text2); font-size: 12.5px; font-weight: 500; + cursor: pointer; transition: color 0.15s, background 0.15s, border-color 0.15s; + } + .app-theme-btn svg { flex-shrink: 0; } + .app-theme-btn:hover { color: var(--amber); border-color: var(--amber-border); background: var(--amber-glow); } + .app-theme-btn.active { + background: var(--amber); color: var(--on-amber); border-color: transparent; font-weight: 600; + } .ms-section-label, .ci-section-label, .hp-group-label { font-size: 11px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.06em; color: var(--text2); } .ms-section-label { margin-bottom: 8px; } /* Auto-fit grid for catalog + downloads. 320px min → 2 columns in the @@ -922,6 +1184,12 @@ border: 2px solid var(--text2); border-radius: 6px; background: var(--surface2); transition: background 0.15s, border-color 0.15s; } + /* Light theme: --surface2 is pure white, so the unchecked box vanished on the + near-white card. Match the fixed-toggle family — a stronger --border-strong + edge over a warm tinted fill — so the empty box clears the 3:1 contrast bar. */ + :root[data-theme="light"] .catalog-grid .catalog-item .ci-select::before { + border-color: var(--border-strong); background: #e0dacd; + } .catalog-grid .catalog-item .ci-select:checked::before { border-color: var(--amber); background: var(--amber) url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23000' stroke-width='3.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpolyline points='20 6 9 17 4 12'/%3E%3C/svg%3E") center/14px no-repeat; @@ -946,6 +1214,7 @@ background: var(--surface); border: 1px solid var(--border); border-radius: var(--radius); margin-bottom: 6px; transition: border-color 0.2s, opacity 0.3s; max-height: 200px; overflow: hidden; + -webkit-touch-callout: none; /* long-press → context menu, not iOS callout (#37) */ } /* Grid-cell catalog-items don't need a margin — the grid gap handles spacing */ .catalog-grid .catalog-item { margin-bottom: 0; } @@ -1042,6 +1311,34 @@ .dl-item .dl-size { color: var(--text2); flex-shrink: 0; } .dl-item .dl-done { color: var(--amber); font-weight: 600; } .dl-item .dl-error { color: var(--error); font-weight: 600; } + .dl-item .dl-scheduled { color: var(--text2); flex-shrink: 0; font-weight: 500; } + /* Download-scheduling card */ + .ms-toggle-row { display: flex; align-items: center; gap: 8px; font-size: 13px; color: var(--text); cursor: pointer; } + /* Match the app's styled checkbox (amber accent) instead of the bare native + square — consistent with .ms-check / .share-upnp elsewhere in the pane. */ + .ms-toggle-row input[type="checkbox"] { accent-color: var(--amber); width: 15px; height: 15px; flex-shrink: 0; } + .ms-toggle-row input[disabled] { cursor: not-allowed; } + .ms-dl-window { display: flex; flex-wrap: wrap; align-items: center; gap: 14px; margin-top: 10px; } + .ms-dl-window label { display: flex; align-items: center; gap: 6px; font-size: 12px; color: var(--text2); } + .ms-dl-window input[type="time"] { + background: var(--surface2); color: var(--text); border: 1px solid var(--border); + border-radius: 6px; padding: 4px 6px; font-size: 13px; + } + .ms-dl-window input[type="time"]:disabled { opacity: 0.6; } + .ms-dl-speed { margin-top: 12px; } + .dl-window-chip { font-size: 11px; font-weight: 600; padding: 2px 8px; border-radius: 999px; white-space: nowrap; } + .dl-window-chip.dl-window-in { color: var(--amber); background: var(--amber-glow); border: 1px solid var(--amber-border); } + .dl-window-chip.dl-window-out { color: var(--text2); background: var(--surface2); border: 1px solid var(--border); } + /* Backup & export hub */ + .ms-backup-actions { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; margin-top: 10px; } + .ms-backup-import { margin-top: 10px; display: flex; flex-direction: column; gap: 8px; align-items: flex-start; } + /* Import preview: a bordered diff summary the admin confirms before anything applies. */ + .ms-backup-preview { + align-self: stretch; padding: 12px; border: 1px solid var(--border); + border-radius: 8px; background: var(--surface2); display: flex; flex-direction: column; gap: 4px; + } + .ms-backup-pv-line { font-size: 13px; color: var(--text); } + .ms-dl-trickle { margin-top: 8px; } .dl-progress { height: 4px; background: var(--surface2); border-radius: 2px; margin-top: 8px; overflow: hidden; } .dl-progress-bar { height: 100%; background: var(--amber); border-radius: 2px; transition: width 0.5s; } .dl-actions { display: flex; gap: 8px; align-items: center; margin-top: 6px; } @@ -1057,10 +1354,18 @@ .dl-filter-pill { display: inline-flex; align-items: center; gap: 4px; } + /* Top-level bulk controls (Pause all / Resume all / Delete all). Shares the + download-row button shape; the danger variant flips to the error tone. */ + .dl-bulk-bar { display: flex; gap: 6px; flex-wrap: wrap; margin: 0 0 12px 0; } + .dl-bulk-btn { background: none; border: 1px solid var(--border); color: var(--text2); + padding: 4px 12px; border-radius: 12px; font-size: 11px; font-family: inherit; cursor: pointer; + transition: all 0.15s; min-height: 24px; } + .dl-bulk-btn:hover { border-color: var(--amber); color: var(--amber); } + .dl-bulk-btn.dl-bulk-danger:hover { border-color: var(--error); color: var(--error); } /* background:none beats .pill.active's amber gradient (same specificity, later in source) — amber label on amber fill was unreadable. */ .dl-filter-pill.active { color: var(--amber); border-color: var(--amber); background: none; font-weight: 600; } - .dl-filter-pill.active .pill-count { opacity: 1; background: var(--amber); color: #000; padding: 1px 6px; border-radius: 8px; } + .dl-filter-pill.active .pill-count { opacity: 1; background: var(--amber); color: var(--on-amber); padding: 1px 6px; border-radius: 8px; } /* One shape for the whole download-row button family */ .dl-pause-btn, .dl-cancel-btn, .dl-retry-btn { background: none; border: 1px solid var(--border); color: var(--text2); padding: 4px 12px; border-radius: 12px; font-size: 11px; cursor: pointer; transition: all 0.15s; @@ -1081,8 +1386,21 @@ .dl-retry-btn:hover { border-color: var(--amber); color: var(--amber); } .dl-mirror { font-size: 11px; color: var(--text2); flex: 1; } /* BT card controls: always rendered (fixed height); dimmed + non-interactive - when BT is off so a toggle never adds/removes rows and nothing jumps. */ - .share-bt-controls { margin-top: 8px; } + when BT is off so a toggle never adds/removes rows and nothing jumps. + A strict two-column grid (label | control) so every textbox lines up in a + single column, however wide the label. Each .share-field goes + display:contents so its <label> + control drop straight into this grid. */ + .share-bt-controls { margin-top: 8px; display: grid; grid-template-columns: max-content minmax(0, 1fr); gap: 7px 12px; align-items: center; } + .share-bt-controls .share-field { display: contents; } + .share-bt-controls .share-field > label { min-width: 0; } + /* The controls share the card row with the toggle, so column 2 is narrow on a + phone. The wide port group (input + dot + recheck + UPnP) wraps within its + cell — its input stays top-left, aligned with the numeric inputs above, + while the extras drop to a second line rather than overrun the card. */ + .share-bt-controls .share-port-group { flex-wrap: wrap; row-gap: 5px; } + /* Server name fills its grid cell rather than a fixed 130-160px that would + overrun the narrow phone column; border-box so padding stays inside. */ + .share-bt-controls .peer-name-input { width: 100%; box-sizing: border-box; } .share-bt-controls.share-controls-off { opacity: 0.4; } .share-bt-controls.share-controls-off .share-port-dot { opacity: 0.5; } .share-inactive { opacity: 0.5; } @@ -1127,9 +1445,15 @@ /* 5 digits of monospace + left/right padding + the number spinner arrows; 8ch clipped the last digit once the spinner was accounted for. */ .share-port-input { width: 78px; } - .share-num-input:disabled { opacity: 0.5; } + /* Disabled (env-locked / BT-off) port + numeric fields: half-opacity turned the + value into illegible grey-on-grey on paper. Keep the value readable with a + muted colour on a recessed fill instead — still clearly inactive, but the + number (e.g. an env-locked 16881) stays legible. */ + .share-num-input:disabled { opacity: 1; color: var(--text2); background: var(--bg); border-color: var(--border); cursor: not-allowed; } .peer-name-input { width: 160px; background: var(--surface2); border: 1px solid var(--border); border-radius: 6px; color: var(--text); font-family: monospace; font-size: 12px; padding: 3px 8px; text-align: left; } - .share-port-dot { width: 10px; height: 10px; border-radius: 50%; display: inline-block; } + /* Ring so the status dot stays visible even when its colour is a low-key grey + (unknown / env-locked reachability) sitting on a same-tone field. */ + .share-port-dot { width: 10px; height: 10px; border-radius: 50%; display: inline-block; box-shadow: 0 0 0 1px rgba(127, 127, 127, 0.32); } .dl-seed-link { cursor: pointer; } .dl-seed-link:hover { color: var(--amber); } /* Seed cards: icon + title on the first row, the "Sharing · …" status @@ -1152,6 +1476,7 @@ @media (max-width: 600px) { .share-field { flex-wrap: wrap; row-gap: 5px; } .share-field > label { min-width: 62px; } + .share-bt-controls { column-gap: 8px; } .share-row-right { gap: 6px; } .peer-name-input { width: 130px; } .share-port-group { gap: 8px; } @@ -1178,7 +1503,7 @@ .manage-tab.active { color: var(--amber); border-bottom-color: var(--amber); font-weight: 600; } .dl-tab-badge { display: inline-block; margin-left: 6px; padding: 1px 7px; - background: var(--amber); color: #000; border-radius: 10px; + background: var(--amber); color: var(--on-amber); border-radius: 10px; font-size: 11px; font-weight: 600; line-height: 1.4; min-width: 8px; text-align: center; } .dl-empty { @@ -1254,6 +1579,21 @@ @media (prefers-reduced-motion: reduce) { .switch-slider, .switch-slider::before { transition: none; } } + /* Light theme: the OFF track (--surface2 = #fff) vanishes on a near-white card + (1.04:1) — the maintainer flagged the BitTorrent switch. Give it a warm-grey + fill with an AA outline (--border-strong, 3.63:1) so it reads as a control, + and flip the ON knob to white since the deep-amber ON track needs light ink + (#000 knob would sink to ~3.6:1). The OFF knob stays --text2, which clears + 3:1 on the grey track (4.06:1). */ + :root[data-theme="light"] .switch-slider { + background: #e0dacd; border-color: var(--border-strong); + } + :root[data-theme="light"] .switch input:checked + .switch-slider { + border-color: transparent; + } + :root[data-theme="light"] .switch input:checked + .switch-slider::before { + background: var(--on-amber); + } /* Long option lists (languages, hot ZIMs) hide behind a Show-list toggle. :not() + !important beat later same-specificity display rules @@ -1268,7 +1608,7 @@ .hot-zims-search { flex: 1; min-width: 0; padding: 6px 10px; - background: var(--bg); border: 1px solid var(--border); border-radius: var(--radius); + background: var(--bg); border: 1px solid var(--border-strong); border-radius: var(--radius); color: var(--text); font-size: 13px; } .hot-zims-search:focus { outline: none; border-color: var(--amber); } @@ -1341,7 +1681,7 @@ display: inline-flex; align-items: center; gap: 8px; padding: 2px 8px; border-radius: 10px; font-size: 11px; line-height: 1.4; - background: rgba(120, 200, 120, 0.12); color: #6ec56e; + background: rgba(120, 200, 120, 0.12); color: var(--success); border: 1px solid rgba(120, 200, 120, 0.3); /* Touch target — bumped to 24px for clickable variant; the static (already-installed) variant inherits the smaller size. */ @@ -1353,10 +1693,10 @@ .ci-peer-pill-clickable:hover { background: rgba(120, 200, 120, 0.22); border-color: rgba(120, 200, 120, 0.55); - color: #84d684; + color: var(--success-strong); } .ci-peer-pill-clickable:focus-visible { - outline: 2px solid #6ec56e; outline-offset: 2px; + outline: 2px solid var(--success); outline-offset: 2px; } .ci-hier-installed, .ci-hier-subset, @@ -1365,7 +1705,7 @@ font-size: 11px; line-height: 1.4; } .ci-hier-installed { - background: rgba(120, 200, 120, 0.12); color: #6ec56e; + background: rgba(120, 200, 120, 0.12); color: var(--success); border: 1px solid rgba(120, 200, 120, 0.3); } .ci-hier-subset { @@ -1377,7 +1717,7 @@ .ci-hier-coverage { display: inline-block; padding: 2px 8px; border-radius: 10px; font-size: 11px; line-height: 1.4; - background: rgba(120, 200, 120, 0.08); color: #6ec56e; + background: rgba(120, 200, 120, 0.08); color: var(--success); border: 1px solid rgba(120, 200, 120, 0.25); } .ci-hier-freshness { @@ -1391,6 +1731,15 @@ .manage-installed-group { margin-bottom: 24px; } .manage-installed-group .ci-section-label { margin-top: 0; } .mig-updates .ci-section-label { color: var(--amber); } + /* Drag-to-move (#37): the row being dragged dims; a section header lights up + while it's a valid drop target. Both tokens theme-track (light + dark). */ + .catalog-item.ci-dragging { opacity: 0.4; } + .ci-section-label[data-cat] { border-radius: var(--radius); transition: color 0.1s, background 0.1s, box-shadow 0.1s; } + .ci-section-label.drop-target { + color: var(--amber); + background: var(--amber-glow); + box-shadow: inset 0 0 0 1px var(--amber-border); + } /* BT seeding panel in Server settings */ .seeding-totals { font-size: 12px; color: var(--text2); margin-bottom: 8px; } @@ -1517,16 +1866,21 @@ /* ── Password modal ── */ .pw-overlay { display:none; position:fixed; inset:0; background:rgba(0,0,0,0.6); z-index:200; align-items:center; justify-content:center; } .pw-overlay.open { display:flex; } + /* Login gate (private public-access mode): the overlay becomes fully opaque + so the anonymous visitor sees nothing but the login card — no half-loaded + home showing through. Highest layer, and the background page can't scroll. */ + body.login-gate { overflow:hidden; } + body.login-gate .pw-overlay { background:var(--bg); z-index:1000; } .pw-box { background:var(--surface); border:1px solid var(--border); border-radius:12px; padding:24px; width:320px; max-width:90vw; } .pw-box h3 { margin:0 0 12px; font-size:15px; color:var(--text); } /* 16px minimum — iOS Safari auto-zooms (and stays zoomed) on focus of any input smaller than 16px. */ - .pw-box input[type="password"], .pw-box input[type="text"] { width:100%; padding:8px 10px; border-radius:var(--radius); border:1px solid var(--border); background:var(--bg); color:var(--text); font-size:16px; box-sizing:border-box; } + .pw-box input[type="password"], .pw-box input[type="text"] { width:100%; padding:8px 10px; border-radius:var(--radius); border:1px solid var(--border-strong); background:var(--bg); color:var(--text); font-size:16px; box-sizing:border-box; } .pw-box input[type="password"]:focus, .pw-box input[type="text"]:focus { outline:none; border-color:var(--amber); } .pw-box input#pw-username { margin-bottom:8px; } .pw-box .pw-actions { display:flex; gap:8px; margin-top:12px; justify-content:flex-end; } .pw-box button { padding:6px 14px; border-radius:var(--radius); border:1px solid var(--border); background:var(--surface2); color:var(--text); cursor:pointer; font-size:13px; } - .pw-box button.pw-primary { background:linear-gradient(135deg, var(--amber), var(--amber2)); color:#000; border-color:transparent; font-weight:600; } + .pw-box button.pw-primary { background:linear-gradient(135deg, var(--amber), var(--amber2)); color: var(--on-amber); border-color:transparent; font-weight:600; } .pw-box button.pw-primary:hover { opacity:0.85; } .pw-box .pw-error { color:var(--error); font-size:12px; margin-top:8px; display:none; } @@ -1547,7 +1901,7 @@ .desktop-card label { display: block; font-size: 12px; font-weight: 600; color: var(--text2); margin-bottom: 6px; text-transform: uppercase; letter-spacing: 0.06em; } .desktop-card .field-row { display: flex; gap: 8px; margin-bottom: 16px; } .desktop-card input[type="text"], .desktop-card input[type="number"] { - flex: 1; padding: 9px 12px; background: var(--bg); border: 1px solid var(--border); + flex: 1; padding: 9px 12px; background: var(--bg); border: 1px solid var(--border-strong); border-radius: var(--radius); color: var(--text); font-size: 14px; font-family: inherit; } .desktop-card input[type="text"]:focus, .desktop-card input[type="number"]:focus { outline: none; border-color: var(--amber-border); box-shadow: 0 0 0 3px var(--amber-glow); } @@ -1595,6 +1949,13 @@ .star-btn:hover { opacity: 1; color: var(--amber); transform: scale(1.2); } .star-btn.starred { opacity: 1; color: var(--amber); } .stat-card { position: relative; } + /* While a long-press is armed/fired (#37), suppress text selection on the + pressed cards so the hold opens the menu instead of highlighting a label. + Scoped to the armed root and only for the press duration (user-select + inherits to the card's children). */ + .lp-armed .stat-card, .lp-armed .catalog-item { + -webkit-user-select: none; user-select: none; + } /* "New"/"Updated" flag for recently-installed or changed ZIMs (#34). In the full list it sits inline at the head of the title — it can never cover the left icon. A subtle outlined amber pill in small caps, matching the app's @@ -1602,7 +1963,7 @@ .new-badge { display: inline-block; vertical-align: middle; margin-inline-end: 6px; z-index: 2; - background: var(--amber); color: #1a1205; font-size: 9px; font-weight: 700; + background: var(--amber); color: var(--on-amber); font-size: 9px; font-weight: 700; letter-spacing: 0.06em; text-transform: uppercase; padding: 2px 6px; border-radius: 5px; line-height: 1.2; pointer-events: none; } @@ -1631,6 +1992,7 @@ padding: 4px 0; z-index: 10000; } .ctx-sub.flip-left { left: auto; right: 100%; } + .ctx-sub.flip-up { top: auto; bottom: -4px; } .ctx-item:hover > .ctx-sub, .ctx-item.kb-open > .ctx-sub { display: block; } /* Keyboard focus reads like hover (roving tabindex, ARIA menu pattern). */ .ctx-item:focus, .ctx-item:focus-visible { background: var(--amber-glow); color: var(--amber); outline: none; } @@ -1660,8 +2022,10 @@ } .reorder-row-col { border-style: dashed; } .reorder-row.dragging { opacity: 0.5; cursor: grabbing; border-color: var(--amber); } - /* Grip is the drag affordance; the ▲▼ buttons remain the keyboard fallback. */ - .reorder-grip { flex-shrink: 0; color: var(--text3); display: inline-flex; align-items: center; } + /* Grip is the drag affordance; the ▲▼ buttons remain the keyboard fallback. + touch-action:none lets the touch drag own the gesture that starts on the + grip (the list still scrolls when a drag starts anywhere else). */ + .reorder-grip { flex-shrink: 0; color: var(--text3); display: inline-flex; align-items: center; cursor: grab; touch-action: none; } /* Type icon: collections read amber (their signature), categories muted. */ .reorder-type { flex-shrink: 0; display: inline-flex; align-items: center; color: var(--text2); } .reorder-row-col .reorder-type { color: var(--amber); } @@ -1676,6 +2040,53 @@ } .reorder-btn:hover:not(:disabled) { color: var(--amber); border-color: var(--amber-border); background: var(--amber-glow); } .reorder-btn:disabled { opacity: 0.3; cursor: default; } + /* Other catch-all + declared-empty rows read quieter — they're structural, not + content. Still fully AA (muted labels, not disabled). */ + .reorder-row-other, .reorder-row-empty { border-style: dashed; } + .reorder-row-other .reorder-label, .reorder-row-empty .reorder-label { color: var(--text2); } + /* ✕ to drop an empty declared section (only present before any ZIM lives there). */ + .reorder-remove { + flex-shrink: 0; width: 22px; height: 22px; padding: 0; line-height: 1; + display: inline-flex; align-items: center; justify-content: center; font-size: 15px; + background: transparent; border: none; border-radius: var(--radius); + color: var(--text3); cursor: pointer; transition: color 0.1s, background 0.1s; + } + .reorder-remove:hover { color: var(--danger, #e5484d); background: var(--amber-glow); } + /* Add-section pill: dashed amber, matches the reorder link-out pill. */ + .reorder-add { + display: inline-flex; align-items: center; gap: 5px; margin-top: 10px; + color: var(--amber); border-color: var(--amber-border); border-style: dashed; + background: var(--amber-glow); + } + .reorder-add:hover { color: var(--amber); border-color: var(--amber); background: var(--amber-glow); border-style: dashed; } + /* Inline "Add category" input row (replaces the old prompt() dialog). */ + .reorder-add-row { + display: flex; align-items: center; gap: 6px; margin-top: 10px; + } + .reorder-add-input { + flex: 1; min-width: 0; padding: 8px 12px; font-size: 13px; + background: var(--surface); border: 1px solid var(--amber-border); + border-radius: var(--radius); color: var(--text); outline: none; + } + .reorder-add-input:focus { border-color: var(--amber); } + .reorder-add-ok, .reorder-add-cancel { + flex-shrink: 0; width: 30px; height: 32px; padding: 0; line-height: 1; + display: inline-flex; align-items: center; justify-content: center; + background: var(--surface); border: 1px solid var(--border); + border-radius: var(--radius); cursor: pointer; + transition: color 0.1s, border-color 0.1s, background 0.1s; + } + .reorder-add-ok { color: var(--amber); border-color: var(--amber-border); } + .reorder-add-ok:hover { border-color: var(--amber); background: var(--amber-glow); } + .reorder-add-cancel { color: var(--text3); font-size: 17px; } + .reorder-add-cancel:hover { color: var(--text); border-color: var(--text3); } + /* Brief highlight when the "Customize categories" pointer scrolls the panel + into view (mirrors the almanac holidays caption's scroll+flash). */ + .ms-flash { animation: msFlash 1.6s ease-out; border-radius: var(--radius); } + @keyframes msFlash { + 0%, 20% { box-shadow: 0 0 0 2px var(--amber), 0 0 14px var(--amber-glow); } + 100% { box-shadow: 0 0 0 0 transparent, 0 0 0 transparent; } + } /* ── Collections manage ── */ .coll-form { display: flex; gap: 8px; margin-bottom: 16px; flex-wrap: wrap; } @@ -1783,6 +2194,24 @@ .dc-icon-thumb { width: 100%; height: 120px; display: flex; align-items: center; justify-content: center; background: var(--surface2); } .dc-icon-thumb img { width: 48px; height: 48px; opacity: 0.6; } .dc-dice { font-size: 12px; flex-shrink: 0; opacity: 0.7; } + /* Video ZIMs (TED/Khan): play badge centered over the 120px thumbnail so a + "random" pick reads as "play a video", not "read an article". */ + .dc-video-card { position: relative; } + .dc-play-badge { + position: absolute; top: 60px; left: 50%; transform: translate(-50%, -50%); + width: 46px; height: 46px; border-radius: 50%; background: rgba(0, 0, 0, 0.55); + -webkit-backdrop-filter: blur(2px); backdrop-filter: blur(2px); + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.4); pointer-events: none; + display: flex; align-items: center; justify-content: center; + transition: background 0.25s, transform 0.25s; + } + .dc-play-badge::after { + content: ''; width: 0; height: 0; margin-left: 3px; + border-style: solid; border-width: 9px 0 9px 15px; + border-color: transparent transparent transparent #fff; + } + .dc-video-card:hover .dc-play-badge { background: var(--amber); transform: translate(-50%, -50%) scale(1.08); } + .dc-video-card:hover .dc-play-badge::after { border-left-color: #0a0a0b; } /* ── Today card — moon phase + star field ── */ .dc-today { width: 100%; height: 120px; position: relative; background: linear-gradient(135deg, #0a0e1a 0%, #141c2e 50%, #0d1220 100%); overflow: hidden; } .dc-star { position: absolute; width: 2px; height: 2px; background: #fff; border-radius: 50%; animation: dc-twinkle 3s ease-in-out infinite; } @@ -1804,6 +2233,18 @@ *, *::before, *::after { animation-duration: 0.01ms !important; transition-duration: 0.01ms !important; } } + /* ── Touch-device input zoom guard ── + iOS Safari auto-zooms the page when a focused text-entry control has a + font-size below 16px. Many of our inputs use denser sizes (Add User 13px, + search/port fields 11–13px) which triggered that zoom on tap. On coarse + (touch) pointers, floor every text-entry control at 16px so focusing an + input never zooms; desktop keeps the compact sizes. Checkbox/radio/range/ + color aren't font-sized and don't zoom, so they're excluded. */ + @media (pointer: coarse) { + input:not([type=checkbox]):not([type=radio]):not([type=range]):not([type=color]):not([type=file]), + select, textarea { font-size: 16px; } + } + /* ── Forced colors (Windows High Contrast, etc.) ── When the OS forces a color scheme, our custom CSS variables get overridden anyway. The wins here are: keep focus rings visible, @@ -1836,7 +2277,7 @@ position: absolute; top: -5px; right: -5px; min-width: 17px; height: 17px; padding: 0 4px; box-sizing: border-box; display: none; align-items: center; justify-content: center; - background: var(--amber); color: #000; + background: var(--amber); color: var(--on-amber); border: 1.5px solid var(--bg); border-radius: 9px; font-size: 10px; font-weight: 700; line-height: 1; font-variant-numeric: tabular-nums; cursor: pointer; @@ -1849,7 +2290,7 @@ /* Download count shown on the ⋯-menu's Manage row (mobile). */ .topbar-menu-item .tbm-count { margin-left: auto; padding: 1px 7px; - background: var(--amber); color: #000; border-radius: 10px; + background: var(--amber); color: var(--on-amber); border-radius: 10px; font-size: 11px; font-weight: 600; line-height: 1.4; font-variant-numeric: tabular-nums; } diff --git a/zimi/static/app.js b/zimi/static/app.js index 6c9712f9..a76b09f0 100644 --- a/zimi/static/app.js +++ b/zimi/static/app.js @@ -39,12 +39,26 @@ var SK = { // One-shot: set once the "tap again for reading settings" coachmark has been // shown, so the hint never nags a returning reader. READER_COACH: 'zimi_reader_settings_coach', + // One-shot: set once the "select any word to define it" tip has been shown (or + // the moment the reader first uses Define), so the tip appears at most once. + DEFINE_HINT: 'zimi_define_hint_seen', // Last-rendered SHARING rows (Server pane) — restored synchronously on // pane open so the section doesn't pop in after the status fetches. SHARE_ROWS: 'zimi_share_rows', // Last-active manage settings section (library|preferences|server|users). // Session-scoped so a reload (or re-entering Manage) lands on the same tab. MANAGE_SECTION: 'zimi_manage_section', + // Video resume ledger: {"<zim>\n<path>#<i>": {t, d, ts}} — playback position + // per video, restored on reopen and dropped once watched to completion. + VIDEO_RESUME: 'zimi_video_resume', + // Whole-app theme: 'auto' (follow prefers-color-scheme, dark fallback) | + // 'dark' | 'light'. Default auto. Read/written via _appTheme/_setAppTheme; + // the head bootstrap in index.html stamps the resolved value pre-paint. + APP_THEME: 'zimi_app_theme', + // Auto-darken raw (non-Reader-View) ZIM articles when the app is dark, so a + // blinding-white ZIM page doesn't break dark mode. Tri-state: unset = follow + // the app theme (on when dark); '1'/'0' = explicit override once toggled. + DARKEN_ARTICLES: 'zimi_darken_articles', }; // ── Storage Helpers ── @@ -63,6 +77,176 @@ function _getStorageFlag(key) { return localStorage.getItem(key) === '1'; } +// ── Whole-app theme (Auto / Dark / Light) ── +// The token palette in app.css is driven by data-theme on <html>. Auto mode +// resolves the OS preference to a concrete 'dark'|'light' and stamps the SAME +// attribute, so the CSS has one code path (no reliance on prefers-color-scheme +// in the stylesheet). The head bootstrap sets it pre-paint; this re-applies on +// load and, in Auto, live-tracks the media query. +var APP_THEMES = ['auto', 'dark', 'light']; +function _appTheme() { + var v = localStorage.getItem(SK.APP_THEME); + return APP_THEMES.indexOf(v) >= 0 ? v : 'auto'; +} +function _prefersLight() { + return !!(window.matchMedia && window.matchMedia('(prefers-color-scheme: light)').matches); +} +// Resolve a stored mode to the concrete theme actually painted. Auto → the OS +// preference, dark fallback (matches the index.html bootstrap exactly). +function _resolveAppTheme(mode) { + mode = mode || _appTheme(); + if (mode === 'light') return 'light'; + if (mode === 'dark') return 'dark'; + return _prefersLight() ? 'light' : 'dark'; +} +function _appThemeIsDark() { return _resolveAppTheme() === 'dark'; } +function _applyAppTheme() { + var t = _resolveAppTheme(); + var el = document.documentElement; + el.setAttribute('data-theme', t); + // Keep the UA surface (scrollbars, form controls, Safari's tab backdrop) in + // sync with the app theme — this is what prevents the dark compositor flash + // on tab re-activation. Mirrors the head bootstrap. + el.style.colorScheme = t; +} +function _setAppTheme(mode) { + if (APP_THEMES.indexOf(mode) < 0) mode = 'auto'; + if (mode === 'auto') localStorage.removeItem(SK.APP_THEME); + else localStorage.setItem(SK.APP_THEME, mode); + _applyAppTheme(); + // Repaint the segmented control's active state in place, and re-apply article + // darkening (its default follows the app theme, and the darken row's checked + // state may flip when the theme does). + var seg = document.getElementById('app-theme-seg'); + if (seg) seg.innerHTML = _appThemeSegInner(); + var darkChk = document.getElementById('ms-darken-articles'); + if (darkChk && localStorage.getItem(SK.DARKEN_ARTICLES) === null) darkChk.checked = _appThemeIsDark(); + try { _applyArticleDarken(_readerFrameDoc()); } catch (e) {} + _reapplyReaderThemeIfAuto(); +} +// When the reader theme is set to Auto, it follows the app theme — so an app +// theme change (manual or OS flip) must re-stamp an open reader. Hoisted, so it +// can be called from the app-theme handlers above the reader definitions. +function _reapplyReaderThemeIfAuto() { + if (typeof _readerThemeMode !== 'function' || _readerThemeMode() !== 'auto') return; + try { var d = _readerFrameDoc(); if (d && _readerViewOn) _applyReaderTheme(d); } catch (e) {} + try { _tintReaderChrome(); } catch (e) {} +} +// Install once: when in Auto, a live OS light/dark flip re-resolves the theme. +var _appThemeMediaBound = false; +function _bindAppThemeMedia() { + if (_appThemeMediaBound || !window.matchMedia) return; + _appThemeMediaBound = true; + var mq = window.matchMedia('(prefers-color-scheme: dark)'); + var onFlip = function() { + if (_appTheme() !== 'auto') return; // explicit choice ignores the OS + _applyAppTheme(); + try { _applyArticleDarken(_readerFrameDoc()); } catch (e) {} + _reapplyReaderThemeIfAuto(); + }; + if (mq.addEventListener) mq.addEventListener('change', onFlip); + else if (mq.addListener) mq.addListener(onFlip); // Safari <14 +} + +// ── Auto-darken raw articles ── +// Whether the darken-articles adaptation should be applied to a raw ZIM page. +// Default follows the app theme (on when dark); an explicit toggle overrides. +function _darkenArticlesOn() { + var v = localStorage.getItem(SK.DARKEN_ARTICLES); + if (v === '1') return true; + if (v === '0') return false; + return _appThemeIsDark(); +} +function _setDarkenArticles(on) { + localStorage.setItem(SK.DARKEN_ARTICLES, on ? '1' : '0'); + try { _applyArticleDarken(_readerFrameDoc()); } catch (e) {} +} + +// ── App-theme segmented control (Display settings) ── +// Auto / Dark / Light, matching the reader palette's control language (pills). +var _APP_THEME_ICONS = { + auto: '<svg aria-hidden="true" width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="9"/><path d="M12 3a9 9 0 0 0 0 18z" fill="currentColor" stroke="none"/></svg>', + dark: '<svg aria-hidden="true" width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/></svg>', + light: '<svg aria-hidden="true" width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="4.2"/><path d="M12 2v2M12 20v2M4.9 4.9l1.4 1.4M17.7 17.7l1.4 1.4M2 12h2M20 12h2M4.9 19.1l1.4-1.4M17.7 6.3l1.4-1.4"/></svg>' +}; +function _appThemeSegInner() { + var cur = _appTheme(); + return APP_THEMES.map(function(m) { + var on = m === cur; + return '<button type="button" class="app-theme-btn' + (on ? ' active' : '') + + '" role="radio" aria-checked="' + (on ? 'true' : 'false') + + '" onclick="_setAppTheme(\'' + m + '\')">' + _APP_THEME_ICONS[m] + + '<span>' + tH('theme_' + m) + '</span></button>'; + }).join(''); +} +function _appThemeSegHtml() { + return '<div class="app-theme-seg" id="app-theme-seg" role="radiogroup" aria-label="' + + escAttr(t('app_theme')) + '">' + _appThemeSegInner() + '</div>'; +} + +// ── Article dark adaptation (raw / non-Reader-View pages) ── +var _ARTICLE_DARKEN_STYLE_ID = 'zimi-article-darken'; +// The invert-based adaptation. invert(1) hue-rotate(180deg) on the root flips the +// page to dark while roughly preserving hue; media + math + anything painting its +// own background image is counter-inverted so photos/diagrams/formulas stay true. +// A slightly-off-white root background gives the invert a clean white to flip to +// pure near-black, so transparent pages don't leave a grey haze. +var _ARTICLE_DARKEN_CSS = [ + 'html{background:#ffffff !important;filter:invert(1) hue-rotate(180deg) !important;', + '-webkit-filter:invert(1) hue-rotate(180deg) !important}', + 'img,video,picture,canvas,svg,image,embed,object,iframe,', + '[style*="background-image"],.mwe-math-element,.mwe-math-fallback-image-inline,', + '.mwe-math-fallback-image-display{filter:invert(1) hue-rotate(180deg) !important;', + '-webkit-filter:invert(1) hue-rotate(180deg) !important}' +].join(''); +// A page "declares its own dark scheme" (so we must NOT invert it, or we'd flip it +// back to blinding white) when it opts into dark via <meta name="color-scheme"> +// or its body already paints a dark background. +function _articleDeclaresDark(doc) { + try { + var meta = doc.querySelector('meta[name="color-scheme"]'); + if (meta && /dark/i.test(meta.getAttribute('content') || '')) return true; + } catch (e) {} + try { + var bg = doc.defaultView.getComputedStyle(doc.body).backgroundColor; + var m = bg && bg.match(/rgba?\(([^)]+)\)/); + if (m) { + var p = m[1].split(',').map(parseFloat); + var a = p.length > 3 ? p[3] : 1; + // Only trust an opaque background; a transparent body defaults to white. + if (a >= 0.5) { + var lum = (0.2126 * p[0] + 0.7152 * p[1] + 0.0722 * p[2]) / 255; + if (lum < 0.4) return true; + } + } + } catch (e) {} + return false; +} +// Apply or remove the dark adaptation on a raw article document. No-op for +// Reader View (it owns its themes), PDF/static viewer pages, and pages that ship +// their own dark scheme. Idempotent — safe to call on any frame.onload or toggle. +function _applyArticleDarken(doc) { + if (!doc || !doc.documentElement) return; + var existing = doc.getElementById(_ARTICLE_DARKEN_STYLE_ID); + var want = _darkenArticlesOn() && !_readerViewOn; + if (want) { + var loc = ''; + try { loc = doc.defaultView.location.pathname; } catch (e) {} + if (loc.indexOf('/static/') === 0) want = false; // pdf.js / viewers + else if (_articleDeclaresDark(doc)) want = false; // already dark + } + if (want) { + if (!existing && doc.head) { + var st = doc.createElement('style'); + st.id = _ARTICLE_DARKEN_STYLE_ID; + st.textContent = _ARTICLE_DARKEN_CSS; + doc.head.appendChild(st); + } + } else if (existing && existing.parentNode) { + existing.parentNode.removeChild(existing); + } +} + // Shared "dismiss on outside interaction" for menus/popovers. Registers a // capture-phase click listener on BOTH the parent document AND the reader iframe // document. The iframe half is the crucial bit: the reader content is iframed, @@ -229,9 +413,19 @@ let suggestIndex = -1; let snippetController = null; let collectionsCache = null; // {version, favorites, collections} let _expandedCollection = null; // which collection is expanded for ZIM picking -// #37 home section order: array of "cat:<key>"/"col:<name>" keys. Populated by -// _fetchList from /list?layout=1; drives renderHome section ordering. +// #37 home section order: array of "cat:<key>"/"col:<name>"/"other" keys. +// Populated by _fetchList from /list?layout=1; drives renderHome section ordering. let _sectionOrder = []; +// #37 user-declared empty sections (category names with no ZIM yet). Offered as +// Move-to targets and reorder rows so a section can be created before it holds +// anything. Populated by _fetchList; written via _saveLibraryLayout({sections}). +let _declaredSections = []; +// The reserved category VALUE stored as an override to force a ZIM into the +// uncategorized "Other" bucket, and the client-internal group key that bucket +// uses. The heuristic never emits it, so its only source is an explicit move. +const OTHER_CAT = '__other__'; +// The reserved section-order key for the Other section (server mirrors it). +const OTHER_KEY = 'other'; // Deep-link state for the manage reorder panel: expand it on next render, and // which ms-nav section to jump to after the (async) manage view mounts. let _reorderAutoExpand = false; @@ -244,8 +438,9 @@ let _pendingMsSection = null; async function _fetchList() { const r = await fetch('/list?layout=1'); const data = await r.json(); - if (Array.isArray(data)) { _sectionOrder = []; return data; } + if (Array.isArray(data)) { _sectionOrder = []; _declaredSections = []; return data; } _sectionOrder = Array.isArray(data.section_order) ? data.section_order : []; + _declaredSections = Array.isArray(data.sections) ? data.sections : []; return Array.isArray(data.zims) ? data.zims : []; } let homeScope = null; // {type:'favorites'|'category'|'collection', label, zimNames:[]} @@ -557,8 +752,14 @@ function _applyUserSession(name) { function userLogout() { fetch('/logout', { method: 'POST', credentials: 'same-origin' }).catch(function(){}).then(function() { _userSession = null; - if (manageBtnEl) manageBtnEl.style.display = ''; - _refreshAfterAuthChange(); + // Reboot at the ROOT so the boot gate re-runs from a clean anonymous state. + // In private mode it re-shows the non-dismissible login gate (never a stale + // library); in open/limited it reboots into the anonymous/filtered view. We + // navigate to '/' (not reload the current URL): the user may be on a /w/ + // article that, reloaded anonymous in private mode, renders raw 401 JSON + // instead of the gate. An in-place refetch would strand a private instance + // on an empty home with no gate. + location.replace('/'); }); } @@ -569,23 +770,73 @@ async function _refreshAfterAuthChange() { else route(false); } -// On boot: learn whether a user session cookie is active, to shape the chrome. -// The data is already filtered server-side regardless of this call. -function _checkUserSession() { - fetch('/whoami', { credentials: 'same-origin' }).then(function(r) { return r.json(); }).then(function(j) { - if (j && j.role === 'user') { - _userSession = { name: j.name, restricted: !!j.restricted }; - if (manageBtnEl) manageBtnEl.style.display = 'none'; - } - // First-login hint: the server only sends this when the default username - // ("admin") applies (no custom username, no named users). The login modal - // reads it to show "Default username: admin". - _defaultUsernameHint = (j && j.default_username) || ''; - }).catch(function() {}); +// Boot-time auth probe + gate. Runs BEFORE the library renders so a private +// instance paints the login form as its FIRST frame (no empty-chrome flash), +// and a token-authed admin is recognised without a spurious re-gate on reload. +// Returns true when the login gate was shown — the caller then skips the whole +// library boot; a successful sign-in reloads into a clean, authorised boot. +// +// Why whoami must carry the admin token: the admin's credential is a Bearer +// token kept in client storage, NOT the session cookie the named-user path +// rides on. A bare whoami (cookie only) can't see the admin, answers +// `anonymous + login_required`, and used to bounce a just-signed-in admin +// straight back to the login screen ("login wouldn't stick"). +async function _bootAuthGate() { + // Present any stored admin token so whoami can authenticate a token-admin. + if (!_manageToken) { var saved = _readManageToken(); if (saved) _manageToken = saved; } + var j; + try { + var r = await fetch('/whoami', { + credentials: 'same-origin', + headers: _manageToken ? _authHeaders() : {}, + }); + j = await r.json(); + } catch (e) { + return false; // network hiccup — fall through to the normal boot + } + // First-login hint: the server only sends this when the default username + // ("admin") applies (no custom username, no named users). The login modal + // reads it to show "Default username: admin". + _defaultUsernameHint = (j && j.default_username) || ''; + if (j && j.role === 'user') { + _userSession = { name: j.name, restricted: !!j.restricted }; + if (manageBtnEl) manageBtnEl.style.display = 'none'; + return false; + } + if (j && j.role === 'admin') { + return false; // token-authed admin — proceed to the full library. + } + // Private public-access mode: an anonymous visitor (no valid cookie or token) + // sees nothing but the login screen. The server already 401s every read; the + // gate makes the CLIENT match with an opaque, non-dismissible login overlay + // rendered as the first frame, instead of a half-populated home whose fetches + // all fail in the background. + if (j && j.login_required) { + // A stored token that didn't authenticate above is stale — drop it so the + // gate isn't skipped on the next reload. + if (_manageToken) { _manageToken = ''; _clearManageToken(); } + _applyI18nToDOM(); // localise the modal's static labels before it shows + _enterLoginGate(); + return true; + } + return false; } -// '' unless the server says the default username applies (see _checkUserSession). +// '' unless the server says the default username applies (see _bootAuthGate). var _defaultUsernameHint = ''; +// ── Login gate (private public-access mode) ── +// True while an anonymous visitor is held at the forced login screen. +var _loginRequired = false; +function _enterLoginGate() { + _loginRequired = true; + document.body.classList.add('login-gate'); + openLoginModal(); +} +function _exitLoginGate() { + _loginRequired = false; + document.body.classList.remove('login-gate'); +} + // Token-adding fetch for *ambient* /manage/* calls (activity bar, peer // discovery, status/mirror polls). Sends the manage token when we have one // so these work on password-protected servers, but never prompts for a @@ -665,7 +916,17 @@ function manageFetch(url, opts) { function manageLogout() { _manageToken = ''; _clearManageToken(); - toggleManage(); + // Drop any server-side session too — a SECONDARY admin authenticates to a + // session cookie, not just the client-held token — then reboot at the ROOT so + // the boot gate re-runs anonymous. Without the reboot the admin keeps the full + // library they already loaded on screen: in private mode that reads as "logged + // out but still see everything" even though the server now 401s every + // anonymous read. We navigate to '/' (not reload the current URL): an admin + // can now open articles in private mode, so the current URL may be a /w/ + // article that, reloaded anonymous, renders raw 401 JSON instead of the gate. + fetch('/logout', { method: 'POST', credentials: 'same-origin' }) + .catch(function(){}) + .then(function() { location.replace('/'); }); } // Element that had focus before the modal opened; we restore focus @@ -676,7 +937,7 @@ function openPwModal(title, opts) { document.getElementById('pw-title').textContent = title || t('enter_password'); // Prefill: the session's known username (change-password continuity), else the // server-flagged default. The default is 'admin' ONLY when the sole account is - // the primary admin (server sends default_username then — see _checkUserSession); + // the primary admin (server sends default_username then — see _bootAuthGate); // once named users exist the field starts blank so a user types their own name // rather than a misleading 'admin'. var uEl = document.getElementById('pw-username'); @@ -695,6 +956,11 @@ function openPwModal(title, opts) { document.getElementById('pw-error').style.display = 'none'; document.getElementById('pw-remember-row').style.display = (opts && opts.hideRemember) ? 'none' : 'flex'; document.getElementById('pw-remove-btn').style.display = 'none'; + // The private-mode login gate is non-dismissible (closePwModal no-ops while + // _loginRequired), so hide the Cancel button there — an inert Cancel just + // reads as broken. It shows in every other (dismissible) use of the modal. + var pwCancel = document.getElementById('pw-cancel'); + if (pwCancel) pwCancel.style.display = _loginRequired ? 'none' : ''; _pwPreviousFocus = document.activeElement; const overlay = document.getElementById('pw-overlay'); overlay.classList.add('open'); @@ -703,6 +969,10 @@ function openPwModal(title, opts) { } function closePwModal() { + // The private-mode login gate is non-dismissible: Cancel / Esc / any close + // path is a no-op, since there is nothing behind it but 401s. Only a + // successful sign-in (which calls _exitLoginGate) can leave. + if (_loginRequired) return; document.getElementById('pw-overlay').classList.remove('open'); document.removeEventListener('keydown', _pwKeyHandler); if (_pwReject) { _pwReject(); _pwReject = null; } @@ -716,10 +986,12 @@ function closePwModal() { } function _pwKeyHandler(e) { - // Esc closes the modal — standard a11y pattern for dialogs. + // Esc closes the modal — standard a11y pattern for dialogs. Exception: the + // login gate (private mode) is non-dismissible — there is nothing behind it + // to reveal, so Esc is swallowed. if (e.key === 'Escape') { e.preventDefault(); - closePwModal(); + if (!_loginRequired) closePwModal(); return; } // Tab focus-trap: cycle within the modal so keyboard users can't @@ -762,6 +1034,9 @@ function submitPw() { // filtered library. Their account state lives in Manage → Users. _pwResolve = null; _pwReject = null; _pwLoginMode = false; + // Leaving the private-mode gate: reload into a clean authenticated + // state so the whole app boots with the session's filtered view. + if (_loginRequired) { _exitLoginGate(); location.reload(); return; } closePwModal(); _applyUserSession(res.j.name); return; @@ -777,6 +1052,12 @@ function submitPw() { // modal, and resolves so the in-flight manage view paints in place. var resolver = _pwResolve; _pwResolve = null; _pwReject = null; resolver(tok); + } else if (_loginRequired) { + // Admin signing in from the private-mode gate: persist the token and + // reload into a clean, fully authorized boot (whoami → admin, no gate). + _manageToken = tok; _saveManageToken(tok, remember); + _exitLoginGate(); + location.reload(); } else { // Opened directly (no pending request): store the token and enter // manage deterministically (enterManage, never toggleManage — the @@ -796,6 +1077,10 @@ function submitPw() { } } +// Breadcrumb identity for the Almanac — a calendar-with-a-star glyph, sized to +// match a ZIM's 22px icon, tinted by the chrome via currentColor. +var _ALMANAC_BC_ICON = '<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="3" y="4.5" width="18" height="16" rx="2"/><path d="M3 9.5h18"/><path d="M8 2.5v4M16 2.5v4"/><path d="M12 12l.9 1.9 2 .3-1.5 1.4.4 2-1.8-1-1.8 1 .4-2-1.5-1.4 2-.3z"/></svg>'; + // ── Topbar ── function updateTopbar() { const activeSource = currentSource || readerSource; @@ -808,11 +1093,15 @@ function updateTopbar() { backBtn.style.display = showBack ? 'flex' : 'none'; // Breadcrumb: Zimi / [icon] — search bar shows source name as placeholder. - // The Almanac is reached only from home (never through a ZIM), and it opens - // as an overlay that leaves the underlying ZIM "active" — so its icon would - // wrongly bleed through. In the Almanac the breadcrumb is just "Zimi", no - // separator, no icon. - if (activeSource && !_almanacOpen) { + // The Almanac opens as an overlay over the home/ZIM view but is its own + // destination, so it shows its OWN identity here (icon + "Almanac"), mirroring + // how entering a ZIM does — never the underlying ZIM's icon bleeding through. + if (_almanacOpen) { + bcSep.style.display = 'inline'; + bcIcon.style.display = 'inline-flex'; + bcIcon.title = t('almanac'); + bcIcon.innerHTML = _ALMANAC_BC_ICON; + } else if (activeSource) { bcSep.style.display = 'inline'; bcIcon.style.display = 'inline-flex'; const info = _zimInfo(activeSource); @@ -937,6 +1226,7 @@ function updateTopbar() { function bcClick(e) { // Clicking the icon in the breadcrumb goes to the source view if (e.target.id === 'logo') return; + if (_almanacOpen) return; // the Almanac breadcrumb is identity only — no nav into the ZIM behind it if (currentSource && (readerOpen || mode === 'search')) { if (readerOpen) closeReader(); enterSource(currentSource, false); @@ -953,11 +1243,24 @@ function updateFooter() { // ── Init ── async function init() { + // Re-apply the app theme (the head bootstrap already stamped it pre-paint) and + // start live-tracking the OS preference when in Auto mode. + _applyAppTheme(); + _bindAppThemeMedia(); + // bfcache restore (Safari back/forward) re-runs no other script — re-assert + // the theme so a restored page can't paint with a stale scheme. + window.addEventListener('pageshow', function(e) { if (e.persisted) _applyAppTheme(); }); // Initialize i18n before anything else _currentLang = _detectLanguage(); _applyRTL(_currentLang); await _loadI18n(_currentLang); + // Decide auth BEFORE any library chrome paints. On a private instance an + // anonymous visitor gets the login form as the first frame (no empty flash), + // and a token-authed admin is recognised so a reload never re-gates them. A + // shown gate reloads the page on successful sign-in, so we stop the boot here. + if (await _bootAuthGate()) return; + output.innerHTML = '<div class="loading"><span class="spinner-inline"></span>' + tH('loading_library') + '</div>'; // Only block on /list — everything else loads in background try { @@ -975,9 +1278,6 @@ async function init() { if ('serviceWorker' in navigator) { navigator.serviceWorker.register('/static/sw.js', { scope: '/' }).catch(function() {}); } - // Detect an active user-session cookie to shape the chrome (data is already - // filtered server-side by the cookie regardless of this call). - _checkUserSession(); // Fetch secondary data in parallel, update UI as each arrives _initSecondary(); } @@ -1480,9 +1780,20 @@ function _orderSections(sections) { return out; } -// The unified {key,label} list of reorderable home sections currently present — -// collections (non-empty) + categories in use — in effective order. Shared by -// the manage reorder panel. +// A ZIM's effective category for grouping/ordering: its override/heuristic value, +// or OTHER_CAT for the uncategorized catch-all (empty value, or the explicit +// force-Other sentinel). One source of truth so home, the Installed list and the +// reorder list bucket a ZIM identically. +function _zimCat(z) { + if (!z) return OTHER_CAT; + return (z.category && z.category !== OTHER_CAT) ? z.category : OTHER_CAT; +} + +// The unified {key,label} list of reorderable home sections — collections +// (non-empty) + categories in use + user-declared empty sections + the Other +// catch-all (when anything is uncategorized) — in effective order. Shared by the +// manage reorder panel. `empty` marks a declared section with no ZIM yet (so it +// can be removed); `other` marks the uncategorized catch-all row. function _currentReorderSections() { var sections = []; var colls = (collectionsCache && collectionsCache.collections) || {}; @@ -1491,11 +1802,22 @@ function _currentReorderSections() { sections.push({ key: 'col:' + cname, label: colls[cname].label || cname }); } } - var seen = new Set(), cats = []; + var inUse = new Set(), canon = new Set(), cats = [], hasOther = false; (zimsCache || []).forEach(function(z) { - if (z.category && !seen.has(z.category)) { seen.add(z.category); cats.push(z.category); } + var c = _zimCat(z); + if (c === OTHER_CAT) { hasOther = true; return; } + if (!inUse.has(c)) { inUse.add(c); canon.add(_catCanonKey(c)); cats.push(c); } }); cats.sort().forEach(function(c) { sections.push({ key: 'cat:' + c, label: _catDisplayName(c) }); }); + // Declared empty sections: shown so they can be ordered / removed / targeted + // before any ZIM lives in them. Skip any whose ZIMs have since arrived (now + // in `cats`) so a section never appears twice. + (_declaredSections || []).forEach(function(name) { + if (canon.has(_catCanonKey(name))) return; + canon.add(_catCanonKey(name)); + sections.push({ key: 'cat:' + name, label: _catDisplayName(name), empty: true }); + }); + if (hasOther) sections.push({ key: OTHER_KEY, label: t('cat_other'), other: true }); return _orderSections(sections); } @@ -1509,9 +1831,9 @@ function _ciGearClick(btn) { function _openReorderPanel() { _reorderAutoExpand = true; if (mode === 'manage' && manageTab === 'settings') { - switchMs('preferences'); + switchMs('library'); } else { - _pendingMsSection = 'preferences'; + _pendingMsSection = 'library'; enterManage(); } } @@ -1520,18 +1842,31 @@ function _openReorderPanel() { // categories read as different kinds of section at a glance while sharing one list. var _CATEGORY_GLYPH = '<svg class="reorder-type-icon" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20.59 13.41l-7.17 7.17a2 2 0 0 1-2.83 0L2 12V2h10l8.59 8.59a2 2 0 0 1 0 2.82z"/><line x1="7" y1="7" x2="7.01" y2="7"/></svg>'; +// The Other catch-all row's glyph (a tray) — distinct from the category tag and +// collection layers so the three kinds of section read apart at a glance. +var _OTHER_GLYPH = '<svg class="reorder-type-icon" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="22 12 16 12 14 15 10 15 8 12 2 12"/><path d="M5.45 5.11 2 12v6a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-6l-3.45-6.89A2 2 0 0 0 16.76 4H7.24a2 2 0 0 0-1.79 1.11z"/></svg>'; + // One draggable reorder row (keyboard fallback via the ▲▼ buttons). `first`/ // `last` pre-disable the buttons at the ends of the list; drag/keyboard moves -// keep them in sync via _reorderRefreshDisabled. Collections and categories share -// one list, told apart by a per-type icon. +// keep them in sync via _reorderRefreshDisabled. Collections, categories and the +// Other catch-all share one list, told apart by a per-type icon. A declared-empty +// category (`s.empty`) also carries a ✕ to remove it before any ZIM lives there. function _reorderRowHtml(s, first, last) { var isCol = s.key.indexOf('col:') === 0; - return '<div class="reorder-row' + (isCol ? ' reorder-row-col' : '') + '" data-key="' + escAttr(s.key) + '" draggable="true">' + + var glyph = s.other ? _OTHER_GLYPH : (isCol ? _COLLECTION_GLYPH : _CATEGORY_GLYPH); + var cls = 'reorder-row' + (isCol ? ' reorder-row-col' : '') + + (s.other ? ' reorder-row-other' : '') + (s.empty ? ' reorder-row-empty' : ''); + var removeBtn = s.empty + ? '<button class="reorder-remove" data-remove="' + escAttr(s.key.slice(4)) + + '" title="' + escAttr(t('remove_section')) + '" aria-label="' + escAttr(t('remove_section')) + '">×</button>' + : ''; + return '<div class="' + cls + '" data-key="' + escAttr(s.key) + '" draggable="true">' + '<span class="reorder-grip" aria-hidden="true">' + '<svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><circle cx="9" cy="5" r="1.6"/><circle cx="15" cy="5" r="1.6"/><circle cx="9" cy="12" r="1.6"/><circle cx="15" cy="12" r="1.6"/><circle cx="9" cy="19" r="1.6"/><circle cx="15" cy="19" r="1.6"/></svg>' + '</span>' + - '<span class="reorder-type">' + (isCol ? _COLLECTION_GLYPH : _CATEGORY_GLYPH) + '</span>' + + '<span class="reorder-type">' + glyph + '</span>' + '<span class="reorder-label">' + esc(s.label) + '</span>' + + removeBtn + '<span class="reorder-btns">' + '<button class="reorder-btn" data-dir="up"' + (first ? ' disabled' : '') + ' aria-label="' + escAttr(t('move_up')) + '">▲</button>' + '<button class="reorder-btn" data-dir="down"' + (last ? ' disabled' : '') + ' aria-label="' + escAttr(t('move_down')) + '">▼</button>' + @@ -1552,8 +1887,17 @@ function _reorderListHtml(items, group) { // top-to-bottom, so what you drag is exactly what home renders. function _reorderSectionsHtml() { var sections = _currentReorderSections(); - if (!sections.length) return '<div class="ms-hint">' + tH('reorder_empty') + '</div>'; - return _reorderListHtml(sections, 'all'); + var list = sections.length + ? _reorderListHtml(sections, 'all') + : '<div class="ms-hint">' + tH('reorder_empty') + '</div>'; + // "Add section" creates an empty category up front, so a user can build the + // shelf before moving ZIMs onto it. Lives inside #ms-reorder so its click is + // caught by the same delegated handler as the row controls. + return list + + '<button type="button" class="pill reorder-add" data-add="1">' + + '<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" aria-hidden="true"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>' + + esc(t('add_section')) + + '</button>'; } // Order category names by the saved section order (cat: keys), unlisted A-Z. @@ -1562,10 +1906,15 @@ function _orderCatsBySaved(cats) { var pos = {}; (_sectionOrder || []).forEach(function(k, i) { if (k.indexOf('cat:') === 0) pos[k.slice(4)] = i; + else if (k === OTHER_KEY) pos[OTHER_CAT] = i; // Other rides its reserved key }); return cats.slice().sort(function(a, b) { var pa = pos[a], pb = pos[b]; - if (pa == null && pb == null) return a.localeCompare(b); + if (pa == null && pb == null) { + if (a === OTHER_CAT) return 1; // unlisted Other defaults last, like home + if (b === OTHER_CAT) return -1; + return a.localeCompare(b); + } if (pa == null) return 1; if (pb == null) return -1; return pa - pb; @@ -1614,8 +1963,116 @@ function _persistReorder() { _persistSectionOrder(order); } -// Keyboard fallback for drag: ▲▼ move a row up/down within the list. +// Re-render the reorder panel in place (after add/remove) so the new row set and +// the ▲▼ end-state stay correct without a full manage repaint. +function _rerenderReorderPanel() { + var cont = document.getElementById('ms-reorder'); + if (cont) cont.innerHTML = _reorderSectionsHtml(); +} + +// Swap the "+ Add category" pill for an inline input row (no prompt() dialog): +// autofocus, Enter commits, Esc/blank cancels. Lives inside #ms-reorder so the +// delegated drag/click handlers still see it, but the input's own key/blur +// listeners own the commit/cancel flow. +function _showAddSectionInput() { + var cont = document.getElementById('ms-reorder'); + if (!cont) return; + var addBtn = cont.querySelector('.reorder-add'); + if (!addBtn) return; + var row = document.createElement('div'); + row.className = 'reorder-add-row'; + var input = document.createElement('input'); + input.type = 'text'; + input.className = 'reorder-add-input'; + input.maxLength = 60; + input.placeholder = t('add_section_prompt'); + input.setAttribute('aria-label', t('add_section_prompt')); + var ok = document.createElement('button'); + ok.type = 'button'; ok.className = 'reorder-add-ok'; + ok.setAttribute('aria-label', t('add_section')); + ok.innerHTML = '<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="20 6 9 17 4 12"/></svg>'; + var cancel = document.createElement('button'); + cancel.type = 'button'; cancel.className = 'reorder-add-cancel'; + cancel.setAttribute('aria-label', t('cancel')); + cancel.textContent = '×'; + row.appendChild(input); row.appendChild(ok); row.appendChild(cancel); + addBtn.replaceWith(row); + input.focus(); + var closed = false; + function restore() { if (!closed) { closed = true; _rerenderReorderPanel(); } } + function commit() { + if (closed) return; + var name = input.value.trim(); + if (!name) { restore(); return; } + var canon = _catCanonKey(name); + var dup = _currentReorderSections().some(function(s) { + return s.key.indexOf('cat:') === 0 && _catCanonKey(s.key.slice(4)) === canon; + }); + if (dup) { _showToast(t('section_exists')); input.focus(); input.select(); return; } + closed = true; + _commitAddSection(name); + } + input.addEventListener('keydown', function(e) { + // stopPropagation so Enter/Esc commit or cancel the add only — they must not + // bubble to the global keydown handler and close the whole manage overlay. + if (e.key === 'Enter') { e.preventDefault(); e.stopPropagation(); commit(); } + else if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); restore(); } + }); + ok.addEventListener('click', commit); + cancel.addEventListener('click', restore); + input.addEventListener('blur', function() { + // A blur onto the ✓/× buttons is handled by their click; otherwise a blank + // blur just tidies the row away. Defer so the button click lands first. + setTimeout(function() { + if (closed) return; + var a = document.activeElement; + if (a === ok || a === cancel) return; + if (!input.value.trim()) restore(); + }, 120); + }); +} + +// Persist a new empty section (a declared category): append to `sections`, then +// re-render the panel. Validation (blank/duplicate) happens in the inline input +// flow above before we get here. +function _commitAddSection(name) { + _declaredSections = (_declaredSections || []).concat([name]); + _rerenderReorderPanel(); + _saveLibraryLayout({ sections: _declaredSections }).then(function(res) { + if (!res.ok) { + _declaredSections = _declaredSections.filter(function(n) { return n !== name; }); + _rerenderReorderPanel(); + _showToast(res.status === 403 ? t('layout_locked') : t('error')); + } else { _showToast(t('saved')); } + }).catch(function() { + _declaredSections = _declaredSections.filter(function(n) { return n !== name; }); + _rerenderReorderPanel(); _showToast(t('error')); + }); +} + +// Remove an empty declared section (only offered on rows with no ZIM yet). Drops +// it from both `sections` and any lingering section_order slot, then persists. +function _removeSection(name) { + var prev = (_declaredSections || []).slice(); + _declaredSections = prev.filter(function(n) { return _catCanonKey(n) !== _catCanonKey(name); }); + _sectionOrder = (_sectionOrder || []).filter(function(k) { + return !(k.indexOf('cat:') === 0 && _catCanonKey(k.slice(4)) === _catCanonKey(name)); + }); + _rerenderReorderPanel(); + _saveLibraryLayout({ sections: _declaredSections, section_order: _sectionOrder }).then(function(res) { + if (!res.ok) { + _declaredSections = prev; _rerenderReorderPanel(); + _showToast(res.status === 403 ? t('layout_locked') : t('error')); + } + }).catch(function() { _declaredSections = prev; _rerenderReorderPanel(); _showToast(t('error')); }); +} + +// Delegated clicks inside #ms-reorder: Add section, remove an empty section, and +// the ▲▼ keyboard fallback for drag (move a row up/down within the list). function _reorderClick(e) { + if (e.target.closest('[data-add]')) { _showAddSectionInput(); return; } + var rm = e.target.closest('[data-remove]'); + if (rm) { _removeSection(rm.dataset.remove); return; } var btn = e.target.closest('.reorder-btn'); if (!btn || btn.disabled) return; var row = btn.closest('.reorder-row'); @@ -1658,6 +2115,71 @@ function _reorderDragEnd() { _persistReorder(); } +// ── Touch reordering (mobile) ── +// HTML5 drag doesn't fire on touch, so the reorder rows also support a +// long-press-drag started on the row's grip (touch-action:none in CSS lets us +// own the gesture there instead of the list scrolling). A short hold arms the +// drag (haptic confirm); after that, touchmove reorders the DOM live and locks +// page scroll (preventDefault), and touchend persists. The ▲▼ keyboard fallback +// is untouched. Delegated on document so it survives every panel re-render. +var _reTouch = null; // {row, startY, dragging, timer, onGrip} +var _RE_TOUCH_HOLD_MS = 160; +function _reorderTouchStart(e) { + if (e.touches.length !== 1) return; + var grip = e.target.closest && e.target.closest('.reorder-grip'); + if (!grip) return; + var row = grip.closest('.reorder-row'); + if (!row || !row.parentNode || !document.getElementById('ms-reorder')) return; + var t = e.touches[0]; + _reTouch = { row: row, startY: t.clientY, dragging: false, timer: null }; + _reTouch.timer = setTimeout(function() { + if (!_reTouch) return; + _reTouch.timer = null; + _reTouch.dragging = true; + row.classList.add('dragging'); + if (navigator.vibrate) { try { navigator.vibrate(8); } catch (_) {} } + }, _RE_TOUCH_HOLD_MS); +} +function _reorderTouchMove(e) { + if (!_reTouch) return; + var t = e.touches[0]; + if (!t) return; + if (!_reTouch.dragging) { + // Moving from the grip before the hold arms is still drag intent — start now. + if (Math.abs(t.clientY - _reTouch.startY) > 6) { + if (_reTouch.timer) { clearTimeout(_reTouch.timer); _reTouch.timer = null; } + _reTouch.dragging = true; + _reTouch.row.classList.add('dragging'); + } else return; + } + e.preventDefault(); // scroll lock while dragging + var row = _reTouch.row; + var list = row.parentNode; + var rows = list.querySelectorAll('.reorder-row'); + for (var i = 0; i < rows.length; i++) { + var other = rows[i]; + if (other === row) continue; + var rect = other.getBoundingClientRect(); + if (t.clientY >= rect.top && t.clientY <= rect.bottom) { + var after = (t.clientY - rect.top) > rect.height / 2; + list.insertBefore(row, after ? other.nextSibling : other); + break; + } + } +} +function _reorderTouchEnd() { + if (!_reTouch) return; + if (_reTouch.timer) clearTimeout(_reTouch.timer); + var wasDragging = _reTouch.dragging; + _reTouch.row.classList.remove('dragging'); + _reTouch = null; + if (wasDragging) { _reorderRefreshDisabled(); _persistReorder(); } +} +document.addEventListener('touchstart', _reorderTouchStart, { passive: true }); +document.addEventListener('touchmove', _reorderTouchMove, { passive: false }); +document.addEventListener('touchend', _reorderTouchEnd); +document.addEventListener('touchcancel', _reorderTouchEnd); + // ── Render: Home ── function renderHome(filter) { if (!zimsCache || zimsCache.length === 0) { @@ -1764,12 +2286,12 @@ function renderHome(filter) { const groups = {}; sorted.forEach(z => { - const key = z.category || '_uncategorized'; + const key = _zimCat(z); // real category, or OTHER_CAT for the catch-all if (!groups[key]) groups[key] = []; groups[key].push(z); }); - const cats = Object.keys(groups).filter(c => c !== '_uncategorized').sort(); + const cats = Object.keys(groups).filter(c => c !== OTHER_CAT).sort(); // #34 library filter pills: All · Recently added · Recently updated · language // pills. Each recency pill only appears when it has something to show, so we @@ -1914,9 +2436,16 @@ function renderHome(filter) { h += '<div class="cat-heading">' + esc(_catDisplayName(cat)) + '</div>'; h += renderCardGrid(catItems, true); }); + // Other (uncategorized) sorts last in a scoped view — not reorderable here. + var _scopeOther = _dedupLang(groups[OTHER_CAT] || [], _langSectionNames); + if (_scopeOther.length > 0) { + h += '<div class="cat-heading cat-heading-other">' + tH('cat_other') + '</div>'; + h += renderCardGrid(_scopeOther, true); + } } else { - // Unscoped home: collections + categories in one reorderable list (#37), - // ordered by the saved section_order (unlisted sections keep default order). + // Unscoped home: collections + categories + the Other catch-all in one + // reorderable list (#37), ordered by the saved section_order (unlisted + // sections keep default order — Other is built last so it defaults last). var _sections = []; if (!filter && collectionsCache && collectionsCache.collections) { for (const [cname, coll] of Object.entries(collectionsCache.collections)) { @@ -1937,18 +2466,13 @@ function renderHome(filter) { '<div class="cat-heading clickable" onclick="enterScope(\'category\',\'' + escJs(_catDisplayName(cat)) + '\',' + escJs(JSON.stringify(catZimNames)) + ',true)">' + esc(_catDisplayName(cat)) + '</div>' + renderCardGrid(catItems, true) }); }); - h += _orderSections(_sections).map(function(s) { return s.html; }).join(''); - } - - // "Other" always sorts last, after every ordered section. Safe to run for the - // empty-filter branch too: `groups` derives from `zims`, so no matches means - // no groups. - if (groups._uncategorized) { - var uncatItems = _dedupLang(groups._uncategorized, _langSectionNames); - if (uncatItems.length > 0) { - h += '<div class="cat-heading" style="opacity:0.5">' + tH('cat_other') + '</div>'; - h += renderCardGrid(uncatItems, true); + var _otherItems = _dedupLang(groups[OTHER_CAT] || [], _langSectionNames); + if (_otherItems.length > 0) { + _sections.push({ key: OTHER_KEY, html: + '<div class="cat-heading cat-heading-other">' + tH('cat_other') + '</div>' + + renderCardGrid(_otherItems, true) }); } + h += _orderSections(_sections).map(function(s) { return s.html; }).join(''); } // Counts at the bottom whenever the top bar is suppressed (idle discover view @@ -1960,9 +2484,17 @@ function renderHome(filter) { // Preserve existing discover content to avoid flash (pop-in → disappear → reappear) // But invalidate if the language changed (cached HTML has baked-in translated strings) var _prevDiscoverHtml = null; + var _prevDiscoverScroll = 0; if (_showDiscover) { var _prevRow = document.getElementById('discover-row'); - if (_prevRow && _prevRow.innerHTML && _prevRow.dataset.lang === _currentLang) _prevDiscoverHtml = _prevRow.innerHTML; + if (_prevRow && _prevRow.innerHTML && _prevRow.dataset.lang === _currentLang) { + _prevDiscoverHtml = _prevRow.innerHTML; + // scrollLeft is a live DOM property, not serialized by innerHTML — capture + // it so the strip keeps its place across a home re-render (e.g. Back from + // an opened discover card) instead of snapping to the first card. + var _prevScrollEl = _prevRow.querySelector('.discover-scroll'); + if (_prevScrollEl) _prevDiscoverScroll = _prevScrollEl.scrollLeft; + } } output.innerHTML = h; _placeViewToggle(); @@ -1970,7 +2502,13 @@ function renderHome(filter) { if (_prevDiscoverHtml) { // Restore cached discover DOM — avoid re-fetch flash var newRow = document.getElementById('discover-row'); - if (newRow) { newRow.innerHTML = _prevDiscoverHtml; newRow.dataset.lang = _currentLang; } + if (newRow) { + newRow.innerHTML = _prevDiscoverHtml; newRow.dataset.lang = _currentLang; + if (_prevDiscoverScroll) { + var _newScrollEl = newRow.querySelector('.discover-scroll'); + if (_newScrollEl) _newScrollEl.scrollLeft = _prevDiscoverScroll; + } + } } else { _loadDiscover(); } @@ -1998,8 +2536,10 @@ function _zimLangBadgeInfo(z, force) { // Inline language badge (search + full list rows). Full language name in the // tooltip; the visible label is the short code so identically-named ZIMs in // different languages are distinguishable at a glance. `force` forwards to -// _zimLangBadgeInfo (see there). -function _langBadge(z, force) { +// _zimLangBadgeInfo (see there). `full` swaps the visible label to the native +// full language name ("Français", not "FR") — used by the compact tiles, where +// the chip owns its own line and has the width to spell the language out. +function _langBadge(z, force, full) { var info = _zimLangBadgeInfo(z, force); if (!info) return ''; if (info.multi) { @@ -2007,6 +2547,11 @@ function _langBadge(z, force) { info.multi + ' ' + tH('language').toLowerCase() + '</span>'; } var name = _langDisplayName(z.language) || info.code; + if (full) { + var lc = (z.language || '').toLowerCase().slice(0, 2); + var native = _NATIVE_LANG_NAMES[lc] || name; + return '<span class="lang-badge lang-badge-full" title="' + escAttr(name) + '">' + esc(native) + '</span>'; + } return '<span class="lang-badge" title="' + escAttr(name) + '">' + esc(info.code) + '</span>'; } @@ -2154,7 +2699,8 @@ function _placeViewToggle() { function renderCardGrid(items, showStars, showCategory) { if (!items || !items.length) return ''; const favs = (collectionsCache && collectionsCache.favorites) || []; - const gridCls = _getLibraryView() === 'tiles' ? 'stats-grid tiles' : 'stats-grid'; + const isTiles = _getLibraryView() === 'tiles'; + const gridCls = isTiles ? 'stats-grid tiles' : 'stats-grid'; return '<div class="' + gridCls + '">' + items.map(z => { const icon = z.has_icon ? '<img src="/w/' + encodeURIComponent(z.name) + '/-/icon" alt="" width="48" height="48" loading="lazy">' @@ -2164,7 +2710,7 @@ function renderCardGrid(items, showStars, showCategory) { ? '<button class="star-btn' + (isFav ? ' starred' : '') + '" onclick="event.stopPropagation();toggleFavorite(\'' + escAttr(z.name) + '\')" title="' + escAttr(isFav ? t('remove_from_favorites') : t('add_to_favorites')) + '">' + (isFav ? '\u2605' : '\u2606') + '</button>' : ''; const catPrefix = showCategory && z.category ? '<span class="card-cat">' + esc(z.category) + '</span> · ' : ''; - const badge = _langBadge(z); + const badge = _langBadge(z, false, isTiles); const qidIcon = z.has_qids ? '<span class="qid-badge" title="' + escAttr(t('cross_lang_linking')) + '"><svg width="12" height="12" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M4 6l-3 3 3 3"/><path d="M1 9h10"/><path d="M12 10l3-3-3-3"/><path d="M15 7H5"/></svg></span>' : ''; @@ -2179,7 +2725,10 @@ function renderCardGrid(items, showStars, showCategory) { '<div class="card-info">' + // new-badge lives in the title row (list) — never over the left icon; // CSS lifts it to a tile corner in compact view (icon is centred there). - '<div class="name">' + newHtml + esc(z.title || z.name) + badge + qidIcon + '</div>' + + // The title text is wrapped in .zt so the tile layout can clamp it to two + // lines independently and drop the language chip onto its own line below + // (in the list the .zt span is inline, so nothing changes there). + '<div class="name">' + newHtml + '<span class="zt">' + esc(z.title || z.name) + '</span>' + badge + qidIcon + '</div>' + (z.description ? '<div class="desc">' + esc(z.description) + '</div>' : '') + '<div class="detail">' + catPrefix + _zimCountHtml(z) + ' · ' + fmtSize(z.size_gb) + @@ -2945,8 +3494,13 @@ function _renderDiscover(el, items) { showBlurb = ''; } } - h += '<div class="discover-card" data-zim="' + escAttr(it.zim) + '" data-path="' + escAttr(it.path) + '" data-title="' + escAttr(it.title || '') + '" onclick="openArticle(\'' + escJs(it.zim) + '\',\'' + escJs(it.path) + '\',\'' + escJs(it.title || '') + '\')">' + - thumbHtml + + // Video ZIMs: overlay a play badge on the thumbnail and mark the card so + // it reads as "play a random video" for AT users, not "open article". + var _isVid = _isVideoZim(it.zim); + var playBadge = _isVid ? '<span class="dc-play-badge" aria-hidden="true"></span>' : ''; + var vidAttrs = _isVid ? ' data-video="1" aria-label="' + escAttr(t('play_video') + ': ' + displayTitle) + '"' : ''; + h += '<div class="discover-card' + (_isVid ? ' dc-video-card' : '') + '" data-zim="' + escAttr(it.zim) + '" data-path="' + escAttr(it.path) + '" data-title="' + escAttr(it.title || '') + '"' + vidAttrs + ' onclick="openArticle(\'' + escJs(it.zim) + '\',\'' + escJs(it.path) + '\',\'' + escJs(it.title || '') + '\')">' + + thumbHtml + playBadge + '<div class="dc-body">' + '<div class="dc-source">' + iconHtml + '<span>' + esc(sourceLabel) + '</span>' + badgeHtml + dateHtml + '</div>' + '<div class="dc-title">' + esc(displayTitle) + '</div>' + @@ -3015,20 +3569,23 @@ const _DEFAULT_MOVE_CATEGORIES = ['Wikimedia', 'Stack Exchange', 'Dev Docs', 'Ed // "Encyclopedias"), so raw-value dedup let both through — the duplicate-rows bug. function _catCanonKey(c) { return (c ? _catDisplayName(c) : '').trim().toLowerCase(); } -// Move targets = defaults ∪ any category currently in use, so a custom category -// the user already created is offered as a reuse target (not just re-typed). -// Defaults come first (canonical English keys the server stores); an in-use -// category is appended only when its display name isn't already covered. +// Move targets = defaults ∪ in-use categories ∪ user-declared empty sections, +// so a custom category the user already created (with or without ZIMs) is a +// reuse target rather than something to re-type. Defaults come first (canonical +// English keys the server stores); the Other catch-all is always offered last. function _moveTargetCategories() { var seen = new Set(); var out = []; function add(c) { + if (!c || c === OTHER_CAT) return; // Other is appended explicitly, last var canon = _catCanonKey(c); if (!canon || seen.has(canon)) return; seen.add(canon); out.push(c); } _DEFAULT_MOVE_CATEGORIES.forEach(add); (zimsCache || []).forEach(function(z) { add(z.category); }); + (_declaredSections || []).forEach(add); + out.push(OTHER_CAT); return out; } @@ -3037,8 +3594,9 @@ function _moveTargetCategories() { // category names are user free-text, and the delegated menu handler reads them // off dataset, sidestepping the escJs-in-onclick trap. function _moveSubmenuHtml(zim) { - var cur = (_zimInfo(zim) || {}).category || ''; - var curCanon = _catCanonKey(cur); // mark the current category once, by display, not raw value + // _zimCat resolves the effective bucket (incl. the Other catch-all) so the ✓ + // lands on Other for an uncategorized ZIM, not just an explicitly-moved one. + var curCanon = _catCanonKey(_zimCat(_zimInfo(zim))); // mark by display, not raw value var h = ''; _moveTargetCategories().forEach(function(c) { var isCur = curCanon && _catCanonKey(c) === curCanon; @@ -3059,22 +3617,44 @@ function _saveLibraryLayout(patch) { }); } -// Assign a ZIM to a category: optimistic local update + re-render, then persist. -// Reverts and toasts on failure (e.g. 403 public-locked). +// Re-render whichever ZIM list is actually on screen after a Move to… action. +// Move to… fires from three places sharing this one handler: the home-page card +// menu, the Installed tab, and the Catalog tab. renderHome() and renderManage() +// both paint into the SAME #output element — calling renderHome() unconditionally +// while the Manage overlay is open replaced its whole DOM with the home grid, +// which read to the user as being "sent to the home screen" for a settings +// action. Route to the pane that's actually active instead. +function _refreshZimListView() { + if (mode === 'manage') { + if (manageTab === 'installed') renderInstalled(); + else if (manageTab === 'browse') { + if (_browseView === 'drilldown' && manageCategoryFilter) drillCategory(manageCategoryFilter); + else renderBrowseGallery(); + } + } else { + renderHome(); + } +} + +// Assign a ZIM to a category: optimistic local update + re-render in place, then +// persist. Reverts and toasts on failure (e.g. 403 public-locked); toasts the +// existing generic "Saved" confirmation on success. function _moveZimTo(zim, category) { var zinfo = _zimInfo(zim); var prev = zinfo ? zinfo.category : null; if (zinfo) zinfo.category = category; - renderHome(); + _refreshZimListView(); var ov = {}; ov[zim] = category; _saveLibraryLayout({ overrides: ov }).then(function(res) { if (!res.ok) { if (zinfo) zinfo.category = prev; - renderHome(); + _refreshZimListView(); _showToast(res.status === 403 ? t('layout_locked') : t('error')); + } else { + _showToast(t('saved')); } }).catch(function() { - if (zinfo) zinfo.category = prev; renderHome(); _showToast(t('error')); + if (zinfo) zinfo.category = prev; _refreshZimListView(); _showToast(t('error')); }); } @@ -3183,17 +3763,44 @@ function _moveZimTo(zim, category) { } }); + var CTX_SUB_W = 190; // .ctx-sub min-width (170) + padding/border headroom function posMenu(x, y) { menu.style.left = '0'; menu.style.top = '0'; menu.classList.add('visible'); + var vw = window.innerWidth, vh = window.innerHeight; var mw = menu.offsetWidth, mh = menu.offsetHeight; - var finalX = Math.min(x, window.innerWidth - mw - 8); + // Clamp the menu fully on-screen on both axes — a long-press near the + // bottom or left edge of a phone must never park the menu off-viewport. + // Math.max(8,…) guards the near edge; the outer Math.max keeps the near + // edge winning when the menu is taller/wider than the viewport itself. + var finalX = Math.min(Math.max(8, x), Math.max(8, vw - mw - 8)); + var finalY = Math.min(Math.max(8, y), Math.max(8, vh - mh - 8)); menu.style.left = finalX + 'px'; - menu.style.top = Math.min(y, window.innerHeight - mh - 8) + 'px'; - // Flip every submenu left if the menu sits near the right edge - var flip = finalX + mw + 170 > window.innerWidth; - menu.querySelectorAll('.ctx-sub').forEach(function(sub) { - sub.classList.toggle('flip-left', flip); + menu.style.top = finalY + 'px'; + // Each submenu (Move to…'s category list, Collections, …) opens from its + // trigger's top-right by default. Per trigger, decide horizontal side and + // vertical direction from the room actually available, then clamp width and + // height so a long list scrolls inside the viewport rather than running off + // any edge — the mobile failure mode. Done for every trigger, not just + // Move to…. + _ctxItems(menu).forEach(function(item) { + var sub = _ctxSubOf(item); + if (!sub) return; + var r = item.getBoundingClientRect(); + // Horizontal: open right unless it lacks room and the left side has it. + var rightFits = r.right + CTX_SUB_W <= vw - 8; + var leftFits = r.left - CTX_SUB_W >= 8; + var goLeft = !rightFits && leftFits; + sub.classList.toggle('flip-left', goLeft); + var availW = (goLeft ? r.left : vw - r.right) - 8; + sub.style.maxWidth = Math.max(140, availW) + 'px'; + // Vertical: hang from the top edge unless the bottom lacks room and the + // top has more; cap height to the room so .ctx-sub's own scroll kicks in. + var spaceBelow = vh - r.top - 8; + var spaceAbove = r.bottom - 8; + var flipUp = spaceBelow < 120 && spaceAbove > spaceBelow; + sub.classList.toggle('flip-up', flipUp); + sub.style.maxHeight = Math.max(100, flipUp ? spaceAbove : spaceBelow) + 'px'; }); _prepMenuA11y(); } @@ -3284,6 +3891,75 @@ function _moveZimTo(zim, category) { } }); + // ── Long-press = right-click on touch (#37) ── + // Touch has no contextmenu, so a 500ms press on a ZIM card (home .stat-card or + // an Installed row) opens the same menu right-click does — the mobile answer to + // "where's Move to…". Movement cancels it (so it never hijacks a scroll), a + // short haptic confirms it fired, and the synthetic click that follows is + // swallowed so the press doesn't also open the ZIM. iOS's own callout is killed + // by -webkit-touch-callout:none on the cards (app.css). + var _lpTimer = null, _lpCard = null, _lpStartX = 0, _lpStartY = 0, _lpFired = false; + function _lpHit(target) { + var card = target.closest && target.closest('.stat-card, .catalog-item[data-zim]'); + if (!card) return null; + var zim = card.dataset && card.dataset.zim; + if (!zim) { + var m = (card.getAttribute('onclick') || '').match(/enterSource\('([^']+)'/); + zim = m && m[1]; + } + return zim ? { card: card, zim: zim } : null; + } + // While a press is armed (or has fired), the card must not start a text + // selection under the finger. A root class flips user-select off on the cards + // (app.css), and the selectstart guard below blocks the range outright. + function _lpCancel() { + if (_lpTimer) { clearTimeout(_lpTimer); _lpTimer = null; } + document.documentElement.classList.remove('lp-armed'); + } + document.addEventListener('selectstart', function(e) { + if (_lpTimer || _lpFired) e.preventDefault(); + }); + document.addEventListener('touchstart', function(e) { + if (e.touches.length !== 1) { _lpCancel(); return; } + var hit = _lpHit(e.target); + if (!hit) return; + var t = e.touches[0]; + _lpStartX = t.clientX; _lpStartY = t.clientY; _lpFired = false; + document.documentElement.classList.add('lp-armed'); + _lpTimer = setTimeout(function() { + _lpTimer = null; _lpFired = true; _lpCard = hit.card; + if (navigator.vibrate) { try { navigator.vibrate(10); } catch (_) {} } + if (window.getSelection) { try { window.getSelection().removeAllRanges(); } catch (_) {} } + _ctxZim = hit.zim; _ctxCard = hit.card; _ctxCompact = false; _ctxCustomAction = null; + _ctxX = _lpStartX + 2; _ctxY = _lpStartY + 2; + showMainMenu(); + }, 500); + }, { passive: true }); + document.addEventListener('touchmove', function(e) { + if (!_lpTimer) return; + var t = e.touches[0]; + if (t && (Math.abs(t.clientX - _lpStartX) > 10 || Math.abs(t.clientY - _lpStartY) > 10)) _lpCancel(); + }, { passive: true }); + document.addEventListener('touchend', function(e) { + _lpCancel(); + if (_lpFired) e.preventDefault(); // block the trailing synthetic click/open + }); + document.addEventListener('touchcancel', _lpCancel, { passive: true }); + // Capture-phase guard: swallow the click a long-press would otherwise fire on + // the pressed card (not menu taps — those land outside the card). + document.addEventListener('click', function(e) { + if (_lpFired && _lpCard && _lpCard.contains(e.target)) { + e.preventDefault(); e.stopPropagation(); _lpFired = false; + } + }, true); + + // Dismiss on scroll like a native menu: the fixed-position menu would + // otherwise float detached over scrolled-away content. Capture so a scroll in + // any nested scroller (the manage list, the home grid) closes it too. + window.addEventListener('scroll', function() { + if (menu.classList.contains('visible')) closeCtx(); + }, true); + menu.addEventListener('click', function(e) { var item = e.target.closest('[data-action]'); if (!item) return; @@ -3435,6 +4111,70 @@ function _autoOpenSourceMain(name, mainPath) { openReader('/w/' + encodeURIComponent(name) + '/' + mainPath); } +// ── zimgit / PDF collection document list ── +// A zimgit-* ZIM is a collection of PDFs described by database.js. We render it +// as a searchable document list (title + author + size + description) instead of +// a reader — the header already flags it as a document collection. +var _zimgitDocs = []; // documents for the collection currently shown +var _zimgitZimName = ''; // ZIM they belong to (for the filter's re-render) + +function _zimgitDocHtml(name, d, i) { + var hasPath = !!d.path; + var call = hasPath + ? "openArticle('" + escJs(name) + "', '" + escJs(d.path) + "', '" + escJs(d.title || '') + "')" + : ''; + var clickAttr = hasPath + ? ' onclick="' + call + '" onkeydown="if(event.key===\'Enter\')' + call + '"' + : ''; + var meta = []; + if (d.author) meta.push(esc(d.author)); + if (d.size) meta.push(_fmtBytes(d.size)); + var metaHtml = meta.length ? '<div class="zg-meta">' + meta.join(' · ') + '</div>' : ''; + return '<div class="result zg-doc"' + + (hasPath ? ' tabindex="0" role="button" data-zim="' + escAttr(name) + '" data-path="' + escAttr(d.path) + '" data-title="' + escAttr(d.title || '') + '"' : '') + + ' style="animation-delay:' + (i * 0.04) + 's"' + clickAttr + '>' + + '<div class="zg-icon" aria-hidden="true">PDF</div>' + + '<div class="result-body">' + + '<div class="title">' + esc(d.title) + '</div>' + + (d.description ? '<div class="snippet">' + esc(d.description) + '</div>' : '') + + metaHtml + + '</div></div>'; +} + +function _renderZimgitCatalog(name, docs) { + _zimgitDocs = docs; + _zimgitZimName = name; + // The filter earns its space only on longer lists; short ones scan fine. + var showFilter = docs.length > 6; + var h = '<div class="cat-heading">' + tH('documents', {n: docs.length}) + '</div>'; + if (showFilter) { + h += '<input type="search" id="zg-filter" class="zg-filter" autocomplete="off" ' + + 'placeholder="' + escAttr(t('filter_documents')) + '" aria-label="' + escAttr(t('filter_documents')) + '" ' + + 'oninput="_filterZimgitCatalog(this.value)">'; + } + h += '<div class="results" id="zg-results">' + + docs.map(function(d, i) { return _zimgitDocHtml(name, d, i); }).join('') + '</div>'; + output.innerHTML = h; +} + +function _filterZimgitCatalog(q) { + var qq = (q || '').trim().toLowerCase(); + var results = document.getElementById('zg-results'); + if (!results) return; + var filtered = !qq ? _zimgitDocs : _zimgitDocs.filter(function(d) { + return (d.title || '').toLowerCase().indexOf(qq) >= 0 || + (d.description || '').toLowerCase().indexOf(qq) >= 0 || + (d.author || '').toLowerCase().indexOf(qq) >= 0; + }); + if (!filtered.length) { + results.innerHTML = '<div class="zg-empty">' + tH('no_matching_documents') + '</div>'; + return; + } + results.innerHTML = filtered.map(function(d, i) { + return _zimgitDocHtml(_zimgitZimName, d, i); + }).join(''); +} + // ── Render: Source ── async function renderSource(name) { const info = _zimInfo(name); @@ -3447,19 +4187,24 @@ async function renderSource(name) { const iconHtml = info.has_icon ? '<img src="/w/' + encodeURIComponent(name) + '/-/icon" alt="" width="64" height="64">' : '<span class="icon-letter" style="font-size:28px">' + esc(info.title || name)[0].toUpperCase() + '</span>'; + // zimgit-* ZIMs are PDF/document collections, not encyclopedias — the header + // says so, and below they get a searchable document list instead of a reader. + const isZimgit = name.startsWith('zimgit-'); + const collectionChip = isZimgit + ? ' · <span class="sh-chip">' + tH('document_collection') + '</span>' + : ''; const headerHtml = '<div class="source-header">' + '<div class="sh-icon">' + iconHtml + '</div>' + '<div class="sh-info">' + '<h1>' + esc(info.title || name) + '</h1>' + '<div class="sh-meta">' + _zimCountHtml(info) + - ' · ' + fmtSize(info.size_gb) + '</div>' + + ' · ' + fmtSize(info.size_gb) + collectionChip + '</div>' + (info.description ? '<div class="sh-desc">' + esc(info.description) + '</div>' : '') + '<div class="sh-actions" id="sh-download" hidden></div>' + '</div></div>'; // For ZIMs with a homepage, go straight to reader (skip intermediate page) // Unless navigating back via popstate — show the source page instead - const isZimgit = name.startsWith('zimgit-'); if (info.main_path && !isZimgit && !_popstateNoAutoReader) { _autoOpenSourceMain(name, info.main_path); return; @@ -3481,16 +4226,7 @@ async function renderSource(name) { const data = await res.json(); if (mode !== 'source' || currentSource !== name) return; // stale if (data.documents && data.documents.length) { - output.innerHTML = '<div class="cat-heading">' + tH('documents', {n: data.count}) + '</div>' + - '<div class="results">' + data.documents.map((d, i) => { - const hasPath = !!d.path; - const clickAttr = hasPath ? ' onclick="openArticle(\'' + escJs(name) + '\', \'' + escJs(d.path) + '\', \'' + escJs(d.title || '') + '\')" onkeydown="if(event.key===\'Enter\')openArticle(\'' + escJs(name) + '\', \'' + escJs(d.path) + '\', \'' + escJs(d.title || '') + '\')"' : ''; - return '<div class="result"' + (hasPath ? ' tabindex="0" role="button" data-zim="' + escAttr(name) + '" data-path="' + escAttr(d.path) + '" data-title="' + escAttr(d.title || '') + '"' : '') + ' style="animation-delay:' + (i * 0.04) + 's"' + clickAttr + '>' + - '<div class="result-body">' + - '<div class="title">' + esc(d.title) + '</div>' + - (d.description ? '<div class="snippet">' + esc(d.description) + '</div>' : '') + - '</div></div>'; - }).join('') + '</div>'; + _renderZimgitCatalog(name, data.documents); return; } } catch(e) {} @@ -3988,6 +4724,12 @@ function _zimTitle(name) { const info = _zimInfo(name); return (info && info.title) || name; } +// True for ZIMs whose articles are primarily playable video (TED, TED-Ed, Khan +// Academy talk collections). Drives the play badge on discover cards so a +// "random" pick from one reads as "play a video", not "read an article". +function _isVideoZim(name) { + return /^ted[_-]|(^|_)ted-ed|khanacademy|^khan[_-]/i.test(name || ''); +} function _zimTitleWithLang(name) { var info = _zimInfo(name); var title = (info && info.title) || name; @@ -4515,6 +5257,7 @@ const BROWSE_CATEGORIES = [ // Category key → localized display name function _catDisplayName(key) { + if (key === OTHER_CAT) return t('cat_other'); // the forced-Other sentinel reads as "Other" // Accept both BROWSE_CATEGORIES keys ('wikipedia') and English names ('Wikimedia') var browseKey = _CAT_TO_BROWSE_KEY[key] || key; var meta = BROWSE_CATEGORIES.find(function(c) { return c.key === browseKey; }); @@ -5913,6 +6656,7 @@ function switchManageTab(tab) { renderCollectionsTab(); } else if (tab === 'history') { q.placeholder = t('search_placeholder'); + _histShowAll = false; // re-entering the tab defaults back to the capped view renderHistoryTab(); } else if (tab === 'activity') { q.placeholder = t('search_placeholder'); @@ -6087,6 +6831,12 @@ function _historyZimInfo(ev) { return null; } +// Activity tab render cap. History is newest-first and server-capped at 500; +// showing all of it makes the tab scroll forever, so render the most recent +// _HIST_RENDER_CAP and expose the rest behind a "Show all" expander (per-view +// flag, reset on tab re-entry via switchManageTab so it defaults back to capped). +var _HIST_RENDER_CAP = 50; +var _histShowAll = false; async function renderHistoryTab() { const el = document.getElementById('manage-history'); if (!el) return; @@ -6094,11 +6844,13 @@ async function renderHistoryTab() { try { const res = await manageFetch('/manage/history'); const data = await res.json(); - const events = data.history || []; - if (!events.length) { + const allEvents = data.history || []; + if (!allEvents.length) { el.innerHTML = '<div class="empty"><p>' + tH('no_history') + '</p><p class="hint">' + tH('history_hint') + '</p></div>'; return; } + const capped = !_histShowAll && allEvents.length > _HIST_RENDER_CAP; + const events = capped ? allEvents.slice(0, _HIST_RENDER_CAP) : allEvents; // Group by day const days = {}; for (const ev of events) { @@ -6144,12 +6896,19 @@ async function renderHistoryTab() { } h += '</div>'; } + if (capped) { + h += '<button class="dl-clear-btn hist-show-all" onclick="_histRevealAll()">' + + tH('show_all_n', {n: allEvents.length}) + '</button>'; + } el.innerHTML = h; } catch(e) { el.innerHTML = '<div class="empty"><p>' + tH('could_not_load') + '</p></div>'; } } +// "Show all (N)" expander for the activity tab — drop the render cap and repaint. +function _histRevealAll() { _histShowAll = true; renderHistoryTab(); } + // ── Stats tab (merged server stats + usage) ── async function renderActivityTab() { const el = document.getElementById('manage-activity'); @@ -6430,6 +7189,11 @@ function _renderUserManage() { '<div class="ms-actions" style="margin-top:16px">' + '<button class="manage-btn-action" onclick="userLogout()" style="background:var(--surface2);color:var(--text);border:1px solid var(--border)">' + tH('log_out') + '</button>' + '</div>' + + // A signed-in user's own "My data" card: export/import a file, or sync + // bookmarks/history/preferences to their server account (Save/Restore). + '<div style="border-top:1px solid var(--border);margin-top:18px;padding-top:14px">' + + _myDataCardHtml() + + '</div>' + '</div></div>'; } @@ -6582,6 +7346,10 @@ function _msUsersHtml() { others.push(u); }); + // Public access card — governs what an ANONYMOUS visitor sees. Sits above the + // user list because it is the broadest policy on the page. + h += _publicAccessCard(); + h += '<div class="ms-users-section">'; h += '<div class="ms-users-intro">' + tH('users_intro') + '</div>'; if (others.length) { @@ -6592,15 +7360,20 @@ function _msUsersHtml() { h += _userRowHtml(u.name, 'admin', tH('users_primary_admin'), ''); return; } - var scope = u.role === 'limited' + // A secondary admin cannot manage other admins (server enforces; UI hides). + var canManage = isPrimary || u.role !== 'admin'; + var scopeText = u.role === 'limited' ? (u.all_access ? tH('users_all_access') : (u.allowlist.length + ' ' + tH('users_zim_count'))) : tH('users_all_access'); + // Limited scope doubles as the discoverable entry point to editing the + // allowlist — clicking "7 ZIMs" on the row opens the picker directly. + var scope = (u.role === 'limited' && canManage) + ? '<a class="ms-user-scope-link" onclick="event.stopPropagation();_editUserAllowlist(' + escAttr(JSON.stringify(u.name)) + ')" title="' + escAttr(t('users_edit_allowlist')) + '">' + scopeText + '</a>' + : scopeText; // Last-login: relative time (localized) or "never signed in". var seen = u.last_login ? tH('users_last_login') + ' ' + esc(_relTime(u.last_login)) : tH('users_last_never'); - // A secondary admin cannot manage other admins (server enforces; UI hides). - var canManage = isPrimary || u.role !== 'admin'; var menuAttr = canManage ? 'onclick="event.stopPropagation();_openUserMenu(this,' + escAttr(JSON.stringify(u.name)) + ')" title="' + escAttr(t('users_options')) + '" aria-label="' + escAttr(t('users_options')) + '" aria-haspopup="menu"' : ''; @@ -6752,20 +7525,96 @@ function _selectedRole(idPrefix) { return el ? el.getAttribute('data-role') : 'user'; } -// Checkbox picker of installed ZIMs. `selected` = array of chosen names. +// Installed-ZIM options for the allowlist pickers: the rich server list +// (title + language + article_count) when present, else the bare names list +// mapped through the client title cache. Shared by the per-user Limited picker +// and the public-access Limited picker. +function _pickerOptions() { + var d = _usersData || {}; + if (d.zim_options && d.zim_options.length) return d.zim_options; + return (d.zims || []).map(function(name) { + return { + name: name, + title: (typeof _zimTitle === 'function' ? _zimTitle(name) : '') || name, + language: '', + article_count: null + }; + }); +} + +// Searchable, legible checklist of installed ZIMs. `selected` = array of chosen +// names. Renders real titles + language badges + article counts, a search box, +// select-all/none, and a live "N of M selected" summary. Every instance is +// self-scoped via `.ms-allowlist-picker` so multiple can coexist on a page; the +// `.allowlist-cb` class keeps `_collectAllowlist(containerId)` working. function _allowlistPicker(selected) { var sel = new Set(selected || []); - var names = (_usersData && _usersData.zims) || []; - if (!names.length) return '<div style="color:var(--text2);font-size:12px">' + tH('users_no_zims') + '</div>'; - var h = '<div class="ms-allowlist" style="max-height:220px;overflow-y:auto;border:1px solid var(--border);border-radius:8px;padding:8px">'; - names.forEach(function(name) { - var title = (typeof _zimTitle === 'function' ? _zimTitle(name) : '') || name; - h += '<label style="display:flex;align-items:center;gap:8px;padding:4px 2px;font-size:13px;cursor:pointer">' + - '<input type="checkbox" class="allowlist-cb" value="' + escAttr(name) + '"' + (sel.has(name) ? ' checked' : '') + ' style="accent-color:var(--amber)"> ' + - esc(title) + '</label>'; + var opts = _pickerOptions(); + if (!opts.length) return '<div class="ms-allow-empty">' + tH('users_no_zims') + '</div>'; + var chosen = opts.filter(function(o) { return sel.has(o.name); }).length; + var rows = opts.map(function(o) { + var on = sel.has(o.name); + var lang = o.language + ? '<span class="ms-allow-lang">' + esc(String(o.language).toUpperCase()) + '</span>' : ''; + var count = (o.article_count != null) + ? '<span class="ms-allow-count">' + Number(o.article_count).toLocaleString() + '</span>' : ''; + var hay = ((o.title || '') + ' ' + o.name + ' ' + (o.language || '')).toLowerCase(); + return '<label class="ms-allow-row" data-hay="' + escAttr(hay) + '">' + + '<input type="checkbox" class="allowlist-cb" value="' + escAttr(o.name) + '"' + + (on ? ' checked' : '') + ' onchange="_allowlistSync(this)"> ' + + '<span class="ms-allow-name"><span class="ms-allow-title">' + esc(o.title || o.name) + '</span>' + lang + '</span>' + + count + + '</label>'; + }).join(''); + return '<div class="ms-allowlist-picker" data-total="' + opts.length + '">' + + '<div class="ms-allow-tools">' + + '<input type="search" class="ms-allow-search" placeholder="' + escAttr(tH('users_allow_search')) + + '" oninput="_allowlistFilter(this)" aria-label="' + escAttr(tH('users_allow_search')) + '">' + + '<button type="button" class="ms-allow-link" onclick="_allowlistSelectAll(this,true)">' + tH('users_allow_all') + '</button>' + + '<button type="button" class="ms-allow-link" onclick="_allowlistSelectAll(this,false)">' + tH('users_allow_none') + '</button>' + + '</div>' + + '<div class="ms-allow-summary" aria-live="polite">' + + t('users_allow_count', { n: chosen, total: opts.length }) + + '</div>' + + '<div class="ms-allow-list">' + rows + '</div>' + + '</div>'; +} + +function _allowlistRoot(el) { return el.closest ? el.closest('.ms-allowlist-picker') : null; } + +// Live filter: show only rows whose title/name/language contains the query. +function _allowlistFilter(input) { + var root = _allowlistRoot(input); + if (!root) return; + var q = (input.value || '').trim().toLowerCase(); + root.querySelectorAll('.ms-allow-row').forEach(function(r) { + r.style.display = (!q || r.getAttribute('data-hay').indexOf(q) !== -1) ? '' : 'none'; }); - h += '</div>'; - return h; +} + +// Select-all / none acts on the VISIBLE rows only, so it composes with search +// (e.g. "search 'wiki' → select all" tags just the Wikipedias). +function _allowlistSelectAll(btn, on) { + var root = _allowlistRoot(btn); + if (!root) return; + root.querySelectorAll('.ms-allow-row').forEach(function(r) { + if (r.style.display === 'none') return; + var cb = r.querySelector('.allowlist-cb'); + if (cb) cb.checked = on; + }); + _allowlistUpdateSummary(root); +} + +function _allowlistSync(cb) { + var root = _allowlistRoot(cb); + if (root) _allowlistUpdateSummary(root); +} + +function _allowlistUpdateSummary(root) { + var total = root.getAttribute('data-total'); + var n = root.querySelectorAll('.allowlist-cb:checked').length; + var s = root.querySelector('.ms-allow-summary'); + if (s) s.textContent = t('users_allow_count', { n: n, total: total }); } function _collectAllowlist(containerId) { @@ -6774,6 +7623,82 @@ function _collectAllowlist(containerId) { return out; } +// ── Public access policy (anonymous visitors) ────────────────────────────── +// Three modes shape what a not-logged-in visitor sees: Open (everything), +// Limited (a chosen allowlist), Sign-in required (nothing but the login +// screen). Reuses the same allowlist picker as per-user Limited. +function _publicAccessCard() { + var pa = (_usersData && _usersData.public_access) || { mode: 'open', allowlist: [] }; + var mode = pa.mode || 'open'; + var envLocked = !!pa.env_controlled; + var modes = [ + ['open', 'users_pa_open', 'users_pa_open_desc'], + ['limited', 'users_pa_limited', 'users_pa_limited_desc'], + ['private', 'users_pa_private', 'users_pa_private_desc'] + ]; + var choices = modes.map(function(m) { + var on = m[0] === mode; + return '<label class="ms-pa-choice' + (on ? ' active' : '') + (envLocked ? ' disabled' : '') + '">' + + '<input type="radio" name="ms-pa-mode" value="' + m[0] + '"' + (on ? ' checked' : '') + + (envLocked ? ' disabled' : '') + ' onchange="_onPublicAccessMode(this.value)"> ' + + '<span class="ms-pa-choice-body">' + + '<span class="ms-pa-choice-title">' + tH(m[1]) + '</span>' + + '<span class="ms-pa-choice-desc">' + tH(m[2]) + '</span>' + + '</span>' + + '</label>'; + }).join(''); + var picker = '<div id="ms-pa-allowlist" class="ms-pa-allowlist"' + (mode === 'limited' ? '' : ' hidden') + '>' + + _allowlistPicker(pa.allowlist || []) + + '<button class="ms-btn ms-btn-primary ms-pa-save" onclick="_savePublicAccessLimited()">' + tH('save') + '</button>' + + '</div>'; + var envNote = envLocked + ? '<div class="ms-pa-env">' + tH('users_pa_env') + ' <code>ZIMI_PUBLIC_ACCESS=' + esc(pa.env_mode || '') + '</code></div>' + : ''; + return '<div class="ms-pa-card">' + + '<div class="ms-section-label">' + tH('users_pa_title') + '</div>' + + '<div class="ms-pa-sub">' + tH('users_pa_sub') + '</div>' + + envNote + + '<div class="ms-pa-choices">' + choices + '</div>' + + picker + + '</div>'; +} + +// Radio change: reflect selection, reveal the picker for Limited, and save +// Open/Private immediately (they need no further input). Limited waits for the +// explicit Save so the admin can choose ZIMs first. +function _onPublicAccessMode(mode) { + document.querySelectorAll('.ms-pa-choice').forEach(function(c) { + var r = c.querySelector('input'); + c.classList.toggle('active', !!(r && r.checked)); + }); + var picker = document.getElementById('ms-pa-allowlist'); + if (picker) picker.hidden = (mode !== 'limited'); + if (mode !== 'limited') _publicAccessPost({ mode: mode }); +} + +function _savePublicAccessLimited() { + _publicAccessPost({ mode: 'limited', allowlist: _collectAllowlist('ms-pa-allowlist') }); +} + +function _publicAccessPost(payload) { + return manageFetch('/manage/public-access', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(payload) + }).then(function(res) { + return res.json().then(function(j) { return { ok: res.ok, j: j }; }); + }).then(function(r) { + if (r.ok && r.j && r.j.public_access) { + if (_usersData) _usersData.public_access = r.j.public_access; + _refreshUsersPane(); + _showToast(t('users_pa_saved')); + } else { + _showToast(t('users_create_failed')); + } + return r; + }); +} + function _usersPost(payload) { return manageFetch('/manage/users', { method: 'POST', @@ -6875,7 +7800,8 @@ function _msLibraryHtml() { '<button id="update-all-btn" class="manage-btn-action" onclick="triggerUpdate()" style="display:none;margin-inline-start:auto">' + tH('update_all') + '</button>' + '</div>' + '<div id="library-health-section" class="library-health"></div>' + - '<div id="tmp-files-section"></div>'; + '<div id="tmp-files-section"></div>' + + _msReorderHtml(); // Async-load tmp file info manageFetch('/manage/stats').catch(function() { return null; }).then(function(r) { return r && r.json(); }).then(function(s) { if (!s) return; @@ -7118,11 +8044,51 @@ function _msToggleCollapse(id, btn) { btn.textContent = open ? t('hide_list') : t('show_list'); } +// Section reorder + add-section panel (#37). Lives under Library settings — the +// one obvious home for organizing the library. Collapsed by default; deep-linked +// open from the card menu and the Installed-tab "Reorder" pill via +// _reorderAutoExpand. Draggable rows, ▲▼ keyboard fallback, Add/remove sections. +function _msReorderHtml() { + var reOpen = _reorderAutoExpand; _reorderAutoExpand = false; + var h = '<div class="ms-section-label" style="margin-top:20px">' + tH('reorder_sections') + '</div>' + + '<div class="ms-hint">' + tH('reorder_hint') + '</div>' + + '<button class="pill" onclick="_msToggleCollapse(\'ms-reorder\', this)">' + (reOpen ? tH('hide_list') : tH('show_list')) + '</button>' + + '<div class="ms-collapsed-list' + (reOpen ? ' ms-open' : '') + '" id="ms-reorder"' + + ' onclick="_reorderClick(event)" ondragstart="_reorderDragStart(event)"' + + ' ondragover="_reorderDragOver(event)" ondrop="_reorderDrop(event)"' + + ' ondragend="_reorderDragEnd(event)">' + _reorderSectionsHtml() + '</div>'; + if (reOpen) { + // Deep-linked open from the "Customize categories" pill: scroll the panel + // into view AND flash it, so the pointer lands the eye on the block (same + // scroll+flash the almanac holidays caption uses for its location control). + setTimeout(function() { + var el = document.getElementById('ms-reorder'); + if (!el) return; + el.scrollIntoView({ behavior: 'smooth', block: 'center' }); + el.classList.add('ms-flash'); + setTimeout(function() { el.classList.remove('ms-flash'); }, 1600); + }, 60); + } + return h; +} + function _msPreferencesHtml() { var showXzim = !_getStorageFlag(SK.HIDE_XZIM_LINKS); var showDiscover = !_getStorageFlag(SK.HIDE_DISCOVER); var showLangChooser = !_getStorageFlag(SK.HIDE_LANG_CHOOSER); + var darkenOn = _darkenArticlesOn(); var h = '<div class="ms-section-label">' + tH('ms_display_section') + '</div>' + + // App theme: Auto / Dark / Light segmented control. + '<div class="ms-theme-label">' + tH('app_theme') + '</div>' + + _appThemeSegHtml() + + '<div class="ms-hint">' + tH('app_theme_hint') + '</div>' + + // Reading: article-appearance options, grouped apart from the app chrome. + // Darken raw (non-Reader-View) articles — default follows the app theme. + '<div class="ms-section-label" style="margin-top:20px">' + tH('ms_reader_section') + '</div>' + + '<label class="ms-check"><input type="checkbox" id="ms-darken-articles"' + (darkenOn ? ' checked' : '') + + ' onchange="_setDarkenArticles(this.checked)"> ' + tH('darken_articles') + '</label>' + + '<div class="ms-hint">' + tH('darken_articles_hint') + '</div>' + + '<div style="border-top:1px solid var(--border);margin:16px 0 14px"></div>' + '<label class="ms-check"><input type="checkbox"' + (showDiscover ? ' checked' : '') + ' onchange="if(!this.checked)localStorage.setItem(\'zimi_hide_discover\',\'1\');else localStorage.removeItem(\'zimi_hide_discover\');renderHome()"> ' + tH('show_discover') + '</label>' + '<label class="ms-check"><input type="checkbox"' + (showXzim ? ' checked' : '') + @@ -7143,22 +8109,14 @@ function _msPreferencesHtml() { '<div class="ms-hint" style="margin-top:8px">' + tH('catalog_languages_hint_short') + '</div>' + '<button class="pill" onclick="_msToggleCollapse(\'ms-lang-pills\', this)">' + tH('show_list') + '</button>' + '<div class="ms-lang-pills ms-collapsed-list" id="ms-lang-pills">' + _renderLangPrefPills() + '</div>'; - // Section reorder (#37) — collapsed by default; deep-linked open from the - // card menu's "Reorder sections…" item. - var _reOpen = _reorderAutoExpand; _reorderAutoExpand = false; + // Section reorder moved to Library settings (#37). Leave a one-release pointer + // here so anyone who remembers the old home still lands in the right place. h += '<div class="ms-section-label" style="margin-top:20px">' + tH('reorder_sections') + '</div>' + - '<div class="ms-hint">' + tH('reorder_hint') + '</div>' + - '<button class="pill" onclick="_msToggleCollapse(\'ms-reorder\', this)">' + (_reOpen ? tH('hide_list') : tH('show_list')) + '</button>' + - '<div class="ms-collapsed-list' + (_reOpen ? ' ms-open' : '') + '" id="ms-reorder"' + - ' onclick="_reorderClick(event)" ondragstart="_reorderDragStart(event)"' + - ' ondragover="_reorderDragOver(event)" ondrop="_reorderDrop(event)"' + - ' ondragend="_reorderDragEnd(event)">' + _reorderSectionsHtml() + '</div>'; - if (_reOpen) { - setTimeout(function() { - var el = document.getElementById('ms-reorder'); - if (el) el.scrollIntoView({ behavior: 'smooth', block: 'center' }); - }, 60); - } + '<div class="ms-hint">' + tH('reorder_moved_hint') + '</div>' + + '<button type="button" class="pill reorder-pill" onclick="_openReorderPanel()">' + + esc(t('open_library_settings')) + + '<svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M7 17 17 7"/><path d="M8 7h9v9"/></svg>' + + '</button>'; // Reader section — mirror of the in-article palette's AUTO switch, so the // setting is discoverable without first opening an article. Same wording, // same localStorage key (via _setReaderAuto). @@ -7187,6 +8145,14 @@ function _msServerHtml() { '<div id="ms-mirror-status" class="share-rows-slot">' + (shareCached || _shareSkeletonHtml()) + '</div>' + '<div style="border-top:1px solid var(--border);margin:16px 0 14px"></div>'; + // Downloads: nightly window scheduler + the global download speed cap. + h += '<div class="ms-section-label">' + tH('downloads_section') + '</div>' + + '<div id="ms-dl-schedule" class="ms-dl-schedule">' + tH('loading') + '</div>' + + '<div style="border-top:1px solid var(--border);margin:16px 0 14px"></div>'; + // Backup & export hub — two self-titled cards (My data + Server backup), so no + // extra "Backup" group heading is needed above them. + h += '<div id="ms-backup" class="ms-backup">' + _backupHubHtml() + '</div>' + + '<div style="border-top:1px solid var(--border);margin:16px 0 14px"></div>'; h += '<div class="ms-section-label">' + tH('storage_section') + '</div>' + '<div class="ms-field"><label>' + tH('zim_folder') + '</label><input type="text" id="ms-zim-dir" readonly value="' + escAttr(t('loading')) + '"></div>' + '<div class="ms-field"><label>' + tH('data_folder') + '</label><input type="text" id="ms-data-dir" readonly value="' + escAttr(t('loading')) + '"></div>'; @@ -7243,6 +8209,7 @@ function _msServerHtml() { _renderHotZimsSection(); _renderSeedingSection(); _renderMirrorSection(); + _renderDownloadSchedule(); }, 0); // Cache info section h += '<div style="border-top:1px solid var(--border);margin-top:12px;padding-top:12px">' + @@ -7512,7 +8479,9 @@ function _applyTorrentToggleInPlace(on) { if (controls) { controls.classList.toggle('share-controls-off', !on); controls.querySelectorAll('input, button').forEach(function(el) { - if (el.dataset.envlock === '1') return; + // data-nogate stays editable with BT off: it governs HTTP downloads too + // (e.g. the concurrent-download cap), not just the BT engine. + if (el.dataset.envlock === '1' || el.dataset.nogate === '1') return; el.disabled = !on; }); } @@ -7619,6 +8588,31 @@ async function _setSeedRatio(inp) { } catch (e) { _showToast(t('save_failed')); } } +// One POST helper for the numeric BT settings that only need save/toast +// feedback (concurrent downloads, max connections). +async function _postBtSetting(body) { + try { + const r = await manageFetch('/manage/bt-settings', { + method: 'POST', headers: {'Content-Type': 'application/json'}, + body: JSON.stringify(body) + }); + if (!r.ok) { _showToast(t('save_failed')); return; } + _showToast(t('saved')); + } catch (e) { _showToast(t('save_failed')); } +} + +async function _setBtMaxDl(inp) { + const v = Math.max(1, Math.min(20, parseInt(inp.value, 10) || 4)); + inp.value = v; + await _postBtSetting({max_active_downloads: v}); +} + +async function _setBtMaxConn(inp) { + const v = Math.max(10, Math.min(2000, parseInt(inp.value, 10) || 200)); + inp.value = v; + await _postBtSetting({bt_max_connections: v}); +} + // Clean reload glyph — the old ⟳ unicode char rendered inconsistently and // looked amateur next to the crafted inputs. Inline SVG is pixel-stable. var _SVG_REFRESH = '<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12a9 9 0 1 1-2.64-6.36"/><path d="M21 3v6h-6"/></svg>'; @@ -7779,34 +8773,51 @@ async function _renderMirrorSection() { const disA = (locked) => ((!btOn || locked) ? ' disabled' : ''); const lockA = (locked) => (locked ? ' data-envlock="1"' : ''); - const ratioRow = '<div class="share-field"><label>' + tH('seed_ratio_label') + '</label>' + + // The rows below form a strict two-column grid (label | control), aligned via + // .share-bt-controls in app.css. Each .share-field carries exactly two + // children — a <label> and one control group — so their columns line up. + // Verbose guidance lives in the label's title= tooltip, not an inline note + // that would wrap into a paragraph on a phone. + const ratioRow = '<div class="share-field"><label title="' + escAttr(t('seed_ratio_zero_hint')) + '">' + tH('seed_ratio_label') + '</label>' + '<span class="share-port-group">' + '<input type="number" min="0" max="10" step="0.1" value="' + (m.seed_ratio_cap != null ? m.seed_ratio_cap : 2) + '"' + disA(m.seed_ratio_env_locked) + lockA(m.seed_ratio_env_locked) + ' class="share-num-input" aria-label="' + escAttr(t('seed_ratio_label')) + '" title="' + escAttr(t('seed_ratio_zero_hint')) + '" onchange="_setSeedRatio(this)">' + - '<span class="share-field-note">×</span></span>' + - '<span class="share-field-note">' + tH('seed_ratio_zero_inline') + '</span></div>'; + '<span class="share-field-note">×</span></span></div>'; - // Global up/down bandwidth caps (MB/s in the UI, 0 = unlimited). Mirror - // rides these too - there's no separate mirror speed setting anymore. + // Upload bandwidth cap (MB/s in the UI, 0 = unlimited). Mirror + seeding ride + // this too. The DOWNLOAD cap lives in the Downloads card below (one global + // number governs HTTP + BT) so it isn't rendered twice. const upMb = m.bt_up_kb ? +(m.bt_up_kb / 1024).toFixed(2) : 0; - const downMb = m.bt_down_kb ? +(m.bt_down_kb / 1024).toFixed(2) : 0; - // Arrows sit to the RIGHT of each input so the first input's left edge - // lines up with the ratio/port inputs above and below it. - const limitRow = '<div class="share-field"><label>' + tH('bt_limit_label') + '</label>' + + const limitRow = '<div class="share-field"><label title="' + escAttr(t('bt_limit_hint')) + '">' + tH('bt_up_limit_label') + '</label>' + '<span class="share-port-group">' + '<input type="number" min="0" step="0.5" value="' + upMb + '"' + disA(m.bt_up_env_locked) + lockA(m.bt_up_env_locked) + - ' class="share-num-input" aria-label="' + escAttr(t('bt_limit_up')) + '" onchange="_setBtLimit(this,\'up\')">' + - '<span class="share-field-note">↑</span>' + - '<input type="number" min="0" step="0.5" value="' + downMb + '"' + disA(m.bt_down_env_locked) + lockA(m.bt_down_env_locked) + - ' class="share-num-input" aria-label="' + escAttr(t('bt_limit_down')) + '" onchange="_setBtLimit(this,\'down\')">' + - '<span class="share-field-note">↓ MB/s</span></span>' + - '<span class="share-field-note">' + tH('bt_limit_hint') + '</span></div>'; + ' class="share-num-input" aria-label="' + escAttr(t('bt_limit_up')) + '" title="' + escAttr(t('bt_limit_hint')) + '" onchange="_setBtLimit(this,\'up\')">' + + '<span class="share-field-note">↑ MB/s</span></span></div>'; + + // Concurrent downloads: how many run at once, the rest queue. Governs HTTP + // and BT alike, so it stays editable even with the BT engine off + // (data-nogate) — only an env var locks it. + const dlRow = '<div class="share-field"><label title="' + escAttr(t('bt_max_dl_hint')) + '">' + tH('bt_max_dl_label') + '</label>' + + '<span class="share-port-group">' + + '<input type="number" min="1" max="20" step="1" value="' + (m.max_active_downloads != null ? m.max_active_downloads : 4) + '"' + + (m.max_active_downloads_env_locked ? ' disabled' : '') + lockA(m.max_active_downloads_env_locked) + ' data-nogate="1"' + + ' class="share-num-input" aria-label="' + escAttr(t('bt_max_dl_label')) + '" title="' + escAttr(t('bt_max_dl_hint')) + '" onchange="_setBtMaxDl(this)">' + + '</span></div>'; + + // Max connections: libtorrent's global socket cap (real, enforced). Pure BT + // engine setting, so it greys with the engine. + const connRow = '<div class="share-field"><label title="' + escAttr(t('bt_max_conn_hint')) + '">' + tH('bt_max_conn_label') + '</label>' + + '<span class="share-port-group">' + + '<input type="number" min="10" max="2000" step="10" value="' + (m.bt_max_connections != null ? m.bt_max_connections : 200) + '"' + + disA(m.bt_max_connections_env_locked) + lockA(m.bt_max_connections_env_locked) + + ' class="share-num-input" aria-label="' + escAttr(t('bt_max_conn_label')) + '" title="' + escAttr(t('bt_max_conn_hint')) + '" onchange="_setBtMaxConn(this)">' + + '</span></div>'; const portRow = '<div class="share-field share-port-row" id="share-port-row">' + _portRowInner(bt || {}, btOn) + '</div>'; const selfName = (peers && peers.self) || ''; - const nameRow = '<div class="share-field"><label>' + tH('peer_advertising_as') + '</label>' + + const nameRow = '<div class="share-field"><label title="' + escAttr(t('peer_name_hint')) + '">' + tH('peer_advertising_as') + '</label>' + '<input type="text" class="peer-name-input" value="' + escAttr(selfName) + '" maxlength="63"' + (m.peer_name_env_locked ? ' disabled' : '') + lockA(m.peer_name_env_locked) + ' title="' + escAttr(t('peer_name_hint')) + '" aria-label="' + escAttr(t('peer_advertising_as')) + '" onchange="_setPeerName(this)"></div>'; @@ -7814,7 +8825,7 @@ async function _renderMirrorSection() { // Controls always present; the wrapper dims + disables them when BT is off, // so toggling never adds/removes rows (no layout jump). const btControls = '<div class="share-bt-controls' + (btOn ? '' : ' share-controls-off') + '" id="ms-bt-controls">' + - ratioRow + limitRow + portRow + nameRow + '</div>'; + ratioRow + limitRow + dlRow + connRow + portRow + nameRow + '</div>'; // Mirror status sits under its toggle in the right column — the SAME spot // as the BitTorrent "ready" dot — so both cards' status lights line up. @@ -7846,6 +8857,458 @@ async function _renderMirrorSection() { } +// ── Download scheduling card (nightly window + global download speed cap) ── +async function _renderDownloadSchedule() { + var el = document.getElementById('ms-dl-schedule'); + if (!el) return; + var s; + try { s = await (await manageFetch('/manage/download-schedule')).json(); } + catch (e) { el.textContent = t('error'); return; } + window._dlSchedule = s; + var enabled = !!s.enabled, locked = !!s.locked, speedLocked = !!s.download_kb_locked; + + var toggle = '<label class="ms-toggle-row"><input type="checkbox"' + + (enabled ? ' checked' : '') + (locked ? ' disabled' : '') + + ' onchange="_setDownloadScheduleEnabled(this.checked)"> ' + tH('dl_schedule_toggle') + '</label>'; + var lockNote = locked ? '<div class="ms-hint">' + tH('dl_window_env_locked') + '</div>' : ''; + + // The window times drive BOTH download-queueing and the upload restrictor, so + // show them whenever either is on (the download-status chip is downloads-only). + var windowBlock = ''; + if (enabled || s.upload_restrict) { + var chip = enabled ? '<span class="dl-window-chip ' + (s.in_window ? 'dl-window-in' : 'dl-window-out') + '">' + + (s.in_window ? tH('dl_in_window') : tH('dl_waiting_window')) + '</span>' : ''; + windowBlock = + '<div class="ms-dl-window">' + + '<label>' + tH('dl_window_start') + ' <input type="time" id="ms-dl-start" value="' + escAttr(s.start) + '"' + + (locked ? ' disabled' : '') + ' onchange="_setDownloadWindow()"></label>' + + '<label>' + tH('dl_window_end') + ' <input type="time" id="ms-dl-end" value="' + escAttr(s.end) + '"' + + (locked ? ' disabled' : '') + ' onchange="_setDownloadWindow()"></label>' + + chip + + '</div>' + + (enabled ? '<div class="ms-hint">' + tH('dl_window_hint') + '</div>' : ''); + } + + // Compose as [label] [input] [unit] on one line, hint on its own muted line + // below — the .share-field pattern the BitTorrent card uses (a plain .ms-field + // would stretch the input full-width and shove the unit into the hint). + var speedRow = + '<div class="share-field ms-dl-speed"><label>' + tH('dl_speed_limit') + '</label>' + + '<span class="share-port-group">' + + '<input type="number" min="0" step="64" value="' + (s.download_kb || 0) + '" id="ms-dl-speed"' + + (speedLocked ? ' disabled' : '') + ' class="share-num-input" aria-label="' + escAttr(t('dl_speed_limit')) + + '" onchange="_setDownloadSpeed(this)">' + + '<span class="share-field-note">' + tH('dl_speed_unit') + '</span></span></div>' + + '<div class="ms-hint">' + tH('dl_speed_hint') + '</div>' + + (speedLocked ? '<div class="ms-hint">' + tH('dl_speed_env_locked') + '</div>' : ''); + + // Upload restrictor: trickle seeding outside the window (one row; the trickle + // field + "throttling now" note only appear once it's on). + var uploadRestrict = !!s.upload_restrict; + var uploadRow = + '<label class="ms-toggle-row"><input type="checkbox"' + + (uploadRestrict ? ' checked' : '') + (locked ? ' disabled' : '') + + ' onchange="_setUploadRestrict(this.checked)"> ' + tH('dl_upload_restrict') + '</label>' + + (uploadRestrict ? + '<div class="share-field ms-dl-trickle"><label>' + tH('dl_upload_trickle') + '</label>' + + '<span class="share-port-group">' + + '<input type="number" min="1" step="10" value="' + (s.upload_trickle_kb || 50) + '" id="ms-dl-trickle"' + + (locked ? ' disabled' : '') + ' class="share-num-input" aria-label="' + escAttr(t('dl_upload_trickle')) + + '" onchange="_setUploadTrickle(this)">' + + '<span class="share-field-note">' + tH('dl_speed_unit') + '</span></span></div>' + + '<div class="ms-hint">' + tH('dl_upload_trickle_hint') + '</div>' + + (s.upload_throttled ? '<div class="ms-hint">' + tH('dl_upload_throttled_now') + '</div>' : '') + : ''); + + el.innerHTML = toggle + lockNote + windowBlock + speedRow + uploadRow; +} + +async function _postDownloadSchedule(body) { + try { + await manageFetch('/manage/download-schedule', { + method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body), + }); + } catch (e) {} + _renderDownloadSchedule(); +} +function _setDownloadScheduleEnabled(on) { return _postDownloadSchedule({ enabled: !!on }); } +function _setDownloadWindow() { + var st = document.getElementById('ms-dl-start'), en = document.getElementById('ms-dl-end'); + if (!st || !en) return; + return _postDownloadSchedule({ enabled: true, start: st.value, end: en.value }); +} +function _setDownloadSpeed(input) { + return _postDownloadSchedule({ download_kb: Math.max(0, parseInt(input.value, 10) || 0) }); +} +function _setUploadRestrict(on) { return _postDownloadSchedule({ upload_restrict: !!on }); } +function _setUploadTrickle(input) { + return _postDownloadSchedule({ upload_trickle_kb: Math.max(1, parseInt(input.value, 10) || 50) }); +} + + +// ── Backup & export hub ────────────────────────────────────────────────── +// The hub is TWO clearly separated cards, each with its own Export + Import: +// • "My data" — this browser's bookmarks, history and preferences. Always +// exportable/importable to a file; a signed-in NAMED user +// also gets Save-to / Restore-from their own server account +// (POST/GET /userdata). Admin-without-a-user stays file-only. +// • "Server backup"— ADMIN-only, the full server bundle (/manage/backup +// scope=server): library list, collections, layout, users +// with hashes, access policy, schedule, sharing prefs, seed +// intents, hot list, auto-update, event history, per-user +// data. Preview-then-apply. +// Import validates the bundle's scope against the card it landed on (a server +// bundle rejected by the My-data card and vice-versa). Keep _PREF_KEYS and +// _BACKUP_SCHEMA_VERSION in lockstep with the server. +var _BACKUP_SCHEMA = 'zimi-backup'; +var _BACKUP_SCHEMA_VERSION = 3; +var _PREF_KEYS = [ + SK.UI_LANG, SK.HIDE_DISCOVER, SK.HIDE_LANG_CHOOSER, SK.HIDE_XZIM_LINKS, + SK.A11Y_REWRITE, SK.LIBRARY_VIEW, SK.PREF_LANGUAGES, SK.PREF_FLAVOR, + SK.READER_FONT, SK.READER_FAMILY, SK.READER_THEME, SK.READER_AUTO, +]; + +function _collectPreferences() { + var out = {}; + _PREF_KEYS.forEach(function(k) { + try { var v = localStorage.getItem(k); if (v !== null) out[k] = v; } catch (e) {} + }); + return out; +} + +// The parsed SERVER bundle awaiting the admin's Apply confirmation. Nothing is +// written until _serverBackupApply() runs — server import is preview-then-apply. +var _pendingServerBackup = null; + +function _setBackupStatus(id, key) { + var el = document.getElementById(id); + if (el) el.textContent = key ? t(key) : ''; +} + +function _cbChecked(id) { + var cb = document.getElementById(id); + return !!(cb && cb.checked); +} + +// ── Card markup ── +// "My data" is the only card a signed-in non-admin sees (rendered standalone by +// _renderUserManage); the admin Server pane shows both via _backupHubHtml. +function _myDataCardHtml() { + var signedIn = !!(_userSession && _userSession.name); + var serverBtns = signedIn + ? '<button class="pill" onclick="saveMyDataToServer()">' + tH('backup_save_server') + '</button>' + + '<button class="pill" onclick="restoreMyDataFromServer()">' + tH('backup_restore_server') + '</button>' + : ''; + return '<div class="ms-section-label">' + tH('backup_mydata_title') + '</div>' + + '<div class="ms-hint">' + tH('backup_mydata_intro') + '</div>' + + '<div class="ms-backup-actions">' + + '<button class="pill" onclick="exportMyData()">' + tH('backup_export_file') + '</button>' + + '<button class="pill" onclick="document.getElementById(\'ms-mydata-file\').click()">' + tH('backup_import_file') + '</button>' + + serverBtns + + '<input type="file" id="ms-mydata-file" accept="application/json,.json" style="display:none" onchange="importMyDataFile(this)">' + + '<span id="ms-mydata-status" class="ms-hint" style="margin:0;align-self:center"></span>' + + '</div>' + + '<label class="ms-toggle-row"><input type="checkbox" id="ms-mydata-overwrite"> ' + tH('backup_overwrite') + '</label>' + + '<div id="ms-mydata-result" class="ms-backup-import"></div>'; +} + +function _serverBackupCardHtml() { + return '<div class="ms-section-label" style="margin-top:22px">' + tH('backup_server_title') + '</div>' + + '<div class="ms-hint">' + tH('backup_server_intro') + '</div>' + + '<div class="ms-backup-actions">' + + '<button class="pill" onclick="exportServerBackup()">' + tH('backup_export_file') + '</button>' + + '<button class="pill" onclick="document.getElementById(\'ms-server-file\').click()">' + tH('backup_import_file') + '</button>' + + '<input type="file" id="ms-server-file" accept="application/json,.json" style="display:none" onchange="importServerBackupFile(this)">' + + '<span id="ms-server-status" class="ms-hint" style="margin:0;align-self:center"></span>' + + '</div>' + + '<label class="ms-toggle-row"><input type="checkbox" id="ms-server-overwrite"> ' + tH('backup_overwrite') + '</label>' + + '<div id="ms-server-import" class="ms-backup-import"></div>'; +} + +function _backupHubHtml() { + return _myDataCardHtml() + _serverBackupCardHtml(); +} + +function _downloadJson(filename, obj) { + var blob = new Blob([JSON.stringify(obj, null, 2)], { type: 'application/json' }); + var url = URL.createObjectURL(blob); + var a = document.createElement('a'); + a.href = url; a.download = filename; + document.body.appendChild(a); a.click(); document.body.removeChild(a); + setTimeout(function() { URL.revokeObjectURL(url); }, 1000); +} + +// Bookmarks/history live in localStorage; the server never sees them (a signed-in +// user's copy rides in their own /userdata blob). Identity is zim+path, newest +// (by timestamp) wins on conflict — mirrors the server's merge rules. +function _bookmarkKey(b) { + return (b && b.zim ? b.zim : '') + '\n' + (b && b.path ? b.path : ''); +} + +function _mergeByKey(current, incoming, keyFn, overwrite) { + if (overwrite) return { list: incoming.slice(), added: incoming.length, dupes: 0 }; + var out = current.slice(), idx = {}, added = 0, dupes = 0; + out.forEach(function(x, i) { idx[keyFn(x)] = i; }); + incoming.forEach(function(x) { + var k = keyFn(x); + if (k in idx) { + dupes++; + if ((x.timestamp || 0) >= (out[idx[k]].timestamp || 0)) out[idx[k]] = x; + } else { idx[k] = out.length; out.push(x); added++; } + }); + return { list: out, added: added, dupes: dupes }; +} + +// ── My data (browser half) — the one payload the My-data card moves, whether to +// a file, from a file, or to/from the signed-in user's server account. ── +function _collectBrowserData() { + return { + bookmarks: _getStorageJSON(SK.BOOKMARKS, []), + history: _getStorageJSON(SK.BROWSE_HISTORY, []), + preferences: _collectPreferences(), + }; +} + +function _applyBrowserData(data, overwrite) { + var res = { bm: { added: 0, dupes: 0 } }; + if (data && data.preferences && typeof data.preferences === 'object') { + Object.keys(data.preferences).forEach(function(k) { + if (_PREF_KEYS.indexOf(k) === -1) return; // ignore unknown/foreign keys + try { localStorage.setItem(k, data.preferences[k]); } catch (e) {} + }); + } + if (data && Array.isArray(data.bookmarks)) { + res.bm = _mergeByKey(_getStorageJSON(SK.BOOKMARKS, []), data.bookmarks, _bookmarkKey, overwrite); + _setStorageJSON(SK.BOOKMARKS, res.bm.list); + } + if (data && Array.isArray(data.history)) { + _setStorageJSON(SK.BROWSE_HISTORY, _mergeByKey(_getStorageJSON(SK.BROWSE_HISTORY, []), data.history, _bookmarkKey, overwrite).list); + } + return res; +} + +function _showMyDataResult(res) { + var box = document.getElementById('ms-mydata-result'); + if (box) box.innerHTML = '<div class="ms-backup-pv-line">' + + tH('backup_pv_bookmarks', { added: res.bm.added, dupes: res.bm.dupes }) + '</div>'; +} + +function exportMyData() { + var bundle = Object.assign({ + schema: _BACKUP_SCHEMA, + schema_version: _BACKUP_SCHEMA_VERSION, + scope: 'my-data', + created: new Date().toISOString(), + }, _collectBrowserData()); + _downloadJson('zimi-my-data-' + new Date().toISOString().slice(0, 10) + '.json', bundle); + _setBackupStatus('ms-mydata-status', 'backup_mydata_exported'); +} + +function importMyDataFile(input) { + var f = input.files && input.files[0]; + if (!f) return; + var reader = new FileReader(); + reader.onload = function() { _applyMyDataFile(reader.result); input.value = ''; }; + reader.onerror = function() { _setBackupStatus('ms-mydata-status', 'backup_bad_file'); input.value = ''; }; + reader.readAsText(f); +} + +function _applyMyDataFile(text) { + var bundle; + try { bundle = JSON.parse(text); } catch (e) { bundle = null; } + if (!bundle || bundle.schema !== _BACKUP_SCHEMA) { + _setBackupStatus('ms-mydata-status', 'backup_bad_file'); + return; + } + // Scope-vs-card guard: a server bundle belongs on the Server backup card. + if (bundle.scope === 'server') { + _setBackupStatus('ms-mydata-status', 'backup_wrong_card_server'); + return; + } + var res = _applyBrowserData(bundle, _cbChecked('ms-mydata-overwrite')); + _setBackupStatus('ms-mydata-status', 'backup_mydata_imported'); + _showMyDataResult(res); +} + +async function saveMyDataToServer() { + _setBackupStatus('ms-mydata-status', 'working'); + try { + var res = await fetch('/userdata', { + method: 'POST', credentials: 'same-origin', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(_collectBrowserData()), + }); + if (!res.ok) throw new Error('http ' + res.status); + _setBackupStatus('ms-mydata-status', 'backup_saved_server'); + } catch (e) { _setBackupStatus('ms-mydata-status', 'error'); } +} + +async function restoreMyDataFromServer() { + _setBackupStatus('ms-mydata-status', 'working'); + var data; + try { + var res = await fetch('/userdata', { credentials: 'same-origin' }); + if (!res.ok) throw new Error('http ' + res.status); + data = await res.json(); + } catch (e) { _setBackupStatus('ms-mydata-status', 'error'); return; } + var res2 = _applyBrowserData(data || {}, _cbChecked('ms-mydata-overwrite')); + _setBackupStatus('ms-mydata-status', 'backup_restored_server'); + _showMyDataResult(res2); +} + +// ── Server backup (admin) — full bundle, preview-then-apply ── +async function exportServerBackup() { + _setBackupStatus('ms-server-status', 'working'); + var bundle; + try { + var res = await manageFetch('/manage/backup?scope=server'); + if (!res.ok) throw new Error('http ' + res.status); + bundle = await res.json(); + } catch (e) { _setBackupStatus('ms-server-status', 'error'); return; } + _downloadJson('zimi-server-backup-' + new Date().toISOString().slice(0, 10) + '.json', bundle); + _setBackupStatus('ms-server-status', 'backup_exported'); +} + +function importServerBackupFile(input) { + var f = input.files && input.files[0]; + if (!f) return; + var reader = new FileReader(); + reader.onload = function() { _previewServerBackup(reader.result); input.value = ''; }; + reader.onerror = function() { _setBackupStatus('ms-server-status', 'backup_bad_file'); input.value = ''; }; + reader.readAsText(f); +} + +// Step 1 of 2: compute the diff and show it. Applies NOTHING. +async function _previewServerBackup(text) { + var bundle; + try { bundle = JSON.parse(text); } catch (e) { bundle = null; } + if (!bundle || bundle.schema !== _BACKUP_SCHEMA) { + _setBackupStatus('ms-server-status', 'backup_bad_file'); + return; + } + // Scope-vs-card guard: a My-data bundle belongs on the My data card. + if (bundle.scope !== 'server') { + _setBackupStatus('ms-server-status', 'backup_wrong_card_mydata'); + return; + } + _pendingServerBackup = bundle; + _setBackupStatus('ms-server-status', 'working'); + var overwrite = _cbChecked('ms-server-overwrite'); + var srv = {}; + try { + var res = await manageFetch('/manage/backup', { + method: 'POST', headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(Object.assign({}, bundle, { action: 'preview', overwrite: overwrite })), + }); + var d = await res.json().catch(function() { return {}; }); + if (!res.ok) { _setBackupStatus('ms-server-status', 'error'); return; } + srv = d.preview || {}; + } catch (e) { _setBackupStatus('ms-server-status', 'error'); return; } + _setBackupStatus('ms-server-status', ''); + _renderServerBackupPreview(srv); +} + +function _renderServerBackupPreview(srv) { + var box = document.getElementById('ms-server-import'); + if (!box) return; + var lines = []; + if (srv.collections) { + lines.push(tH('backup_pv_collections', { added: srv.collections.col_added, replaced: srv.collections.col_replaced })); + lines.push(tH('backup_pv_favorites', { added: srv.collections.fav_added, dupes: srv.collections.fav_dupes })); + } + if (srv.layout && (srv.layout.over_added || srv.layout.over_changed)) { + lines.push(tH('backup_pv_overrides', { added: srv.layout.over_added, changed: srv.layout.over_changed })); + } + if (srv.users) lines.push(tH('backup_pv_users', { added: srv.users.added, replaced: srv.users.replaced })); + if (srv.user_data) lines.push(tH('backup_pv_userdata', { n: srv.user_data.users })); + if (srv.history) lines.push(tH('backup_pv_history', { n: srv.history.events })); + if (srv.settings && srv.settings.length) lines.push(tH('backup_pv_settings', { n: srv.settings.length })); + if (srv.missing_zims) lines.push(tH('backup_pv_missing', { n: srv.missing_zims })); + box.innerHTML = + '<div class="ms-backup-preview">' + + '<div class="ms-hint">' + tH('backup_preview_title') + '</div>' + + lines.map(function(l) { return '<div class="ms-backup-pv-line">' + l + '</div>'; }).join('') + + '<div class="ms-backup-actions">' + + '<button class="pill" onclick="_serverBackupApply()">' + tH('backup_apply') + '</button>' + + '<button class="pill" onclick="_serverBackupCancel()">' + tH('backup_cancel') + '</button>' + + '</div>' + + '</div>'; +} + +function _serverBackupCancel() { + _pendingServerBackup = null; + var box = document.getElementById('ms-server-import'); + if (box) box.innerHTML = ''; + _setBackupStatus('ms-server-status', 'backup_cancelled'); +} + +// Step 2 of 2: the admin confirmed — write the server bundle. +async function _serverBackupApply() { + var bundle = _pendingServerBackup; + if (!bundle) return; + var overwrite = _cbChecked('ms-server-overwrite'); + _setBackupStatus('ms-server-status', 'working'); + try { + await manageFetch('/manage/backup', { + method: 'POST', headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(Object.assign({}, bundle, { action: 'apply', overwrite: overwrite })), + }); + } catch (e) {} + _setBackupStatus('ms-server-status', 'backup_imported'); + _pendingServerBackup = null; + // Library: offer to re-seed any ZIMs the backup lists but we don't have. + _renderMissingZims(bundle.library || []); +} + +async function _renderMissingZims(library) { + var box = document.getElementById('ms-server-import'); + if (!box) return; + box.innerHTML = ''; + if (!Array.isArray(library) || !library.length) return; + // Which backup ZIMs aren't installed here? + var installed = new Set(); + try { + var list = await (await fetch('/list')).json(); + (Array.isArray(list) ? list : (list.zims || [])).forEach(function(z) { if (z && z.name) installed.add(z.name); }); + } catch (e) {} + var missing = library.filter(function(z) { return z && z.name && !installed.has(z.name); }); + if (!missing.length) { + box.innerHTML = '<div class="ms-hint">' + tH('backup_library_complete') + '</div>'; + return; + } + // Resolve download URLs from the catalog by ZIM name. + try { await loadFullCatalog(); } catch (e) {} + var urls = [], unresolved = 0; + missing.forEach(function(z) { + var url = _catalogItemUrl(_catalogItemForZim(z.name)); + if (url) urls.push(url); else unresolved++; + }); + var note = unresolved ? '<div class="ms-hint">' + tH('backup_missing_unresolved', { n: unresolved }) + '</div>' : ''; + if (!urls.length) { box.innerHTML = '<div class="ms-hint">' + tH('backup_missing_none') + '</div>' + note; return; } + box.innerHTML = + '<div class="ms-hint">' + tH('backup_missing_found', { n: urls.length }) + '</div>' + + '<button class="pill" id="ms-backup-dl-btn" onclick=\'_downloadMissingZims(' + JSON.stringify(urls) + ')\'>' + + tH('backup_download_missing', { n: urls.length }) + '</button>' + note; +} + +async function _downloadMissingZims(urls) { + var btn = document.getElementById('ms-backup-dl-btn'); + if (btn) { btn.disabled = true; btn.textContent = t('starting'); } + try { + // Reuse the batch download machinery — it honors the download schedule, so + // a nightly window parks these as "scheduled" automatically. + var r = await manageFetch('/manage/download-batch', { + method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ urls: urls }), + }); + var d = await r.json(); + if (btn) btn.textContent = t('backup_queued', { n: d.started || 0 }); + _dlPrevAllDone = false; + refreshDownloads(); + if (window._nudgeActivityPoll) window._nudgeActivityPoll(); + } catch (e) { if (btn) { btn.textContent = t('error'); btn.disabled = false; } } +} + + async function _cacheAction(btn, action) { const status = document.getElementById('ms-cache-status'); btn.disabled = true; @@ -7964,7 +9427,8 @@ function getInstalledPillsHtml() { _COLLECTION_GLYPH + esc(s.label) + '</button>'; continue; } - const cat = s.key.slice(4); + // The Other catch-all rides the reserved 'other' key (not a cat: slice). + const cat = s.key === OTHER_KEY ? OTHER_CAT : s.key.slice(4); const dimmed = manageLangFilter && langsByCat[cat] && !langsByCat[cat].has(manageLangFilter); h += '<button class="pill cat-pill' + (manageCategoryFilter === cat ? ' active' : '') + (dimmed ? ' dimmed' : '') + '" data-key="' + escAttr(s.key) + '" data-cat="' + escAttr(cat) + @@ -8026,7 +9490,11 @@ function _zimCardHtml(z, opts) { const langTag = (z.language && z.language !== 'en') ? '<span class="ci-lang-tag">' + esc(_langDisplayName(z.language)) + '</span>' : ''; const cls = 'catalog-item' + (opts.extraClass ? ' ' + opts.extraClass : '') + (opts.selected ? ' ci-selected' : ''); - return '<div class="' + cls + '"' + + // opts.dragZim makes the row a drag source for the Installed-list section DnD + // (#37): data-zim names the ZIM; draggable is pointer-only (touch uses the + // long-press menu), so it never fights list scroll on mobile. + const dragAttr = opts.dragZim ? ' draggable="true" data-zim="' + escAttr(opts.dragZim) + '"' : ''; + return '<div class="' + cls + '"' + dragAttr + (opts.onclick ? ' style="cursor:pointer" onclick="' + opts.onclick + '"' : '') + '>' + '<div class="ci-icon">' + iconHtml + '</div>' + '<div class="ci-info">' + @@ -8051,7 +9519,7 @@ function renderInstalled(filterText) { const groups = {}; const pendingUpdates = []; for (const z of zims) { - const cat = z.category || categorizeZim(z.name); + const cat = _zimCat(z); // real category or OTHER_CAT — matches the home grouping if (manageCategoryFilter && cat !== manageCategoryFilter) continue; if (manageLangFilter && !_zimMatchesLang(z, manageLangFilter)) continue; if (filterText) { @@ -8087,7 +9555,10 @@ function renderInstalled(filterText) { items.sort((a, b) => (a.title || a.name).localeCompare(b.title || b.name)); items_h += '<div class="manage-installed-group' + (cat === '__updates__' ? ' mig-updates' : '') + '">'; const groupLabel = cat === '__updates__' ? t('updates_available_section') : _catDisplayName(cat); - items_h += '<div class="ci-section-label">' + esc(groupLabel) + ' (' + items.length + ')</div>'; + // Real-category headers are drop targets for the row DnD (#37) — data-cat + // names the destination; the Updates pseudo-group is never a target. + const dropAttr = cat === '__updates__' ? '' : ' data-cat="' + escAttr(cat) + '"'; + items_h += '<div class="ci-section-label"' + dropAttr + '>' + esc(groupLabel) + ' (' + items.length + ')</div>'; for (const z of items) { const meta = []; const countHtml = _zimCountHtml(z); @@ -8134,6 +9605,7 @@ function renderInstalled(filterText) { onclick: 'if(!event.target.closest(\'button\')&&!event.target.closest(\'.flavor-pill\')){enterSource(\'' + escJs(z.name) + '\',true)}', metaHtml: meta.map(function(m){return '<span>'+m+'</span>'}).join(' · '), actionsHtml: gearHtml + actionsHtml, + dragZim: manageEnabled ? z.name : null, }); } items_h += '</div>'; @@ -8141,9 +9613,66 @@ function renderInstalled(filterText) { if (!items_h) items_h = '<div class="empty"><p>' + tH('no_matching_zims') + '</p></div>'; el.innerHTML = getInstalledPillsHtml() + items_h; + // Pointer DnD: drag a row onto a section header to move that ZIM there (#37). + // Assigned per render (idempotent) since innerHTML above replaced the children. + el.ondragstart = _installedDragStart; + el.ondragover = _installedDragOver; + el.ondragleave = _installedDragLeave; + el.ondrop = _installedDrop; + el.ondragend = _installedDragEnd; _fillInstalledDownloads(el); } +// ── Installed-list drag-to-move (#37) ── +// Drag a ZIM row onto a category section header to reassign it — the dense, +// touch-safe surface (mobile organizes via the long-press menu, not DnD). The +// dragged ZIM rides in a module var (dataTransfer text is a fallback for the +// browser's own bookkeeping). Headers light up via .drop-target while hovered. +var _instDragZim = null; +var _instDropTarget = null; +function _installedDragStart(e) { + var row = e.target.closest('.catalog-item[data-zim]'); + if (!row) return; + _instDragZim = row.dataset.zim; + row.classList.add('ci-dragging'); + e.dataTransfer.effectAllowed = 'move'; + try { e.dataTransfer.setData('text/plain', _instDragZim); } catch (_) {} +} +function _installedDragOver(e) { + if (!_instDragZim) return; + var hdr = e.target.closest('.ci-section-label[data-cat]'); + if (!hdr) { _installedClearDrop(); return; } + e.preventDefault(); + e.dataTransfer.dropEffect = 'move'; + if (_instDropTarget !== hdr) { + _installedClearDrop(); + _instDropTarget = hdr; hdr.classList.add('drop-target'); + } +} +function _installedDragLeave(e) { + if (_instDropTarget && !_instDropTarget.contains(e.relatedTarget)) _installedClearDrop(); +} +function _installedClearDrop() { + if (_instDropTarget) { _instDropTarget.classList.remove('drop-target'); _instDropTarget = null; } +} +function _installedDrop(e) { + var hdr = e.target.closest('.ci-section-label[data-cat]'); + if (!hdr || !_instDragZim) { _installedClearDrop(); return; } + e.preventDefault(); + var cat = hdr.dataset.cat; + var zim = _instDragZim; + _installedClearDrop(); + // No-op if it's already in that bucket, so a stray drop doesn't toast "Saved". + var cur = _zimInfo(zim); + if (cur && _zimCat(cur) !== cat) _moveZimTo(zim, cat); +} +function _installedDragEnd() { + _instDragZim = null; + _installedClearDrop(); + var d = document.querySelector('.catalog-item.ci-dragging'); + if (d) d.classList.remove('ci-dragging'); +} + async function managePassword() { const has = await manageFetch('/manage/has-password').then(r => r.json()).catch(() => ({})); if (has.env_controlled) { @@ -8670,6 +10199,14 @@ async function _refreshDownloadsInner(useCache) { _dlRecentStart = 0; // clear grace once server reports downloads const anyActive = dls.some(d => !d.done); const allDone = !anyActive; + // Scheduled rows show "starts HH:MM" from the window config — fetch it once + // when a scheduled item first appears, then repaint so the time fills in. + if (dls.some(d => d.scheduled) && !window._dlSchedule && !window._dlScheduleFetching) { + window._dlScheduleFetching = true; + manageFetch('/manage/download-schedule').then(r => r.json()).then(s => { + window._dlSchedule = s || {}; window._dlScheduleFetching = false; refreshDownloads(); + }).catch(() => { window._dlScheduleFetching = false; }); + } const queuedDls = dls.filter(d => d.queued); const downloadingDls = dls.filter(d => !d.done && !d.queued); const completedDls = dls.filter(d => d.done); @@ -8712,6 +10249,18 @@ async function _refreshDownloadsInner(useCache) { pill('completed', tH('downloads_completed'), completedDls.length) + (seedingTorrents.length ? pill('seeding', tH('seeding_tab'), seedingTorrents.length) : '') + '</div>'; + // Bulk controls — only meaningful with more than one download; single items + // have their own per-row controls. Pause/Resume all appear only when there's + // something in that state to act on; Delete all always confirms first. + if (dls.length >= 2) { + const pausableCount = downloadingDls.filter(d => !d.paused && !d.scheduled).length; + const resumableCount = dls.filter(d => d.paused).length; + h += '<div class="dl-bulk-bar">'; + if (pausableCount) h += '<button class="dl-bulk-btn" onclick="pauseAllDownloads()">' + tH('dl_pause_all') + '</button>'; + if (resumableCount) h += '<button class="dl-bulk-btn" onclick="resumeAllDownloads()">' + tH('dl_resume_all') + '</button>'; + h += '<button class="dl-bulk-btn dl-bulk-danger" onclick="deleteAllDownloads()">' + tH('dl_delete_all') + '</button>'; + h += '</div>'; + } h += '<div class="dl-grid">'; // Seed cards render under "Seeding" AND under "All" — All means all. // (With zero downloads and active seeds, All used to render blank.) @@ -8794,6 +10343,10 @@ async function _refreshDownloadsInner(useCache) { h += '<span class="dl-error">' + esc(dl.error) + '</span>'; } else if (dl.done) { h += '<span class="dl-done">\u2713 ' + tH('dl_complete') + '</span>'; + } else if (dl.scheduled) { + var _win = (window._dlSchedule && window._dlSchedule.start) || ''; + h += '<span class="dl-scheduled" title="' + escAttr(t('dl_scheduled_tip')) + '">\u23f0 ' + + tH('dl_scheduled') + (_win ? ' \u00b7 ' + tH('dl_scheduled_starts', {time: esc(_win)}) : '') + '</span>'; } else if (indeterminate) { h += '<span class="dl-size">' + tH('bt_connecting') + '</span>'; } else { @@ -8823,6 +10376,11 @@ async function _refreshDownloadsInner(useCache) { var pauseBtn = dl.queued ? '' : '<button class="dl-pause-btn" onclick="pauseDownload(\'' + escAttr(dl.id) + '\',' + (dl.paused ? 'false' : 'true') + ')">' + (dl.paused ? tH('resume') : tH('pause')) + '</button>'; + // Scheduled items wait for the nightly window; offer an override that + // starts (or normally-queues) the item right now. + var startNowBtn = dl.scheduled + ? '<button class="dl-pause-btn" onclick="startDownloadNow(\'' + escAttr(dl.id) + '\')" title="' + escAttr(t('dl_start_now_tip')) + '">' + tH('dl_start_now') + '</button>' + : ''; // Escape hatch for a slow swarm: only on an active BT transfer. var switchBtn = ''; if (dl.source === 'bt' && !dl.queued) { @@ -8830,7 +10388,7 @@ async function _refreshDownloadsInner(useCache) { ? '<button class="dl-pause-btn" disabled>' + tH('dl_switching_direct') + '</button>' : '<button class="dl-pause-btn" onclick="switchToDirect(\'' + escAttr(dl.id) + '\')" title="' + escAttr(t('dl_switch_direct_tip')) + '">' + tH('dl_switch_direct') + '</button>'; } - h += '<div class="dl-actions">' + sourcePill + reusePill + mirrorInfo + switchBtn + pauseBtn + + h += '<div class="dl-actions">' + sourcePill + reusePill + mirrorInfo + switchBtn + startNowBtn + pauseBtn + '<button class="dl-cancel-btn" onclick="cancelDownload(\'' + escAttr(dl.id) + '\')">' + tH('cancel') + '</button></div>'; } if (dl.error && dl.error !== 'Cancelled') { @@ -9050,6 +10608,38 @@ function pauseDownload(id, pause) { function cancelDownload(id) { return _downloadAction('/manage/cancel', id); } +// Bulk download controls. Download counts are small (a handful at most), so +// fan out the existing per-item endpoints in parallel and refresh once at the +// end rather than adding a batch endpoint. Each acts on the last-rendered list +// (_dlLastDls); individual failures are swallowed so one bad id can't strand +// the rest. +function _bulkDownloadAction(path, targets) { + return Promise.all((targets || []).map(d => manageFetch(path, { + method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({id: d.id}), + }).catch(() => {}))); +} +async function pauseAllDownloads() { + const targets = (_dlLastDls || []).filter(d => !d.done && !d.queued && !d.scheduled && !d.paused); + await _bulkDownloadAction('/manage/pause', targets); + refreshDownloads(); +} +async function resumeAllDownloads() { + const targets = (_dlLastDls || []).filter(d => d.paused); + await _bulkDownloadAction('/manage/resume', targets); + refreshDownloads(); +} +async function deleteAllDownloads() { + if (!confirm(t('dl_delete_all_confirm'))) return; + // Cancel everything still in flight, then clear the finished rows. + const active = (_dlLastDls || []).filter(d => !d.done); + await _bulkDownloadAction('/manage/cancel', active); + try { await manageFetch('/manage/clear-downloads', { method: 'POST' }); } catch (e) {} + refreshDownloads(); +} + +// Override the nightly window for one scheduled item — start it now. +function startDownloadNow(id) { return _downloadAction('/manage/download-start-now', id); } + function switchToDirect(id) { return _downloadAction('/manage/switch-direct', id); } async function triggerUpdate() { @@ -9215,7 +10805,10 @@ function _articleUrl(zim, path) { return '/w/' + encodeURIComponent(zim) + '/' + p.base.split('/').map(encodeURIComponent).join('/') + p.frag; } function _titleFromPath(path) { - return decodeURIComponent(path.split('/').pop() || '').replace(/_/g, ' '); + // Drop any in-page '#fragment' — a title should name the article, not the anchor + // (single-page devdocs links carry 'index#section' style paths). + var base = _splitPathFragment(path).base; + return decodeURIComponent(base.split('/').pop() || '').replace(/_/g, ' '); } function _saveCurrentFile() { // Desktop: save the currently viewed file (PDF, EPUB) to disk @@ -9496,7 +11089,13 @@ function _readerFrameDoc() { // ── Reader View settings (persisted palette) ── var READER_FAMILIES = ['serif', 'sans']; +// Concrete palettes the reader body can paint (rv-theme-* classes / bg map). var READER_THEMES = ['dark', 'light', 'sepia']; +// User-selectable modes in the picker. 'auto' follows the app theme: dark→dark, +// light→SEPIA (a warm paper tone reads better out of the box than raw white). +// A user's explicit pick (dark/light/sepia) always wins and persists. Stored +// value is the MODE; _readerTheme() resolves it to a palette. +var READER_THEME_MODES = ['auto', 'dark', 'light', 'sepia']; // The <body> background each theme paints — mirrors --rv-bg in the injected CSS. // Used to tint the iframe/loading chrome so AUTO mode never flashes ZIM-white. var READER_THEME_BG = { dark: '#0a0a0b', light: '#fbfbf9', sepia: '#f4ecd8' }; @@ -9504,9 +11103,18 @@ function _readerFamily() { var v = localStorage.getItem(SK.READER_FAMILY); return READER_FAMILIES.indexOf(v) >= 0 ? v : 'serif'; } -function _readerTheme() { +// The stored picker selection: 'auto' (default) | 'dark' | 'light' | 'sepia'. +function _readerThemeMode() { var v = localStorage.getItem(SK.READER_THEME); - return READER_THEMES.indexOf(v) >= 0 ? v : 'dark'; + return READER_THEME_MODES.indexOf(v) >= 0 ? v : 'auto'; +} +// The concrete palette actually painted. Auto resolves a dark app to 'dark' (the +// reader matches the surrounding chrome) and a light app to 'sepia' (warm paper +// out of the box, rather than a stark white page). +function _readerTheme() { + var m = _readerThemeMode(); + if (m === 'auto') return _appThemeIsDark() ? 'dark' : 'sepia'; + return READER_THEMES.indexOf(m) >= 0 ? m : 'dark'; } function _readerAuto() { return _getStorageFlag(SK.READER_AUTO); } function _readerThemeBg() { return READER_THEME_BG[_readerTheme()] || READER_THEME_BG.dark; } @@ -9879,6 +11487,61 @@ function _readerBindLightbox(shell, doc) { _readerMarkImages(shell); } +// ── Video resume ─────────────────────────────────────────────────────── +// Remember where the viewer stopped in each video (TED/Khan talks, any ZIM +// with an HTML5 <video>) and pick up there next time. Keyed by zim+path+index +// so a page with several clips tracks each independently. The ledger is a +// single localStorage object, trimmed to the most-recent _VIDEO_RESUME_MAX. +var _VIDEO_RESUME_MAX = 100; // ledger cap (oldest evicted first) +var _VIDEO_RESUME_MIN = 5; // seconds — below this, not worth resuming +var _VIDEO_RESUME_DONE = 0.95; // ≥95% watched → treat as finished, drop it +var _VIDEO_RESUME_THROTTLE = 5000; // ms between timeupdate writes +function _videoResumeKey(zim, path, i) { return zim + '\n' + path + '#' + i; } +function _videoResumeTrim(led) { + var keys = Object.keys(led); + if (keys.length <= _VIDEO_RESUME_MAX) return; + keys.sort(function(a, b) { return (led[a].ts || 0) - (led[b].ts || 0); }); + for (var i = 0; i < keys.length - _VIDEO_RESUME_MAX; i++) delete led[keys[i]]; +} +function _bindVideoResume(frame, zim, path) { + var doc; try { doc = frame.contentDocument; } catch(e) { return; } + if (!doc || !zim || !path) return; + var vids = doc.querySelectorAll('video'); + for (var i = 0; i < vids.length; i++) (function(v, idx) { + if (v.__zimiResume) return; + v.__zimiResume = true; + var key = _videoResumeKey(zim, path, idx); + var restore = function() { + var led = _getStorageJSON(SK.VIDEO_RESUME, {}) || {}; + var rec = led[key]; + // Skip if we'd land within a second of the end — nothing left to watch. + if (rec && rec.t > _VIDEO_RESUME_MIN && (!v.duration || rec.t < v.duration - 1)) { + try { v.currentTime = rec.t; } catch(e) {} + } + }; + if (v.readyState >= 1) restore(); + else v.addEventListener('loadedmetadata', restore, { once: true }); + var last = 0; + v.addEventListener('timeupdate', function() { + var now = Date.now(); + if (now - last < _VIDEO_RESUME_THROTTLE) return; + last = now; + var d = v.duration || 0, tt = v.currentTime || 0; + var led = _getStorageJSON(SK.VIDEO_RESUME, {}) || {}; + if (d && tt / d >= _VIDEO_RESUME_DONE) { delete led[key]; } + else if (tt > _VIDEO_RESUME_MIN) { led[key] = { t: tt, d: d, ts: now }; } + else return; + _videoResumeTrim(led); + _setStorageJSON(SK.VIDEO_RESUME, led); + }); + // Watched to the end → clear so a rewatch starts clean. + v.addEventListener('ended', function() { + var led = _getStorageJSON(SK.VIDEO_RESUME, {}) || {}; + if (led[key]) { delete led[key]; _setStorageJSON(SK.VIDEO_RESUME, led); } + }); + })(vids[i], i); +} + // Bind the tap-to-full-size lightbox to the NORMAL (non-Reader-View) article // frame, reusing the Reader View overlay + open/mark helpers. Two differences // from the Reader View binding: eligibility also excludes article-navigating @@ -10018,6 +11681,9 @@ function _readerViewToggle() { _readerViewOn = true; } _tintReaderChrome(); // paint (on) or clear (off) the iframe/loading tint + // Reader View owns its own themes: strip the raw-article dark filter when it + // turns on (it would invert the reader shell), restore it when it turns off. + try { _applyArticleDarken(doc); } catch(e) {} _ttsStop(); // the visible content changed under any in-progress speech _syncReaderViewBtn(); } @@ -10095,7 +11761,7 @@ function _setReaderFamily(fam) { _renderReaderPalette(); } function _setReaderTheme(theme) { - if (READER_THEMES.indexOf(theme) < 0) return; + if (READER_THEME_MODES.indexOf(theme) < 0) return; try { localStorage.setItem(SK.READER_THEME, theme); } catch(e) {} var doc = _readerFrameDoc(); if (doc && _readerViewOn) _applyReaderTheme(doc); // Keep the iframe/chrome tint in step so scroll-past-content shows theme bg. @@ -10153,15 +11819,21 @@ function _readerPaletteHtml() { // palette (with row labels + AUTO) and the compact inline block in the ⋯ menu // (label-less). Defined once so the two hosts can never drift. function _rvSwatchHtml(key, theme) { + // 'auto' reuses the app-theme control's already-localized "Auto" label so no + // new i18n key is needed; the concrete palettes keep their reader_theme_* keys. + var lbl = tH(key === 'auto' ? 'theme_auto' : 'reader_theme_' + key); return '<button type="button" class="rv-swatch rv-sw-' + key + (theme === key ? ' active' : '') + '" role="radio" aria-checked="' + (theme === key ? 'true' : 'false') + - '" title="' + tH('reader_theme_' + key) + '" aria-label="' + tH('reader_theme_' + key) + + '" title="' + lbl + '" aria-label="' + lbl + '" onclick="event.stopPropagation();_setReaderTheme(\'' + key + '\')"><span class="rv-sw-dot"></span>' + - '<span class="rv-sw-label">' + tH('reader_theme_' + key) + '</span></button>'; + '<span class="rv-sw-label">' + lbl + '</span></button>'; } -function _rvSwatchesHtml(theme) { +function _rvSwatchesHtml(mode) { + // `mode` is the stored selection (auto|dark|light|sepia) so the Auto swatch + // lights up when chosen — not the resolved palette. return '<div class="rv-swatches" role="radiogroup" aria-label="' + tH('reader_theme') + '">' + - _rvSwatchHtml('dark', theme) + _rvSwatchHtml('light', theme) + _rvSwatchHtml('sepia', theme) + '</div>'; + _rvSwatchHtml('auto', mode) + _rvSwatchHtml('dark', mode) + + _rvSwatchHtml('light', mode) + _rvSwatchHtml('sepia', mode) + '</div>'; } function _rvFamPillHtml(key, fam) { return '<button type="button" class="rv-pill' + (fam === key ? ' active' : '') + @@ -10190,7 +11862,7 @@ function _rvSizeStepperHtml(lvl) { // no print/share/exit — just the two everyday controls, sized to fit 390px. function _readerCompactControlsHtml() { return '<div class="rv-compact">' + - _rvSwatchesHtml(_readerTheme()) + + _rvSwatchesHtml(_readerThemeMode()) + '<div class="rv-compact-fontrow">' + _rvFamPillsHtml(_readerFamily()) + _rvSizeStepperHtml(_readerFontLevel()) + '</div>' + '</div>'; } @@ -10199,12 +11871,12 @@ function _readerCompactControlsHtml() { // for the standalone book-button palette (desktop). Kept head-less so the // palette can wrap it with its own heading. function _readerSettingsRowsHtml() { - var theme = _readerTheme(), fam = _readerFamily(), auto = _readerAuto(); + var fam = _readerFamily(), auto = _readerAuto(); var lvl = _readerFontLevel(); var h = ''; - // Theme + // Theme (swatches keyed off the stored mode so Auto reflects the selection) h += '<div class="rv-row"><div class="rv-row-label">' + tH('reader_theme') + '</div>' + - _rvSwatchesHtml(theme) + '</div>'; + _rvSwatchesHtml(_readerThemeMode()) + '</div>'; // Font family h += '<div class="rv-row"><div class="rv-row-label">' + tH('reader_font_family') + '</div>' + _rvFamPillsHtml(fam) + '</div>'; @@ -10376,6 +12048,45 @@ function _readerShare() { // ── Reader ── function openReader(url) { + // Same-document fragment scroll fast-path. When the frame already holds the + // target document and only the #fragment differs, a location.replace() below + // performs a SAME-DOCUMENT scroll and fires NO load event — so the loading + // overlay (shown unconditionally further down) would hang until the 15s safety + // timeout. Single-page docs (devdocs) whose TOC links are page-qualified + // ('index#anchor', not bare '#anchor') route every anchor click through here, + // making each in-page jump look like a 15s page load (issue #38). Detect the + // same-base target and scroll in place instead of running the reload cycle. + if (url.slice(0, 3) === '/w/' && url.indexOf('#') !== -1) { + var _frame0 = document.getElementById('reader-frame'); + var _curHref = ''; try { _curHref = _frame0.contentWindow.location.href; } catch (e) {} + var _absTarget = location.origin + url; + var _docBase = function (u) { var i = u.indexOf('#'); return i < 0 ? u : u.slice(0, i); }; + if (_curHref && _docBase(_curHref) === _docBase(_absTarget) && _curHref !== _absTarget) { + readerOpen = true; + mainView.classList.add('hidden'); + document.getElementById('reader').classList.add('open'); + document.documentElement.style.overflowY = 'hidden'; + document.getElementById('reader-loading').classList.add('hidden'); + _frame0.style.visibility = 'visible'; + if (_readerTimeout) clearTimeout(_readerTimeout); + var _frag = _absTarget.slice(_absTarget.indexOf('#') + 1); + // Set the hash for URL consistency, then scroll the target into view + // explicitly. Relying on the hash alone is unreliable here — the browser + // skips its fragment-scroll when the hash is set programmatically right + // after we reveal the frame — so resolve the anchor (by id, then name) and + // scrollIntoView, matching the native jump the old full reload produced. + try { _frame0.contentWindow.location.hash = '#' + _frag; } catch (e) {} + try { + var _fdoc = _frame0.contentDocument; + var _dec = _frag; try { _dec = decodeURIComponent(_frag); } catch (e) {} + var _tgt = _fdoc.getElementById(_dec) || _fdoc.getElementById(_frag) || + _fdoc.querySelector('[name="' + (window.CSS && CSS.escape ? CSS.escape(_dec) : _dec) + '"]'); + if (_tgt) _tgt.scrollIntoView(); + } catch (e) {} + updateTopbar(); + return; + } + } // EPUBs: download (Gutenberg has HTML equivalents) var lurl = url.toLowerCase(); if (lurl.endsWith('.epub')) { @@ -10460,6 +12171,9 @@ function openReader(url) { } _tintReaderChrome(); // reset frame bg to #fff if reader ended up off _syncReaderViewBtn(); + // Auto-darken a raw (non-Reader-View) ZIM page when the app is dark, so the + // white page doesn't break dark mode. No-op under Reader View / dark pages. + try { _applyArticleDarken(frame.contentDocument); } catch(e) {} frame.style.visibility = 'visible'; // reveal now — shell (or raw doc) is ready to paint loading.classList.add('hidden'); try { _applyReaderFont(frame.contentDocument); } catch(e) {} // reapply persisted font scale @@ -10474,8 +12188,28 @@ function openReader(url) { // Inject responsive CSS + scroll-to-top button for mobile try { var _rStyle = frame.contentDocument.createElement('style'); - _rStyle.textContent = 'img{max-width:100%;height:auto}table{max-width:100%;overflow-x:auto;display:block}pre{overflow-x:auto;max-width:100%}' + - '#zimi-top{position:fixed;bottom:20px;right:20px;width:40px;height:40px;border-radius:50%;background:rgba(0,0,0,0.6);color:#fff;border:none;font-size:20px;cursor:pointer;display:none;align-items:center;justify-content:center;z-index:9999;-webkit-backdrop-filter:blur(8px);backdrop-filter:blur(8px)}'; + _rStyle.textContent = [ + // Horizontal containment for raw mwoffliner pages: the whole viewport must + // never scroll sideways on a phone (e.g. wikipedia/Caribbean's wide country + // tables + locator map). Genuinely-wide content (tables, <pre>) keeps its + // OWN inner scroll so it stays readable; everything else is capped to the + // column, and the body clips any last sliver of overflow. Mirrors the Reader + // View containment strategy — safe precisely because wide blocks inner-scroll. + 'html,body{overflow-x:hidden;max-width:100%}', + // video/audio need the same 100% cap as img: TED/Khan talk pages carry a + // fixed width= (e.g. 640) that overflows a phone viewport without it. + 'img,video{max-width:100%;height:auto}audio{width:100%;max-width:100%}', + // Wide tables inner-scroll instead of pushing the page; min-width:0 lets + // flex/table cells shrink below their content's intrinsic width. + 'table{max-width:100%;overflow-x:auto;display:block}td,th{min-width:0}', + 'pre{overflow-x:auto;max-width:100%}', + // Fixed-width mwoffliner blocks (image thumbs, locator maps, galleries, + // floated infoboxes) that carry an inline pixel width wider than a phone — + // rein them into the column so they don't force page-level overflow. + '.thumb,.thumbinner,figure,.gallery,.mw-kartographer-map,.mw-kartographer-maplink,' + + '.floatright,.floatleft,.tright,.tleft{max-width:100%!important}', + '#zimi-top{position:fixed;bottom:20px;right:20px;width:40px;height:40px;border-radius:50%;background:rgba(0,0,0,0.6);color:#fff;border:none;font-size:20px;cursor:pointer;display:none;align-items:center;justify-content:center;z-index:9999;-webkit-backdrop-filter:blur(8px);backdrop-filter:blur(8px)}' + ].join(''); frame.contentDocument.head.appendChild(_rStyle); var _topBtn = frame.contentDocument.createElement('button'); _topBtn.id = 'zimi-top'; @@ -10496,6 +12230,12 @@ function openReader(url) { // Tap-to-full-size lightbox for the raw article frame. Bound first so its // capture click handler precedes the link interceptor below. try { _bindNormalReaderLightbox(frame); } catch(e) {} + // Video resume: derive zim+path from the frame's real /w/ location so it + // keys correctly even after in-iframe navigation (not just openArticle). + try { + var _vm = _frameLoc.match(/^\/w\/([^\/]+)\/(.+)$/); + if (_vm) _bindVideoResume(frame, decodeURIComponent(_vm[1]), decodeURIComponent(_vm[2])); + } catch(e) {} var _handleFrameLink = function(e) { var a = e.target.closest('a[href]'); if (!a) return; @@ -10574,38 +12314,12 @@ function openReader(url) { frame.contentDocument.addEventListener('auxclick', function(e) { if (e.button === 1) _handleFrameLink(e); }); - // Right-click context menu for links inside iframe - frame.contentDocument.addEventListener('contextmenu', function(e) { - var a = e.target.closest('a[href]'); - if (!a) return; - var href = a.getAttribute('href') || ''; - if (href.startsWith('#')) return; - // Same _no_rewrite trick as the click handler — wombat-rewritten - // anchors return the original URL via .href, but with the flag set - // they return the actual in-archive URL (issue #17). - var fullUrl; - try { - var _prevNoRewrite = a._no_rewrite; - a._no_rewrite = true; - fullUrl = a.href; - a._no_rewrite = _prevNoRewrite; - } catch (ex) { - var frameLoc = frame.contentWindow.location; - try { fullUrl = new URL(href, frameLoc.href).href; } catch(ex2) { fullUrl = a.href; } - } - var wMatch = fullUrl.startsWith(location.origin) && fullUrl.match(/\/w\/([^\/]+)\/(.+)/); - if (wMatch) { - e.preventDefault(); - e.stopPropagation(); - var linkZim = decodeURIComponent(wMatch[1]); - var linkPath = decodeURIComponent(wMatch[2]).replace(/\?.*$/, ''); - // Calculate position relative to parent window - var frameRect = frame.getBoundingClientRect(); - _showLinkCtxMenu(e.clientX + frameRect.left, e.clientY + frameRect.top, { - zim: linkZim, path: linkPath, title: a.textContent.trim(), url: fullUrl - }); - } - }); + // NB: deliberately NO contextmenu listener inside the article frame. The + // system context menu is load-bearing on article content (copy, open link + // in new tab, look up, translate, image save…), so right-click inside a ZIM + // page must yield ONLY the browser's own menu. Zimi's custom link menu is + // offered on chrome article links (search results / tiles) in the parent + // document instead — see the delegated contextmenu handler below. } catch(e) { /* cross-origin — ZIM content loaded from a different origin */ } // Classify links: batch-resolve external URLs to find which ones are available locally // Only highlight links that actually resolve to a different installed ZIM @@ -11407,6 +13121,11 @@ function _syncTopbarMenuReaderItems() { // Reader View switch — flips state and the row set must change without closing). function _readerViewMenuToggle() { _readerViewToggle(); + _rebuildTopbarMenu(); +} +// Repaint the ⋯ menu in place (only while it's open) so a control inside it can +// flip state and change the row set without closing the menu. +function _rebuildTopbarMenu() { var menu = document.getElementById('topbar-menu'); if (menu && menu.classList.contains('visible')) menu.innerHTML = _buildTopbarMenuHtml(); } @@ -11835,29 +13554,64 @@ function _defineIsWord(s) { return /[\p{L}]/u.test(s); // must contain a letter } -// Selection rect in PARENT-window coords (iframe rect + selection rect). -function _defineSelRect(frame, sel) { +// Touch/coarse-pointer devices (iOS, Android) get the system's own text- +// selection callout (Copy / Look Up / …), which our chip must stay clear of — +// mouse/trackpad devices have no such overlay so their layout is untouched. +function _defineIsTouch() { + try { return window.matchMedia('(pointer: coarse)').matches; } catch (e) { return false; } +} +var _DEFINE_TOUCH_DELAY = 350; // ms — let the OS callout's own animation settle first +var _DEFINE_TOUCH_MARGIN = 14; // px gap below the selection, clear of the callout's tail +var _DEFINE_NEAR_TOP_PX = 120; // selection this close to the viewport top leaves iOS no + // room to place its callout above, so it flips below — + // mirror that by flipping our chip above instead + +// Range rect in PARENT-window coords (iframe offset + range rect). Shared by the +// selection path and tap-to-define, which each have a Range in hand. +function _defineRangeRect(frame, range) { try { - var r = sel.getRangeAt(0).getBoundingClientRect(); + var r = range.getBoundingClientRect(); var fr = frame.getBoundingClientRect(); - return { x: r.left + fr.left, y: r.bottom + fr.top + 4, top: r.top + fr.top }; + var margin = _defineIsTouch() ? _DEFINE_TOUCH_MARGIN : 4; + return { x: r.left + fr.left, y: r.bottom + fr.top + margin, top: r.top + fr.top }; } catch (e) { return null; } } +function _defineSelRect(frame, sel) { + try { return _defineRangeRect(frame, sel.getRangeAt(0)); } catch (e) { return null; } +} function _definePosition(rect) { if (!rect) return; _definePopover.classList.add('open'); var w = _definePopover.offsetWidth || 200; var h = _definePopover.offsetHeight || 60; + var vw = window.innerWidth, vh = window.innerHeight, M = 8; var x = rect.x, y = rect.y; - if (x + w > window.innerWidth - 8) x = window.innerWidth - w - 8; - if (x < 8) x = 8; + // On touch, the OS callout normally renders ABOVE the selection (our chip + // defaults below it, via the margin in _defineRangeRect) — but near the top + // of the viewport iOS has no room above and flips its callout below instead, + // so flip our chip above to stay out of its way. + if (_defineIsTouch() && rect.top < _DEFINE_NEAR_TOP_PX) { + y = rect.top - h - _DEFINE_TOUCH_MARGIN; + } // Flip above the selection if it would overflow the bottom. - if (y + h > window.innerHeight - 8) y = Math.max(8, rect.top - h - 8); + if (y + h > vh - M) y = rect.top - h - M; + // Hard clamp to the viewport on all four edges — a selection near any edge (or + // a card that grew taller/wider than the chip) must never spill off-screen. + x = Math.max(M, Math.min(x, vw - w - M)); + y = Math.max(M, Math.min(y, vh - h - M)); _definePopover.style.left = x + 'px'; _definePopover.style.top = y + 'px'; } +// Re-run positioning against the anchor rect stored at trigger time. Called after +// the popover's content swaps (chip → loading → card), since the card is taller +// and wider than the chip and would otherwise keep the chip's coordinates and +// spill off-screen. +function _defineReposition() { + if (_defineState && _defineState.rect) _definePosition(_defineState.rect); +} + function _defineHide() { if (!_definePopover) return; _definePopover.classList.remove('open'); @@ -11865,9 +13619,15 @@ function _defineHide() { _defineState = null; } +// Any scroll — inside the article iframe or the outer page — invalidates the +// popover's anchor, so dismiss it. Cheap no-op when nothing is open. +function _defineHideOnScroll() { + if (_definePopover && _definePopover.classList.contains('open')) _defineHide(); +} + // Stage 1 — show the "Define" trigger next to the selected word. function _defineShowTrigger(frame, word, wikt, rect) { - _defineState = { word: word, zim: wikt.name, path: null }; + _defineState = { word: word, zim: wikt.name, path: null, rect: rect }; _definePopover.innerHTML = '<div class="define-trigger" onclick="_defineRun()">' + _DEFINE_BOOK_ICON + '<span>' + tH('define') + '</span></div>'; _definePosition(rect); @@ -11877,9 +13637,12 @@ function _defineShowTrigger(frame, word, wikt, rect) { function _defineRun() { var st = _defineState; if (!st) return; + // The reader has now used Define — retire the one-shot discovery tip for good. + try { localStorage.setItem(SK.DEFINE_HINT, '1'); } catch (e) {} _definePopover.innerHTML = '<div class="define-card"><div class="define-word">' + esc(st.word) + '</div><div class="define-status">' + tH('define_loading') + '</div></div>'; + _defineReposition(); // the card is bigger than the chip — re-clamp to viewport var q = st.word; fetch('/suggest?q=' + encodeURIComponent(q.toLowerCase()) + '&limit=6&zim=' + encodeURIComponent(st.zim)) .then(function(r) { return r.json(); }) @@ -11906,6 +13669,7 @@ function _defineRenderMiss(word) { _definePopover.innerHTML = '<div class="define-card"><div class="define-word">' + esc(word) + '</div><div class="define-status">' + tH('define_no_results') + '</div></div>'; + _defineReposition(); } // Pull the first definition block(s) from a wiktionary article's raw HTML. @@ -11953,6 +13717,7 @@ function _defineRenderResult(st, hit, html) { : '<div class="define-status">' + tH('define_no_results') + '</div>'; _definePopover.innerHTML = '<div class="define-card">' + head + content + '<a class="define-open" onclick="_defineOpenFull()">' + tH('define_open_full') + '</a></div>'; + _defineReposition(); // final card size known — re-clamp so it can't spill off-screen } function _defineOpenFull() { @@ -11983,7 +13748,10 @@ function _defineAttachToDoc(frame) { if (!doc) return; var onSel = function() { clearTimeout(_defineDebounce); - _defineDebounce = setTimeout(function() { _defineConsider(frame); }, 220); + // Touch devices wait out the OS selection-callout's own animation before the + // chip appears; desktop's shorter debounce (no callout to fight) is unchanged. + var delay = _defineIsTouch() ? _DEFINE_TOUCH_DELAY : 220; + _defineDebounce = setTimeout(function() { _defineConsider(frame); }, delay); }; doc.addEventListener('dblclick', function() { clearTimeout(_defineDebounce); @@ -11994,11 +13762,42 @@ function _defineAttachToDoc(frame) { // A right-click arms suppression (and clears any live trigger); the next // primary mousedown disarms it so ordinary selection/double-click still work. doc.addEventListener('contextmenu', function() { _defineSuppressChip = true; _defineHide(); }, true); - // Tapping/scrolling inside the article dismisses a stale popover. + // Tapping inside the article dismisses a stale popover. doc.addEventListener('mousedown', function(e) { if (e.button === 0) _defineSuppressChip = false; if (_defineState && _defineState.path !== null) _defineHide(); }, true); + // Scrolling the article moves the anchor word out from under the popover, so + // dismiss it (like a native selection callout) rather than leave it stranded at + // a stale position. Covers both the raw frame and Reader View (same window). + try { frame.contentWindow.addEventListener('scroll', _defineHideOnScroll, { passive: true }); } catch (e) {} + // First article open with a wiktionary installed → one-shot discovery tip. + _maybeShowDefineHint(doc); +} + +// ── Define discoverability ── +// A one-shot teaching tip layered on top of the select-a-word / double-tap +// gesture, which is the only surface for Define. Shows at most once per browser. +// Skipped entirely when no wiktionary is installed (feature dormant) or the +// reader has already met Define. +function _maybeShowDefineHint(doc) { + if (_getStorageFlag(SK.DEFINE_HINT)) return; + if (!readerOpen) return; + if (!_defineFindWiktionary(_ttsLang(doc))) return; // dormant: nothing to teach + try { localStorage.setItem(SK.DEFINE_HINT, '1'); } catch (e) {} + var tip = document.createElement('div'); + tip.className = 'define-hint'; + tip.setAttribute('role', 'status'); + tip.innerHTML = '<span class="define-hint-icon">' + _DEFINE_BOOK_ICON + '</span>' + + '<span>' + tH('define_hint') + '</span>'; + document.body.appendChild(tip); + requestAnimationFrame(function() { tip.classList.add('visible'); }); + var kill = function() { + tip.classList.remove('visible'); + setTimeout(function() { if (tip.parentNode) tip.remove(); }, 220); + }; + var timer = setTimeout(kill, 6000); + tip.addEventListener('click', function() { clearTimeout(timer); kill(); }); } // Close context menu on click anywhere @@ -12007,6 +13806,11 @@ document.addEventListener('click', function() { _hideLinkCtxMenu(); }); document.addEventListener('mousedown', function(e) { if (_definePopover && _definePopover.classList.contains('open') && !_definePopover.contains(e.target)) _defineHide(); }, true); +// Outer-page scroll (capture, so it also catches scroll on any nested container) +// dismisses the popover; the iframe's own scroll is wired per-load in +// _defineAttachToDoc since iframe scroll events don't bubble to the parent. +window.addEventListener('scroll', _defineHideOnScroll, { passive: true }); +document.addEventListener('scroll', _defineHideOnScroll, { passive: true, capture: true }); document.addEventListener('contextmenu', function(e) { // If clicking outside existing menu, close it if (_linkCtxMenu.classList.contains('open') && !_linkCtxMenu.contains(e.target)) { diff --git a/zimi/static/i18n/ar.json b/zimi/static/i18n/ar.json index 023f39e1..748a0ed6 100644 --- a/zimi/static/i18n/ar.json +++ b/zimi/static/i18n/ar.json @@ -23,6 +23,7 @@ "no_sources_matching": "لا توجد مصادر مطابقة لـ «{query}»", "all_sources": "جميع المصادر →", "discover": "اكتشف", + "play_video": "تشغيل الفيديو", "discover_hidden": "تم إخفاء اكتشف", "undo": "تراجع", "today": "اليوم", @@ -54,6 +55,9 @@ "show_more": "عرض {n} نتائج إضافية", "found_results_in": "عُثر على {n} نتيجة خلال {time} ث.", "documents": "{n} مستند", + "filter_documents": "تصفية المستندات…", + "no_matching_documents": "لا توجد مستندات مطابقة", + "document_collection": "مجموعة مستندات", "no_content": "هذا المصدر لا يحتوي على محتوى", "zim_corrupted": "قد يكون ملف ZIM تالفًا أو فارغًا", "loading": "جارٍ التحميل…", @@ -399,6 +403,7 @@ "ms_server": "الخادم", "ms_security": "الأمان", "ms_display_section": "العرض", + "ms_reader_section": "القراءة", "welcome_lang_title": "تبحث عن محتوى بـ{lang}؟", "welcome_lang_body": "Zimi يخزن موسوعات كاملة دون اتصال. تصفح الفهرس لتنزيل ويكيبيديا بـ{lang} والمزيد.", "welcome_lang_browse": "تصفح الفهرس", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "عرض العطلات العالمية", "alm_holidays_follow_hint": "يتبع موقعك على الخريطة", "alm_region_holiday": "عطلة {c}", + "alm_showing_all_countries": "عرض أعياد جميع الدول", + "alm_scope_worldwide": "كل العالم", + "alm_scope_regional": "إقليمي", + "alm_scope_toggle_hint": "التبديل بين منطقتك وجميع الدول", "alm_hol_1st_white_night": "الليلة البيضاء الأولى", "alm_hol_aban_festival": "مهرجان آبان", "alm_hol_annunciation": "البشارة", @@ -874,6 +883,10 @@ "seed_ratio_zero_inline": "0 = بدون بذر", "bt_limit_label": "حدّ السرعة", "bt_limit_hint": "0 = بلا حدّ", + "bt_max_dl_label": "التنزيلات المتزامنة", + "bt_max_dl_hint": "في وقت واحد؛ والبقية في الطابور", + "bt_max_conn_label": "الحد الأقصى للاتصالات", + "bt_max_conn_hint": "حد اتصالات الأقران", "bt_limit_up": "أقصى سرعة رفع", "bt_limit_down": "أقصى سرعة تنزيل", "bt_port_word": "المنفذ", @@ -940,6 +953,13 @@ "reader_size_larger": "نص أكبر", "reader_auto": "استخدام وضع القراءة دائمًا", "reader_auto_hint": "فتح المقالات في وضع القراءة", + "app_theme": "المظهر", + "app_theme_hint": "يتبع «تلقائي» إعداد الفاتح أو الداكن في جهازك.", + "theme_auto": "تلقائي", + "theme_dark": "داكن", + "theme_light": "فاتح", + "darken_articles": "تعتيم المقالات", + "darken_articles_hint": "يعتّم صفحات المقالات الساطعة لتناسب الوضع الداكن. يحتفظ عرض القارئ بمظاهره الخاصة.", "reader_exit": "الخروج من وضع القراءة", "reader_print": "طباعة / حفظ بصيغة PDF", "reader_share": "مشاركة", @@ -948,10 +968,10 @@ "move_to": "نقل إلى…", "move_new_category": "فئة جديدة…", "move_new_category_prompt": "اسم الفئة الجديدة", - "reorder_sections": "إعادة ترتيب الأقسام", - "reorder_hint": "رتّب أقسام الفئات والمجموعات المعروضة في الصفحة الرئيسية.", - "reorder_empty": "لا توجد أقسام لإعادة ترتيبها بعد.", - "reorder": "إعادة ترتيب", + "reorder_sections": "تخصيص الفئات", + "reorder_hint": "رتّب الفئات والمجموعات المعروضة في الصفحة الرئيسية.", + "reorder_empty": "لا توجد فئات للتخصيص بعد.", + "reorder": "تخصيص", "reorder_drag_hint": "اسحب لإعادة الترتيب", "move_up": "تحريك لأعلى", "move_down": "تحريك لأسفل", @@ -994,6 +1014,20 @@ "users_role_user": "مستخدم", "users_role_limited": "محدود", "users_primary_admin": "المشرف الرئيسي", + "users_allow_search": "البحث في ملفات ZIM…", + "users_allow_all": "تحديد الكل", + "users_allow_none": "لا شيء", + "users_allow_count": "{n} من {total} محدد", + "users_pa_title": "الوصول العام", + "users_pa_sub": "ما يراه الزوار قبل تسجيل الدخول.", + "users_pa_open": "مفتوح", + "users_pa_open_desc": "يمكن لأي شخص تصفح المكتبة بالكامل.", + "users_pa_limited": "مقتصر على ملفات ZIM المحددة", + "users_pa_limited_desc": "يرى الزوار فقط ملفات ZIM التي تختارها.", + "users_pa_private": "تسجيل الدخول مطلوب", + "users_pa_private_desc": "يجب على الزوار تسجيل الدخول لرؤية أي شيء.", + "users_pa_env": "محدد بواسطة متغير البيئة:", + "users_pa_saved": "تم تحديث الوصول العام", "default_username_hint": "اسم المستخدم الافتراضي: {name}", "users_need_name_pw": "أدخل اسمًا وكلمة مرور.", "users_create_failed": "تعذّر إنشاء المستخدم.", @@ -1003,6 +1037,9 @@ "define_loading": "جارٍ البحث…", "define_no_results": "لم يُعثر على تعريف", "define_open_full": "فتح المدخل الكامل ←", + "define_hint": "نصيحة: حدد أي كلمة لعرض تعريفها", + "define_lookup": "البحث عن كلمة", + "define_lookup_prompt": "انقر على أي كلمة", "library_health": "التحقق من سلامة المكتبة", "library_health_running": "جارٍ فحص المكتبة…", "library_health_failed": "فشل فحص الصحة", @@ -1054,5 +1091,83 @@ "users_scope_limited": "وصول محدود", "library_view": "عرض المكتبة", "view_list": "عرض القائمة", - "view_tiles": "عرض البلاطات" + "view_tiles": "عرض البلاطات", + "downloads_section": "التنزيلات", + "dl_schedule_toggle": "التنزيل فقط خلال نافذة ليلية", + "dl_window_start": "البداية", + "dl_window_end": "النهاية", + "dl_window_hint": "التنزيلات التي تبدأ خارج هذه النافذة تنتظر حتى تُفتح. نافذة مثل 23:00–06:00 تمتد عبر منتصف الليل. الأوقات بالتوقيت المحلي للخادم.", + "dl_window_env_locked": "يتم التحكم فيها عبر متغير البيئة ZIMI_DL_WINDOW.", + "dl_in_window": "ضمن النافذة الآن", + "dl_waiting_window": "في انتظار النافذة", + "dl_speed_limit": "حد سرعة التنزيل", + "dl_speed_unit": "ك.بايت/ث", + "dl_speed_hint": "0 = بلا حد. ينطبق على كل عمليات النقل (HTTP وBitTorrent).", + "dl_speed_env_locked": "يتم التحكم فيه عبر متغير البيئة ZIMI_BT.", + "dl_scheduled": "مجدوَل", + "dl_scheduled_tip": "في انتظار فتح نافذة التنزيل الليلية.", + "dl_scheduled_starts": "يبدأ في {time}", + "dl_start_now": "ابدأ الآن", + "dl_start_now_tip": "ابدأ هذا التنزيل الآن بدلاً من انتظار النافذة.", + "dl_pause_all": "إيقاف الكل مؤقتًا", + "dl_resume_all": "استئناف الكل", + "dl_delete_all": "حذف الكل", + "dl_delete_all_confirm": "حذف كل التنزيلات؟ سيتم إلغاء التنزيلات النشطة ومسح القائمة.", + "show_all_n": "عرض الكل ({n})", + "bt_up_limit_label": "حد الرفع", + "backup_section": "النسخ الاحتياطي", + "backup_intro": "صدّر قائمة مكتبتك ومجموعاتك وإشاراتك المرجعية وتفضيلاتك إلى ملف واحد، ثم استعِدها على جهاز آخر أو بعد إعادة الضبط.", + "backup_export_all": "تصدير الكل", + "backup_import": "استيراد…", + "backup_exported": "تم تنزيل النسخة", + "backup_imported": "تمت استعادة النسخة", + "backup_bad_file": "ملف نسخة Zimi غير صالح", + "backup_library_complete": "جميع ملفات ZIM في النسخة مثبّتة بالفعل.", + "backup_missing_found": "{n} من ملفات ZIM في النسخة غير مثبّتة هنا.", + "backup_missing_none": "تسرد النسخة ملفات ZIM غير مثبّتة، لكن لا يوجد تطابق في الكتالوج.", + "backup_missing_unresolved": "تعذّر العثور على {n} في الكتالوج ويجب إضافتها يدويًا.", + "backup_download_missing": "تنزيل {n} من ملفات ZIM الناقصة", + "backup_queued": "{n} في قائمة الانتظار", + "backup_export_device": "نسخ احتياطي لهذا الجهاز", + "backup_export_server": "نسخة احتياطية كاملة للخادم", + "backup_scope_device": "هذا الجهاز: قائمة مكتبتك ومجموعاتك وإشاراتك المرجعية وتفضيلاتك.", + "backup_scope_server": "الخادم الكامل (المشرف): كل ما سبق بالإضافة إلى حسابات المستخدمين مع تجزئات كلمات المرور وسياسة الوصول والجدولة وإعدادات المشاركة — احتفظ بهذا الملف خاصًا.", + "backup_overwrite": "الاستبدال بدلاً من الدمج (استبدال الكل)", + "backup_apply": "تطبيق", + "backup_cancel": "إلغاء", + "backup_cancelled": "أُلغي الاستيراد — لم يتغيّر شيء.", + "backup_preview_title": "راجع هذه التغييرات قبل التطبيق:", + "backup_pv_collections": "المجموعات: {added} مضافة، {replaced} محدّثة", + "backup_pv_favorites": "المفضلة: {added} مضافة، {dupes} مكررة تم تخطيها", + "backup_pv_bookmarks": "الإشارات المرجعية: {added} مدمجة، {dupes} مكررة تم تخطيها", + "backup_pv_overrides": "تخطيط المكتبة: {added} مضافة، {changed} مغيّرة", + "backup_pv_users": "المستخدمون: {added} مضافون، {replaced} محدّثون", + "backup_pv_settings": "تم تغيير {n} إعدادات", + "backup_pv_missing": "{n} ملفات ZIM مفقودة متاحة للتنزيل", + "dl_upload_restrict": "تقييد الرفع بنافذة الوقت", + "dl_upload_trickle": "تدفق بطيء خارج النافذة", + "dl_upload_trickle_hint": "يُقيَّد البذر بهذا المعدل خارج النافذة.", + "dl_upload_throttled_now": "الرفع مُقيَّد الآن — خارج النافذة.", + "add_section": "إضافة فئة", + "add_section_prompt": "اسم الفئة الجديدة", + "remove_section": "إزالة الفئة", + "section_exists": "هذه الفئة موجودة بالفعل", + "reorder_moved_hint": "أصبح ترتيب الفئات الآن ضمن إعدادات المكتبة.", + "open_library_settings": "إعدادات المكتبة", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/i18n/de.json b/zimi/static/i18n/de.json index 4b268c2d..a6042726 100644 --- a/zimi/static/i18n/de.json +++ b/zimi/static/i18n/de.json @@ -23,6 +23,7 @@ "no_sources_matching": "Keine Quellen für „{query}“", "all_sources": "← Alle Quellen", "discover": "Entdecken", + "play_video": "Video abspielen", "discover_hidden": "Entdecken ausgeblendet", "undo": "Rückgängig", "today": "Heute", @@ -54,6 +55,9 @@ "show_more": "{n} weitere Ergebnisse anzeigen", "found_results_in": "{n} Ergebnisse in {time}s gefunden", "documents": "{n} Dokumente", + "filter_documents": "Dokumente filtern…", + "no_matching_documents": "Keine passenden Dokumente", + "document_collection": "Dokumentensammlung", "no_content": "Diese Quelle hat keinen Inhalt", "zim_corrupted": "Die ZIM-Datei ist möglicherweise beschädigt oder leer", "loading": "Wird geladen…", @@ -399,6 +403,7 @@ "ms_server": "Server", "ms_security": "Sicherheit", "ms_display_section": "Anzeige", + "ms_reader_section": "Lesen", "welcome_lang_title": "Inhalte auf {lang} gesucht?", "welcome_lang_body": "Zimi speichert ganze Enzyklopädien offline. Durchsuchen Sie den Katalog, um Wikipedia auf {lang} und mehr herunterzuladen.", "welcome_lang_browse": "Katalog durchsuchen", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "Weltweite Feiertage", "alm_holidays_follow_hint": "Folgt deinem Standort auf der Karte", "alm_region_holiday": "Feiertag ({c})", + "alm_showing_all_countries": "Feiertage aller Länder werden angezeigt", + "alm_scope_worldwide": "Weltweit", + "alm_scope_regional": "Regional", + "alm_scope_toggle_hint": "Zwischen deiner Region und allen Ländern wechseln", "alm_hol_1st_white_night": "1. Weiße Nacht", "alm_hol_aban_festival": "Aban-Fest", "alm_hol_annunciation": "Mariä Verkündigung", @@ -874,6 +883,10 @@ "seed_ratio_zero_inline": "0 = kein Seeden", "bt_limit_label": "Geschwindigkeit", "bt_limit_hint": "0 = unbegrenzt", + "bt_max_dl_label": "Gleichzeitige Downloads", + "bt_max_dl_hint": "Gleichzeitig aktiv; der Rest wartet", + "bt_max_conn_label": "Max. Verbindungen", + "bt_max_conn_hint": "Limit für Peer-Verbindungen", "bt_limit_up": "Max. Upload", "bt_limit_down": "Max. Download", "bt_port_word": "Port", @@ -940,6 +953,13 @@ "reader_size_larger": "Größerer Text", "reader_auto": "Leseansicht immer verwenden", "reader_auto_hint": "Artikel in Leseansicht öffnen", + "app_theme": "Design", + "app_theme_hint": "Automatisch folgt der Hell-/Dunkel-Einstellung deines Geräts.", + "theme_auto": "Auto", + "theme_dark": "Dunkel", + "theme_light": "Hell", + "darken_articles": "Artikel abdunkeln", + "darken_articles_hint": "Helle Artikelseiten an den Dunkelmodus anpassen. Die Leseansicht behält ihre eigenen Designs.", "reader_exit": "Leseansicht beenden", "reader_print": "Drucken / Als PDF speichern", "reader_share": "Teilen", @@ -948,10 +968,10 @@ "move_to": "Verschieben nach…", "move_new_category": "Neue Kategorie…", "move_new_category_prompt": "Name der neuen Kategorie", - "reorder_sections": "Abschnitte neu anordnen", - "reorder_hint": "Ordne die Kategorie- und Sammlungsabschnitte auf der Startseite an.", - "reorder_empty": "Noch keine Abschnitte zum Anordnen.", - "reorder": "Neu ordnen", + "reorder_sections": "Kategorien anpassen", + "reorder_hint": "Ordne die Kategorien und Sammlungen auf der Startseite an.", + "reorder_empty": "Noch keine Kategorien zum Anpassen.", + "reorder": "Anpassen", "reorder_drag_hint": "Zum Neuordnen ziehen", "move_up": "Nach oben", "move_down": "Nach unten", @@ -994,6 +1014,20 @@ "users_role_user": "Benutzer", "users_role_limited": "Eingeschränkt", "users_primary_admin": "Primärer Admin", + "users_allow_search": "ZIMs suchen…", + "users_allow_all": "Alle auswählen", + "users_allow_none": "Keine", + "users_allow_count": "{n} von {total} ausgewählt", + "users_pa_title": "Öffentlicher Zugriff", + "users_pa_sub": "Was Besucher vor der Anmeldung sehen.", + "users_pa_open": "Offen", + "users_pa_open_desc": "Jeder kann die gesamte Bibliothek durchsuchen.", + "users_pa_limited": "Auf ausgewählte ZIMs beschränkt", + "users_pa_limited_desc": "Besucher sehen nur die ZIMs, die Sie auswählen.", + "users_pa_private": "Anmeldung erforderlich", + "users_pa_private_desc": "Besucher müssen sich anmelden, um etwas zu sehen.", + "users_pa_env": "Durch Umgebungsvariable festgelegt:", + "users_pa_saved": "Öffentlicher Zugriff aktualisiert", "default_username_hint": "Standard-Benutzername: {name}", "users_need_name_pw": "Name und Passwort eingeben.", "users_create_failed": "Benutzer konnte nicht erstellt werden.", @@ -1003,6 +1037,9 @@ "define_loading": "Nachschlagen…", "define_no_results": "Keine Definition gefunden", "define_open_full": "Vollständigen Eintrag öffnen →", + "define_hint": "Tipp: Wähle ein Wort aus, um seine Definition zu sehen", + "define_lookup": "Wort nachschlagen", + "define_lookup_prompt": "Auf ein Wort tippen", "library_health": "Bibliothek-Integrität prüfen", "library_health_running": "Bibliothek wird geprüft…", "library_health_failed": "Zustandsprüfung fehlgeschlagen", @@ -1054,5 +1091,83 @@ "users_scope_limited": "Eingeschränkter Zugriff", "library_view": "Bibliotheksansicht", "view_list": "Listenansicht", - "view_tiles": "Kachelansicht" + "view_tiles": "Kachelansicht", + "downloads_section": "Downloads", + "dl_schedule_toggle": "Nur während eines nächtlichen Zeitfensters herunterladen", + "dl_window_start": "Start", + "dl_window_end": "Ende", + "dl_window_hint": "Downloads, die außerhalb dieses Fensters gestartet werden, warten bis zur Öffnung. Ein Fenster wie 23:00–06:00 reicht über Mitternacht. Die Zeiten gelten in der lokalen Serverzeit.", + "dl_window_env_locked": "Gesteuert durch die Umgebungsvariable ZIMI_DL_WINDOW.", + "dl_in_window": "Im Fenster", + "dl_waiting_window": "Warten auf Fenster", + "dl_speed_limit": "Download-Geschwindigkeitslimit", + "dl_speed_unit": "KB/s", + "dl_speed_hint": "0 = unbegrenzt. Gilt für alle Übertragungen (HTTP und BitTorrent).", + "dl_speed_env_locked": "Gesteuert durch die Umgebungsvariable ZIMI_BT.", + "dl_scheduled": "Geplant", + "dl_scheduled_tip": "Warten auf die Öffnung des nächtlichen Download-Fensters.", + "dl_scheduled_starts": "startet um {time}", + "dl_start_now": "Jetzt starten", + "dl_start_now_tip": "Diesen Download jetzt starten, statt auf das Fenster zu warten.", + "dl_pause_all": "Alle pausieren", + "dl_resume_all": "Alle fortsetzen", + "dl_delete_all": "Alle löschen", + "dl_delete_all_confirm": "Alle Downloads löschen? Aktive Downloads werden abgebrochen und die Liste geleert.", + "show_all_n": "Alle anzeigen ({n})", + "bt_up_limit_label": "Upload-Limit", + "backup_section": "Sicherung", + "backup_intro": "Exportiere deine Bibliotheksliste, Sammlungen, Lesezeichen und Einstellungen in eine Datei und stelle sie auf einem anderen Rechner oder nach einem Zurücksetzen wieder her.", + "backup_export_all": "Alles exportieren", + "backup_import": "Importieren…", + "backup_exported": "Sicherung heruntergeladen", + "backup_imported": "Sicherung wiederhergestellt", + "backup_bad_file": "Keine gültige Zimi-Sicherungsdatei", + "backup_library_complete": "Alle gesicherten ZIMs sind bereits installiert.", + "backup_missing_found": "{n} ZIMs aus der Sicherung sind hier nicht installiert.", + "backup_missing_none": "Die Sicherung listet nicht installierte ZIMs auf, aber keines passt zum Katalog.", + "backup_missing_unresolved": "{n} konnten im Katalog nicht gefunden werden und müssen manuell hinzugefügt werden.", + "backup_download_missing": "{n} fehlende ZIMs herunterladen", + "backup_queued": "{n} in Warteschlange", + "backup_export_device": "Dieses Gerät sichern", + "backup_export_server": "Vollständige Serversicherung", + "backup_scope_device": "Dieses Gerät: deine Bibliotheksliste, Sammlungen, Lesezeichen und Einstellungen.", + "backup_scope_server": "Vollständiger Server (Admin): alles oben Genannte plus Benutzerkonten mit Passwort-Hashes, Zugriffsrichtlinie, Zeitplan und Freigabeeinstellungen – halte diese Datei privat.", + "backup_overwrite": "Überschreiben statt zusammenführen (alles ersetzen)", + "backup_apply": "Anwenden", + "backup_cancel": "Abbrechen", + "backup_cancelled": "Import abgebrochen – nichts geändert.", + "backup_preview_title": "Prüfe diese Änderungen vor dem Anwenden:", + "backup_pv_collections": "Sammlungen: {added} hinzugefügt, {replaced} aktualisiert", + "backup_pv_favorites": "Favoriten: {added} hinzugefügt, {dupes} Duplikate übersprungen", + "backup_pv_bookmarks": "Lesezeichen: {added} zusammengeführt, {dupes} Duplikate übersprungen", + "backup_pv_overrides": "Bibliothekslayout: {added} hinzugefügt, {changed} geändert", + "backup_pv_users": "Benutzer: {added} hinzugefügt, {replaced} aktualisiert", + "backup_pv_settings": "{n} Einstellungen geändert", + "backup_pv_missing": "{n} fehlende ZIMs zum Herunterladen verfügbar", + "dl_upload_restrict": "Uploads auf das Zeitfenster beschränken", + "dl_upload_trickle": "Drosselung außerhalb des Fensters", + "dl_upload_trickle_hint": "Seeding wird außerhalb des Fensters auf diese Rate begrenzt.", + "dl_upload_throttled_now": "Uploads werden gerade gedrosselt – außerhalb des Fensters.", + "add_section": "Kategorie hinzufügen", + "add_section_prompt": "Name der neuen Kategorie", + "remove_section": "Kategorie entfernen", + "section_exists": "Diese Kategorie existiert bereits", + "reorder_moved_hint": "Die Kategoriereihenfolge befindet sich jetzt in den Bibliothekseinstellungen.", + "open_library_settings": "Bibliothekseinstellungen", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/i18n/en.json b/zimi/static/i18n/en.json index cc2c21ee..a90292a2 100644 --- a/zimi/static/i18n/en.json +++ b/zimi/static/i18n/en.json @@ -23,6 +23,7 @@ "no_sources_matching": "No sources matching '{query}'", "all_sources": "← All Sources", "discover": "Discover", + "play_video": "Play video", "discover_hidden": "Discover hidden", "undo": "Undo", "today": "Today", @@ -54,6 +55,9 @@ "show_more": "Show {n} more results", "found_results_in": "Found {n} results in {time}s", "documents": "{n} documents", + "filter_documents": "Filter documents…", + "no_matching_documents": "No matching documents", + "document_collection": "Document collection", "no_content": "This source has no content", "zim_corrupted": "The ZIM file may be corrupted or empty", "loading": "Loading…", @@ -102,7 +106,7 @@ "create": "Create", "n_sources": "{n} sources", "no_collections": "No collections yet. Create one to group ZIMs for scoped search.", - "collection_hint": "Click a collection to add or remove sources. Collections with sources appear as homepage sections.", + "collection_hint": "Click a collection to add or remove sources. Collections with sources appear on the home page.", "no_history": "No history yet", "history_hint": "Downloads, updates, and deletions will appear here", "could_not_load": "Could not load history", @@ -399,6 +403,7 @@ "ms_server": "Server", "ms_security": "Security", "ms_display_section": "Display", + "ms_reader_section": "Reading", "welcome_lang_title": "Looking for {lang} content?", "welcome_lang_body": "Zimi stores entire encyclopedias offline. Browse the Catalog to download {lang} Wikipedia and more.", "welcome_lang_browse": "Browse Catalog", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "Showing worldwide holidays", "alm_holidays_follow_hint": "Follows your location on the map", "alm_region_holiday": "{c} holiday", + "alm_showing_all_countries": "Showing every country's holidays", + "alm_scope_worldwide": "Worldwide", + "alm_scope_regional": "Regional", + "alm_scope_toggle_hint": "Switch between your region and every country", "alm_hol_1st_white_night": "1st White Night", "alm_hol_aban_festival": "Aban Festival", "alm_hol_annunciation": "Annunciation", @@ -867,13 +876,17 @@ "share_bt_desc": "Download and seed ZIMs over BitTorrent.", "seed_ratio_label": "Seed ratio", "share_mirror_title": "Mirror", - "share_mirror_desc": "Become a Kiwix BitTorrent mirror and help share the load. Seeds your whole library and backs up the entire catalog for offline use.", + "share_mirror_desc": "Seed your whole library and back up the full Kiwix catalog for offline use.", "share_nearby_title": "Nearby", "share_nearby_desc": "Share and download ZIM files on your local network.", "seed_ratio_zero_hint": "Stop seeding after uploading this many times the file size. 0 = never seed.", "seed_ratio_zero_inline": "0 for no seeding", "bt_limit_label": "Speed limit", "bt_limit_hint": "0 = unlimited", + "bt_max_dl_label": "Max downloads", + "bt_max_dl_hint": "Run at once; the rest queue", + "bt_max_conn_label": "Max connections", + "bt_max_conn_hint": "Peer connection limit", "bt_limit_up": "Max upload speed", "bt_limit_down": "Max download speed", "bt_port_word": "Port", @@ -940,6 +953,13 @@ "reader_size_larger": "Larger text", "reader_auto": "Always use Reader View", "reader_auto_hint": "Open articles in Reader View", + "app_theme": "Theme", + "app_theme_hint": "Auto follows your device's light or dark setting.", + "theme_auto": "Auto", + "theme_dark": "Dark", + "theme_light": "Light", + "darken_articles": "Darken articles", + "darken_articles_hint": "Dim bright article pages to match dark mode. Reader View keeps its own themes.", "reader_exit": "Exit Reader View", "reader_print": "Print / Save as PDF", "reader_share": "Share", @@ -948,10 +968,10 @@ "move_to": "Move to…", "move_new_category": "New category…", "move_new_category_prompt": "New category name", - "reorder_sections": "Reorder sections", - "reorder_hint": "Order the category and collection sections shown on the home page.", - "reorder_empty": "No sections to reorder yet.", - "reorder": "Reorder", + "reorder_sections": "Customize categories", + "reorder_hint": "Order the categories and collections shown on the home page.", + "reorder_empty": "No categories to customize yet.", + "reorder": "Customize", "reorder_drag_hint": "Drag to reorder", "move_up": "Move up", "move_down": "Move down", @@ -994,6 +1014,20 @@ "users_role_user": "User", "users_role_limited": "Limited", "users_primary_admin": "Primary admin", + "users_allow_search": "Search ZIMs…", + "users_allow_all": "Select all", + "users_allow_none": "None", + "users_allow_count": "{n} of {total} selected", + "users_pa_title": "Public access", + "users_pa_sub": "What visitors see before signing in.", + "users_pa_open": "Open", + "users_pa_open_desc": "Anyone can browse the whole library.", + "users_pa_limited": "Limited to selected ZIMs", + "users_pa_limited_desc": "Visitors see only the ZIMs you choose.", + "users_pa_private": "Sign-in required", + "users_pa_private_desc": "Visitors must sign in to see anything.", + "users_pa_env": "Set by environment variable:", + "users_pa_saved": "Public access updated", "default_username_hint": "Default username: {name}", "users_need_name_pw": "Enter a name and password.", "users_create_failed": "Could not create user.", @@ -1003,6 +1037,9 @@ "define_loading": "Looking up…", "define_no_results": "No definition found", "define_open_full": "Open full entry →", + "define_hint": "Tip: select any word for its definition", + "define_lookup": "Look up a word", + "define_lookup_prompt": "Tap any word", "library_health": "Check library integrity", "library_health_running": "Checking library…", "library_health_failed": "Health check failed", @@ -1054,5 +1091,83 @@ "users_scope_limited": "Limited access", "library_view": "Library view", "view_list": "List view", - "view_tiles": "Tile view" + "view_tiles": "Tile view", + "downloads_section": "Downloads", + "dl_schedule_toggle": "Only download during a nightly window", + "dl_window_start": "Start", + "dl_window_end": "End", + "dl_window_hint": "Downloads started outside this window wait until it opens. A window like 23:00–06:00 spans midnight. Times are server local time.", + "dl_window_env_locked": "Controlled by the ZIMI_DL_WINDOW environment variable.", + "dl_in_window": "In window now", + "dl_waiting_window": "Waiting for window", + "dl_speed_limit": "Download speed limit", + "dl_speed_unit": "KB/s", + "dl_speed_hint": "0 = unlimited. Covers HTTP and BitTorrent.", + "dl_speed_env_locked": "Controlled by the ZIMI_BT environment variable.", + "dl_scheduled": "Scheduled", + "dl_scheduled_tip": "Waiting for the nightly download window to open.", + "dl_scheduled_starts": "starts {time}", + "dl_start_now": "Start now", + "dl_start_now_tip": "Start this download now instead of waiting for the window.", + "dl_pause_all": "Pause all", + "dl_resume_all": "Resume all", + "dl_delete_all": "Delete all", + "dl_delete_all_confirm": "Delete all downloads? Active downloads will be cancelled and the list cleared.", + "show_all_n": "Show all ({n})", + "bt_up_limit_label": "Upload limit", + "backup_section": "Backup", + "backup_intro": "Export your library list, collections, bookmarks, and preferences to one file — then restore them on another machine or after a reset.", + "backup_export_all": "Export all", + "backup_import": "Import…", + "backup_exported": "Backup downloaded", + "backup_imported": "Backup restored", + "backup_bad_file": "Not a valid Zimi backup file", + "backup_library_complete": "All backed-up ZIMs are already installed.", + "backup_missing_found": "{n} ZIMs from the backup aren't installed here.", + "backup_missing_none": "The backup lists ZIMs that aren't installed, but none matched the catalog.", + "backup_missing_unresolved": "{n} couldn't be matched in the catalog and must be added manually.", + "backup_download_missing": "Download {n} missing ZIMs", + "backup_queued": "{n} queued", + "backup_export_device": "Back up this device", + "backup_export_server": "Full server backup", + "backup_scope_device": "This device: your library list, collections, bookmarks, and preferences.", + "backup_scope_server": "Full server (admin): everything above plus user accounts with password hashes, access policy, schedule, and sharing settings — keep this file private.", + "backup_overwrite": "Overwrite instead of merge (replace all)", + "backup_apply": "Apply", + "backup_cancel": "Cancel", + "backup_cancelled": "Import cancelled — nothing changed.", + "backup_preview_title": "Review these changes before applying:", + "backup_pv_collections": "Collections: {added} added, {replaced} updated", + "backup_pv_favorites": "Favorites: {added} added, {dupes} duplicates skipped", + "backup_pv_bookmarks": "Bookmarks: {added} merged, {dupes} duplicates skipped", + "backup_pv_overrides": "Library layout: {added} added, {changed} changed", + "backup_pv_users": "Users: {added} added, {replaced} updated", + "backup_pv_settings": "{n} settings changed", + "backup_pv_missing": "{n} missing ZIMs available to download", + "dl_upload_restrict": "Restrict uploads to the window", + "dl_upload_trickle": "Trickle outside window", + "dl_upload_trickle_hint": "Seeding is capped to this rate outside the window.", + "dl_upload_throttled_now": "Uploads are trickling now — outside the window.", + "add_section": "Add category", + "add_section_prompt": "New category name", + "remove_section": "Remove category", + "section_exists": "That category already exists", + "reorder_moved_hint": "Category order now lives under Library settings.", + "open_library_settings": "Library settings", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/i18n/es.json b/zimi/static/i18n/es.json index 026971a4..5f2d87bf 100644 --- a/zimi/static/i18n/es.json +++ b/zimi/static/i18n/es.json @@ -23,6 +23,7 @@ "no_sources_matching": "Ninguna fuente coincide con «{query}»", "all_sources": "← Todas las fuentes", "discover": "Descubrir", + "play_video": "Reproducir vídeo", "discover_hidden": "Descubrir oculto", "undo": "Deshacer", "today": "Hoy", @@ -54,6 +55,9 @@ "show_more": "Mostrar {n} resultados más", "found_results_in": "{n} resultados encontrados en {time}s", "documents": "{n} documentos", + "filter_documents": "Filtrar documentos…", + "no_matching_documents": "No hay documentos coincidentes", + "document_collection": "Colección de documentos", "no_content": "Esta fuente no tiene contenido", "zim_corrupted": "El archivo ZIM puede estar corrupto o vacío", "loading": "Cargando…", @@ -399,6 +403,7 @@ "ms_server": "Servidor", "ms_security": "Seguridad", "ms_display_section": "Visualización", + "ms_reader_section": "Lectura", "welcome_lang_title": "¿Buscas contenido en {lang}?", "welcome_lang_body": "Zimi almacena enciclopedias enteras sin conexión. Explora el Catálogo para descargar Wikipedia en {lang} y más.", "welcome_lang_browse": "Explorar Catálogo", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "Mostrando festivos mundiales", "alm_holidays_follow_hint": "Sigue tu ubicación en el mapa", "alm_region_holiday": "Festivo de {c}", + "alm_showing_all_countries": "Mostrando festivos de todos los países", + "alm_scope_worldwide": "Todo el mundo", + "alm_scope_regional": "Regional", + "alm_scope_toggle_hint": "Cambiar entre tu región y todos los países", "alm_hol_1st_white_night": "1.ª Noche Blanca", "alm_hol_aban_festival": "Festival de Aban", "alm_hol_annunciation": "Anunciación", @@ -874,6 +883,10 @@ "seed_ratio_zero_inline": "0 = sin siembra", "bt_limit_label": "Límite de velocidad", "bt_limit_hint": "0 = sin límite", + "bt_max_dl_label": "Descargas simultáneas", + "bt_max_dl_hint": "A la vez; el resto en cola", + "bt_max_conn_label": "Conexiones máximas", + "bt_max_conn_hint": "Límite de conexiones de pares", "bt_limit_up": "Subida máxima", "bt_limit_down": "Bajada máxima", "bt_port_word": "Puerto", @@ -940,6 +953,13 @@ "reader_size_larger": "Texto más grande", "reader_auto": "Usar siempre Vista de lectura", "reader_auto_hint": "Abrir artículos en Vista de lectura", + "app_theme": "Tema", + "app_theme_hint": "Automático sigue el ajuste claro u oscuro de tu dispositivo.", + "theme_auto": "Auto", + "theme_dark": "Oscuro", + "theme_light": "Claro", + "darken_articles": "Oscurecer artículos", + "darken_articles_hint": "Atenúa las páginas de artículos claras para el modo oscuro. La Vista de lectura mantiene sus propios temas.", "reader_exit": "Salir de Vista de lectura", "reader_print": "Imprimir / Guardar como PDF", "reader_share": "Compartir", @@ -948,10 +968,10 @@ "move_to": "Mover a…", "move_new_category": "Nueva categoría…", "move_new_category_prompt": "Nombre de la nueva categoría", - "reorder_sections": "Reordenar secciones", - "reorder_hint": "Ordena las secciones de categorías y colecciones de la página de inicio.", - "reorder_empty": "Aún no hay secciones para reordenar.", - "reorder": "Reordenar", + "reorder_sections": "Personalizar categorías", + "reorder_hint": "Ordena las categorías y colecciones de la página de inicio.", + "reorder_empty": "Aún no hay categorías para personalizar.", + "reorder": "Personalizar", "reorder_drag_hint": "Arrastra para reordenar", "move_up": "Subir", "move_down": "Bajar", @@ -994,6 +1014,20 @@ "users_role_user": "Usuario", "users_role_limited": "Limitado", "users_primary_admin": "Administrador principal", + "users_allow_search": "Buscar ZIM…", + "users_allow_all": "Seleccionar todo", + "users_allow_none": "Ninguno", + "users_allow_count": "{n} de {total} seleccionados", + "users_pa_title": "Acceso público", + "users_pa_sub": "Lo que ven los visitantes antes de iniciar sesión.", + "users_pa_open": "Abierto", + "users_pa_open_desc": "Cualquiera puede explorar toda la biblioteca.", + "users_pa_limited": "Limitado a los ZIM seleccionados", + "users_pa_limited_desc": "Los visitantes solo ven los ZIM que elijas.", + "users_pa_private": "Requiere iniciar sesión", + "users_pa_private_desc": "Los visitantes deben iniciar sesión para ver algo.", + "users_pa_env": "Definido por variable de entorno:", + "users_pa_saved": "Acceso público actualizado", "default_username_hint": "Usuario predeterminado: {name}", "users_need_name_pw": "Introduce un nombre y una contraseña.", "users_create_failed": "No se pudo crear el usuario.", @@ -1003,6 +1037,9 @@ "define_loading": "Buscando…", "define_no_results": "No se encontró definición", "define_open_full": "Abrir entrada completa →", + "define_hint": "Consejo: selecciona cualquier palabra para ver su definición", + "define_lookup": "Buscar una palabra", + "define_lookup_prompt": "Toca cualquier palabra", "library_health": "Verificar integridad de la biblioteca", "library_health_running": "Comprobando la biblioteca…", "library_health_failed": "Error en la comprobación", @@ -1054,5 +1091,83 @@ "users_scope_limited": "Acceso limitado", "library_view": "Vista de biblioteca", "view_list": "Vista de lista", - "view_tiles": "Vista de mosaico" + "view_tiles": "Vista de mosaico", + "downloads_section": "Descargas", + "dl_schedule_toggle": "Descargar solo durante una ventana nocturna", + "dl_window_start": "Inicio", + "dl_window_end": "Fin", + "dl_window_hint": "Las descargas iniciadas fuera de esta ventana esperan a que se abra. Una ventana como 23:00–06:00 abarca la medianoche. Las horas son la hora local del servidor.", + "dl_window_env_locked": "Controlado por la variable de entorno ZIMI_DL_WINDOW.", + "dl_in_window": "Dentro de la ventana", + "dl_waiting_window": "Esperando la ventana", + "dl_speed_limit": "Límite de velocidad de descarga", + "dl_speed_unit": "KB/s", + "dl_speed_hint": "0 = sin límite. Se aplica a todas las transferencias (HTTP y BitTorrent).", + "dl_speed_env_locked": "Controlado por la variable de entorno ZIMI_BT.", + "dl_scheduled": "Programada", + "dl_scheduled_tip": "Esperando a que se abra la ventana de descarga nocturna.", + "dl_scheduled_starts": "empieza a las {time}", + "dl_start_now": "Empezar ahora", + "dl_start_now_tip": "Iniciar esta descarga ahora en lugar de esperar la ventana.", + "dl_pause_all": "Pausar todo", + "dl_resume_all": "Reanudar todo", + "dl_delete_all": "Eliminar todo", + "dl_delete_all_confirm": "¿Eliminar todas las descargas? Las descargas activas se cancelarán y la lista se borrará.", + "show_all_n": "Mostrar todo ({n})", + "bt_up_limit_label": "Límite de subida", + "backup_section": "Copia de seguridad", + "backup_intro": "Exporta tu lista de biblioteca, colecciones, marcadores y preferencias a un solo archivo, y restáuralos en otra máquina o tras un reinicio.", + "backup_export_all": "Exportar todo", + "backup_import": "Importar…", + "backup_exported": "Copia descargada", + "backup_imported": "Copia restaurada", + "backup_bad_file": "No es un archivo de copia de Zimi válido", + "backup_library_complete": "Todos los ZIM de la copia ya están instalados.", + "backup_missing_found": "{n} ZIM de la copia no están instalados aquí.", + "backup_missing_none": "La copia incluye ZIM no instalados, pero ninguno coincide con el catálogo.", + "backup_missing_unresolved": "{n} no se pudieron encontrar en el catálogo y deben añadirse manualmente.", + "backup_download_missing": "Descargar {n} ZIM que faltan", + "backup_queued": "{n} en cola", + "backup_export_device": "Copia de este dispositivo", + "backup_export_server": "Copia completa del servidor", + "backup_scope_device": "Este dispositivo: tu lista de biblioteca, colecciones, marcadores y preferencias.", + "backup_scope_server": "Servidor completo (admin): todo lo anterior más las cuentas de usuario con hashes de contraseña, la política de acceso, la programación y los ajustes de uso compartido; mantén este archivo privado.", + "backup_overwrite": "Sobrescribir en vez de combinar (reemplazar todo)", + "backup_apply": "Aplicar", + "backup_cancel": "Cancelar", + "backup_cancelled": "Importación cancelada: no se cambió nada.", + "backup_preview_title": "Revisa estos cambios antes de aplicar:", + "backup_pv_collections": "Colecciones: {added} añadidas, {replaced} actualizadas", + "backup_pv_favorites": "Favoritos: {added} añadidos, {dupes} duplicados omitidos", + "backup_pv_bookmarks": "Marcadores: {added} combinados, {dupes} duplicados omitidos", + "backup_pv_overrides": "Diseño de biblioteca: {added} añadidos, {changed} cambiados", + "backup_pv_users": "Usuarios: {added} añadidos, {replaced} actualizados", + "backup_pv_settings": "{n} ajustes cambiados", + "backup_pv_missing": "{n} ZIM faltantes disponibles para descargar", + "dl_upload_restrict": "Restringir las subidas a la ventana", + "dl_upload_trickle": "Goteo fuera de la ventana", + "dl_upload_trickle_hint": "La siembra se limita a esta velocidad fuera de la ventana.", + "dl_upload_throttled_now": "Las subidas están goteando ahora, fuera de la ventana.", + "add_section": "Añadir categoría", + "add_section_prompt": "Nombre de la nueva categoría", + "remove_section": "Eliminar categoría", + "section_exists": "Esa categoría ya existe", + "reorder_moved_hint": "El orden de las categorías ahora está en la configuración de la biblioteca.", + "open_library_settings": "Configuración de la biblioteca", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/i18n/fr.json b/zimi/static/i18n/fr.json index 2b86b749..e42cc78d 100644 --- a/zimi/static/i18n/fr.json +++ b/zimi/static/i18n/fr.json @@ -23,6 +23,7 @@ "no_sources_matching": "Aucune source correspondant à « {query} »", "all_sources": "← Toutes les sources", "discover": "Découvrir", + "play_video": "Lire la vidéo", "discover_hidden": "Découvrir masqué", "undo": "Annuler", "today": "Aujourd’hui", @@ -54,6 +55,9 @@ "show_more": "Afficher {n} résultats supplémentaires", "found_results_in": "{n} résultats trouvés en {time}s", "documents": "{n} documents", + "filter_documents": "Filtrer les documents…", + "no_matching_documents": "Aucun document correspondant", + "document_collection": "Collection de documents", "no_content": "Cette source n’a pas de contenu", "zim_corrupted": "Le fichier ZIM est peut-être corrompu ou vide", "loading": "Chargement…", @@ -399,6 +403,7 @@ "ms_server": "Serveur", "ms_security": "Sécurité", "ms_display_section": "Affichage", + "ms_reader_section": "Lecture", "welcome_lang_title": "Vous cherchez du contenu en {lang} ?", "welcome_lang_body": "Zimi stocke des encyclopédies entières hors ligne. Parcourez le Catalogue pour télécharger Wikipédia en {lang} et plus.", "welcome_lang_browse": "Parcourir le Catalogue", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "Jours fériés mondiaux", "alm_holidays_follow_hint": "Suit votre position sur la carte", "alm_region_holiday": "Fête de {c}", + "alm_showing_all_countries": "Affichage des fêtes de tous les pays", + "alm_scope_worldwide": "Monde entier", + "alm_scope_regional": "Régional", + "alm_scope_toggle_hint": "Basculer entre votre région et tous les pays", "alm_hol_1st_white_night": "1re Nuit blanche", "alm_hol_aban_festival": "Fête d'Aban", "alm_hol_annunciation": "Annonciation", @@ -874,6 +883,10 @@ "seed_ratio_zero_inline": "0 = pas de partage", "bt_limit_label": "Limite de débit", "bt_limit_hint": "0 = illimité", + "bt_max_dl_label": "Téléchargements simultanés", + "bt_max_dl_hint": "En même temps ; le reste en file", + "bt_max_conn_label": "Connexions maximales", + "bt_max_conn_hint": "Limite de connexions de pairs", "bt_limit_up": "Envoi max", "bt_limit_down": "Téléchargement max", "bt_port_word": "Port", @@ -940,6 +953,13 @@ "reader_size_larger": "Texte plus grand", "reader_auto": "Toujours utiliser le mode lecture", "reader_auto_hint": "Ouvrir les articles en mode lecture", + "app_theme": "Thème", + "app_theme_hint": "Automatique suit le réglage clair ou sombre de votre appareil.", + "theme_auto": "Auto", + "theme_dark": "Sombre", + "theme_light": "Clair", + "darken_articles": "Assombrir les articles", + "darken_articles_hint": "Atténue les pages d'articles claires pour le mode sombre. Le mode Lecture conserve ses propres thèmes.", "reader_exit": "Quitter le mode lecture", "reader_print": "Imprimer / Enregistrer en PDF", "reader_share": "Partager", @@ -948,10 +968,10 @@ "move_to": "Déplacer vers…", "move_new_category": "Nouvelle catégorie…", "move_new_category_prompt": "Nom de la nouvelle catégorie", - "reorder_sections": "Réorganiser les sections", - "reorder_hint": "Ordonnez les sections de catégories et de collections affichées sur l'accueil.", - "reorder_empty": "Aucune section à réorganiser pour l'instant.", - "reorder": "Réorganiser", + "reorder_sections": "Personnaliser les catégories", + "reorder_hint": "Ordonnez les catégories et collections affichées sur l'accueil.", + "reorder_empty": "Aucune catégorie à personnaliser pour l'instant.", + "reorder": "Personnaliser", "reorder_drag_hint": "Glisser pour réorganiser", "move_up": "Monter", "move_down": "Descendre", @@ -994,6 +1014,20 @@ "users_role_user": "Utilisateur", "users_role_limited": "Limité", "users_primary_admin": "Admin principal", + "users_allow_search": "Rechercher des ZIM…", + "users_allow_all": "Tout sélectionner", + "users_allow_none": "Aucun", + "users_allow_count": "{n} sur {total} sélectionnés", + "users_pa_title": "Accès public", + "users_pa_sub": "Ce que voient les visiteurs avant de se connecter.", + "users_pa_open": "Ouvert", + "users_pa_open_desc": "Tout le monde peut parcourir toute la bibliothèque.", + "users_pa_limited": "Limité aux ZIM sélectionnés", + "users_pa_limited_desc": "Les visiteurs ne voient que les ZIM que vous choisissez.", + "users_pa_private": "Connexion requise", + "users_pa_private_desc": "Les visiteurs doivent se connecter pour voir quoi que ce soit.", + "users_pa_env": "Défini par variable d'environnement :", + "users_pa_saved": "Accès public mis à jour", "default_username_hint": "Nom d’utilisateur par défaut : {name}", "users_need_name_pw": "Saisissez un nom et un mot de passe.", "users_create_failed": "Impossible de créer l’utilisateur.", @@ -1003,6 +1037,9 @@ "define_loading": "Recherche…", "define_no_results": "Aucune définition trouvée", "define_open_full": "Ouvrir l'entrée complète →", + "define_hint": "Astuce : sélectionnez un mot pour voir sa définition", + "define_lookup": "Rechercher un mot", + "define_lookup_prompt": "Touchez un mot", "library_health": "Vérifier l'intégrité de la bibliothèque", "library_health_running": "Vérification de la bibliothèque…", "library_health_failed": "Échec de la vérification", @@ -1054,5 +1091,83 @@ "users_scope_limited": "Accès limité", "library_view": "Affichage de la bibliothèque", "view_list": "Vue liste", - "view_tiles": "Vue mosaïque" + "view_tiles": "Vue mosaïque", + "downloads_section": "Téléchargements", + "dl_schedule_toggle": "Télécharger uniquement pendant une plage nocturne", + "dl_window_start": "Début", + "dl_window_end": "Fin", + "dl_window_hint": "Les téléchargements lancés hors de cette plage attendent son ouverture. Une plage comme 23:00–06:00 franchit minuit. Les heures sont à l'heure locale du serveur.", + "dl_window_env_locked": "Contrôlé par la variable d'environnement ZIMI_DL_WINDOW.", + "dl_in_window": "Dans la plage", + "dl_waiting_window": "En attente de la plage", + "dl_speed_limit": "Limite de vitesse de téléchargement", + "dl_speed_unit": "Ko/s", + "dl_speed_hint": "0 = illimité. S'applique à tous les transferts (HTTP et BitTorrent).", + "dl_speed_env_locked": "Contrôlé par la variable d'environnement ZIMI_BT.", + "dl_scheduled": "Planifié", + "dl_scheduled_tip": "En attente de l'ouverture de la plage de téléchargement nocturne.", + "dl_scheduled_starts": "démarre à {time}", + "dl_start_now": "Démarrer maintenant", + "dl_start_now_tip": "Démarrer ce téléchargement maintenant au lieu d'attendre la plage.", + "dl_pause_all": "Tout suspendre", + "dl_resume_all": "Tout reprendre", + "dl_delete_all": "Tout supprimer", + "dl_delete_all_confirm": "Supprimer tous les téléchargements ? Les téléchargements en cours seront annulés et la liste effacée.", + "show_all_n": "Tout afficher ({n})", + "bt_up_limit_label": "Limite d'envoi", + "backup_section": "Sauvegarde", + "backup_intro": "Exportez votre liste de bibliothèque, vos collections, favoris et préférences dans un seul fichier, puis restaurez-les sur une autre machine ou après une réinitialisation.", + "backup_export_all": "Tout exporter", + "backup_import": "Importer…", + "backup_exported": "Sauvegarde téléchargée", + "backup_imported": "Sauvegarde restaurée", + "backup_bad_file": "Fichier de sauvegarde Zimi non valide", + "backup_library_complete": "Tous les ZIM de la sauvegarde sont déjà installés.", + "backup_missing_found": "{n} ZIM de la sauvegarde ne sont pas installés ici.", + "backup_missing_none": "La sauvegarde répertorie des ZIM non installés, mais aucun ne correspond au catalogue.", + "backup_missing_unresolved": "{n} n'ont pas pu être trouvés dans le catalogue et doivent être ajoutés manuellement.", + "backup_download_missing": "Télécharger {n} ZIM manquants", + "backup_queued": "{n} en file", + "backup_export_device": "Sauvegarder cet appareil", + "backup_export_server": "Sauvegarde complète du serveur", + "backup_scope_device": "Cet appareil : votre liste de bibliothèque, collections, favoris et préférences.", + "backup_scope_server": "Serveur complet (admin) : tout ce qui précède, plus les comptes utilisateurs avec les empreintes de mot de passe, la politique d'accès, la planification et les réglages de partage — gardez ce fichier privé.", + "backup_overwrite": "Écraser au lieu de fusionner (tout remplacer)", + "backup_apply": "Appliquer", + "backup_cancel": "Annuler", + "backup_cancelled": "Import annulé — rien n'a changé.", + "backup_preview_title": "Vérifiez ces changements avant d'appliquer :", + "backup_pv_collections": "Collections : {added} ajoutées, {replaced} mises à jour", + "backup_pv_favorites": "Favoris : {added} ajoutés, {dupes} doublons ignorés", + "backup_pv_bookmarks": "Signets : {added} fusionnés, {dupes} doublons ignorés", + "backup_pv_overrides": "Disposition de la bibliothèque : {added} ajoutés, {changed} modifiés", + "backup_pv_users": "Utilisateurs : {added} ajoutés, {replaced} mis à jour", + "backup_pv_settings": "{n} réglages modifiés", + "backup_pv_missing": "{n} ZIM manquants disponibles au téléchargement", + "dl_upload_restrict": "Limiter les envois à la plage horaire", + "dl_upload_trickle": "Débit réduit hors plage", + "dl_upload_trickle_hint": "Le partage est limité à ce débit en dehors de la plage.", + "dl_upload_throttled_now": "Les envois sont réduits actuellement — hors plage.", + "add_section": "Ajouter une catégorie", + "add_section_prompt": "Nom de la nouvelle catégorie", + "remove_section": "Supprimer la catégorie", + "section_exists": "Cette catégorie existe déjà", + "reorder_moved_hint": "L'ordre des catégories se trouve désormais dans les paramètres de la bibliothèque.", + "open_library_settings": "Paramètres de la bibliothèque", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/i18n/he.json b/zimi/static/i18n/he.json index 38a64810..f128ed3c 100644 --- a/zimi/static/i18n/he.json +++ b/zimi/static/i18n/he.json @@ -23,6 +23,7 @@ "no_sources_matching": "אין מקורות תואמים ל־'{query}'", "all_sources": "כל המקורות →", "discover": "גלה", + "play_video": "הפעלת וידאו", "discover_hidden": "גילויים הוסתרו", "undo": "ביטול", "today": "היום", @@ -54,6 +55,9 @@ "show_more": "הצג עוד {n} תוצאות", "found_results_in": "נמצאו {n} תוצאות תוך {time} שנ׳", "documents": "{n} מסמכים", + "filter_documents": "סינון מסמכים…", + "no_matching_documents": "אין מסמכים תואמים", + "document_collection": "אוסף מסמכים", "no_content": "למקור זה אין תוכן", "zim_corrupted": "קובץ ה־ZIM עלול להיות פגום או ריק", "loading": "טוען…", @@ -102,7 +106,7 @@ "create": "צור", "n_sources": "{n} מקורות", "no_collections": "אין אוספים עדיין. צרו אוסף לקיבוץ קבצי ZIM לחיפוש ממוקד.", - "collection_hint": "לחצו על אוסף להוספה או הסרה של מקורות. אוספים עם מקורות מופיעים כמדורים בדף הבית.", + "collection_hint": "לחצו על אוסף להוספה או הסרה של מקורות. אוספים עם מקורות מופיעים בדף הבית.", "no_history": "אין היסטוריה עדיין", "history_hint": "הורדות, עדכונים ומחיקות יופיעו כאן", "could_not_load": "לא ניתן לטעון היסטוריה", @@ -399,6 +403,7 @@ "ms_server": "שרת", "ms_security": "אבטחה", "ms_display_section": "תצוגה", + "ms_reader_section": "קריאה", "welcome_lang_title": "מחפשים תוכן ב{lang}?", "welcome_lang_body": "Zimi מאחסן אנציקלופדיות שלמות במצב לא מקוון. דפדפו בקטלוג כדי להוריד את ויקיפדיה ב{lang} ועוד.", "welcome_lang_browse": "דפדפו בקטלוג", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "מציג חגים עולמיים", "alm_holidays_follow_hint": "עוקב אחר מיקומך במפה", "alm_region_holiday": "חג של {c}", + "alm_showing_all_countries": "מציג חגים מכל המדינות", + "alm_scope_worldwide": "כל העולם", + "alm_scope_regional": "אזורי", + "alm_scope_toggle_hint": "מעבר בין האזור שלך לכל המדינות", "alm_hol_1st_white_night": "הלילה הלבן הראשון", "alm_hol_aban_festival": "חג אבאן", "alm_hol_annunciation": "הבשורה", @@ -874,6 +883,10 @@ "seed_ratio_zero_inline": "0 = ללא זריעה", "bt_limit_label": "מגבלת מהירות", "bt_limit_hint": "0 = ללא הגבלה", + "bt_max_dl_label": "הורדות במקביל", + "bt_max_dl_hint": "בו-זמנית; השאר בתור", + "bt_max_conn_label": "מקסימום חיבורים", + "bt_max_conn_hint": "מגבלת חיבורי עמיתים", "bt_limit_up": "מהירות העלאה מרבית", "bt_limit_down": "מהירות הורדה מרבית", "bt_port_word": "פורט", @@ -940,6 +953,13 @@ "reader_size_larger": "טקסט גדול יותר", "reader_auto": "השתמש תמיד בתצוגת קריאה", "reader_auto_hint": "פתח מאמרים בתצוגת קריאה", + "app_theme": "ערכת נושא", + "app_theme_hint": "«אוטומטי» עוקב אחר הגדרת הבהיר או הכהה של המכשיר שלך.", + "theme_auto": "אוטומטי", + "theme_dark": "כהה", + "theme_light": "בהיר", + "darken_articles": "החשכת מאמרים", + "darken_articles_hint": "מעמעם דפי מאמרים בהירים כדי להתאים למצב כהה. תצוגת הקורא שומרת על ערכות הנושא שלה.", "reader_exit": "צא מתצוגת קריאה", "reader_print": "הדפסה / שמירה כ-PDF", "reader_share": "שיתוף", @@ -948,10 +968,10 @@ "move_to": "העברה אל…", "move_new_category": "קטגוריה חדשה…", "move_new_category_prompt": "שם הקטגוריה החדשה", - "reorder_sections": "שינוי סדר המקטעים", - "reorder_hint": "קבעו את סדר מקטעי הקטגוריות והאוספים בדף הבית.", - "reorder_empty": "אין עדיין מקטעים לסידור מחדש.", - "reorder": "סידור מחדש", + "reorder_sections": "התאמת הקטגוריות", + "reorder_hint": "קבעו את סדר הקטגוריות והאוספים בדף הבית.", + "reorder_empty": "אין עדיין קטגוריות להתאמה.", + "reorder": "התאמה", "reorder_drag_hint": "גרור כדי לסדר מחדש", "move_up": "העברה למעלה", "move_down": "העברה למטה", @@ -994,6 +1014,20 @@ "users_role_user": "משתמש", "users_role_limited": "מוגבל", "users_primary_admin": "מנהל ראשי", + "users_allow_search": "חיפוש ZIM…", + "users_allow_all": "בחר הכול", + "users_allow_none": "כלום", + "users_allow_count": "{n} מתוך {total} נבחרו", + "users_pa_title": "גישה ציבורית", + "users_pa_sub": "מה שמבקרים רואים לפני התחברות.", + "users_pa_open": "פתוח", + "users_pa_open_desc": "כל אחד יכול לעיין בכל הספרייה.", + "users_pa_limited": "מוגבל ל-ZIM שנבחרו", + "users_pa_limited_desc": "מבקרים רואים רק את ה-ZIM שתבחר.", + "users_pa_private": "נדרשת התחברות", + "users_pa_private_desc": "מבקרים חייבים להתחבר כדי לראות משהו.", + "users_pa_env": "מוגדר על ידי משתנה סביבה:", + "users_pa_saved": "הגישה הציבורית עודכנה", "default_username_hint": "שם משתמש ברירת מחדל: {name}", "users_need_name_pw": "הזן שם וסיסמה.", "users_create_failed": "לא ניתן ליצור משתמש.", @@ -1003,6 +1037,9 @@ "define_loading": "מחפש…", "define_no_results": "לא נמצאה הגדרה", "define_open_full": "פתח ערך מלא ←", + "define_hint": "טיפ: בחר מילה כלשהי כדי לראות את הגדרתה", + "define_lookup": "חיפוש מילה", + "define_lookup_prompt": "הקש על מילה כלשהי", "library_health": "בדיקת תקינות הספרייה", "library_health_running": "בודק את הספרייה…", "library_health_failed": "בדיקת התקינות נכשלה", @@ -1054,5 +1091,83 @@ "users_scope_limited": "גישה מוגבלת", "library_view": "תצוגת ספרייה", "view_list": "תצוגת רשימה", - "view_tiles": "תצוגת אריחים" + "view_tiles": "תצוגת אריחים", + "downloads_section": "הורדות", + "dl_schedule_toggle": "להוריד רק בחלון לילי", + "dl_window_start": "התחלה", + "dl_window_end": "סיום", + "dl_window_hint": "הורדות שמתחילות מחוץ לחלון זה ממתינות עד שייפתח. חלון כמו 23:00–06:00 חוצה את חצות. הזמנים הם בזמן המקומי של השרת.", + "dl_window_env_locked": "נשלט על ידי משתנה הסביבה ZIMI_DL_WINDOW.", + "dl_in_window": "בתוך החלון", + "dl_waiting_window": "ממתין לחלון", + "dl_speed_limit": "מגבלת מהירות הורדה", + "dl_speed_unit": "KB/s", + "dl_speed_hint": "0 = ללא הגבלה. חל על כל ההעברות (HTTP ו-BitTorrent).", + "dl_speed_env_locked": "נשלט על ידי משתנה הסביבה ZIMI_BT.", + "dl_scheduled": "מתוזמן", + "dl_scheduled_tip": "ממתין לפתיחת חלון ההורדה הלילי.", + "dl_scheduled_starts": "מתחיל ב-{time}", + "dl_start_now": "התחל עכשיו", + "dl_start_now_tip": "התחל הורדה זו עכשיו במקום להמתין לחלון.", + "dl_pause_all": "השהה הכול", + "dl_resume_all": "המשך הכול", + "dl_delete_all": "מחק הכול", + "dl_delete_all_confirm": "למחוק את כל ההורדות? הורדות פעילות יבוטלו והרשימה תימחק.", + "show_all_n": "הצג הכול ({n})", + "bt_up_limit_label": "מגבלת העלאה", + "backup_section": "גיבוי", + "backup_intro": "ייצא את רשימת הספרייה, האוספים, הסימניות וההעדפות לקובץ אחד — ואז שחזר אותם במכשיר אחר או לאחר איפוס.", + "backup_export_all": "ייצא הכול", + "backup_import": "ייבוא…", + "backup_exported": "הגיבוי הורד", + "backup_imported": "הגיבוי שוחזר", + "backup_bad_file": "קובץ גיבוי Zimi לא תקין", + "backup_library_complete": "כל קובצי ה-ZIM שבגיבוי כבר מותקנים.", + "backup_missing_found": "{n} קובצי ZIM מהגיבוי אינם מותקנים כאן.", + "backup_missing_none": "הגיבוי מפרט קובצי ZIM שאינם מותקנים, אך אף אחד לא תואם לקטלוג.", + "backup_missing_unresolved": "לא ניתן היה למצוא {n} בקטלוג ויש להוסיף אותם ידנית.", + "backup_download_missing": "הורד {n} קובצי ZIM חסרים", + "backup_queued": "{n} בתור", + "backup_export_device": "גיבוי המכשיר הזה", + "backup_export_server": "גיבוי שרת מלא", + "backup_scope_device": "המכשיר הזה: רשימת הספרייה, האוספים, הסימניות וההעדפות שלך.", + "backup_scope_server": "שרת מלא (מנהל): כל האמור לעיל ובנוסף חשבונות משתמשים עם גיבובי סיסמאות, מדיניות גישה, תזמון והגדרות שיתוף — שמור על קובץ זה פרטי.", + "backup_overwrite": "החלפה במקום מיזוג (החלף הכול)", + "backup_apply": "החל", + "backup_cancel": "ביטול", + "backup_cancelled": "הייבוא בוטל — שום דבר לא השתנה.", + "backup_preview_title": "בדוק את השינויים האלה לפני החלה:", + "backup_pv_collections": "אוספים: {added} נוספו, {replaced} עודכנו", + "backup_pv_favorites": "מועדפים: {added} נוספו, {dupes} כפילויות דולגו", + "backup_pv_bookmarks": "סימניות: {added} מוזגו, {dupes} כפילויות דולגו", + "backup_pv_overrides": "פריסת הספרייה: {added} נוספו, {changed} שונו", + "backup_pv_users": "משתמשים: {added} נוספו, {replaced} עודכנו", + "backup_pv_settings": "{n} הגדרות שונו", + "backup_pv_missing": "{n} קובצי ZIM חסרים זמינים להורדה", + "dl_upload_restrict": "הגבל העלאות לחלון הזמן", + "dl_upload_trickle": "זרימה איטית מחוץ לחלון", + "dl_upload_trickle_hint": "הזריעה מוגבלת לקצב זה מחוץ לחלון.", + "dl_upload_throttled_now": "ההעלאות מוגבלות כעת — מחוץ לחלון.", + "add_section": "הוספת קטגוריה", + "add_section_prompt": "שם הקטגוריה החדשה", + "remove_section": "הסרת קטגוריה", + "section_exists": "הקטגוריה הזו כבר קיימת", + "reorder_moved_hint": "סדר הקטגוריות נמצא כעת בהגדרות הספרייה.", + "open_library_settings": "הגדרות הספרייה", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/i18n/hi.json b/zimi/static/i18n/hi.json index 21541b3a..8c44fe4a 100644 --- a/zimi/static/i18n/hi.json +++ b/zimi/static/i18n/hi.json @@ -23,6 +23,7 @@ "no_sources_matching": "'{query}' से मेल खाता कोई स्रोत नहीं", "all_sources": "← सभी स्रोत", "discover": "डिस्कवर", + "play_video": "वीडियो चलाएं", "discover_hidden": "डिस्कवर छुपा दिया गया", "undo": "वापस करें", "today": "आज", @@ -54,6 +55,9 @@ "show_more": "{n} और परिणाम दिखाएं", "found_results_in": "{time} सेकंड में {n} परिणाम मिले", "documents": "{n} दस्तावेज़", + "filter_documents": "दस्तावेज़ फ़िल्टर करें…", + "no_matching_documents": "कोई मिलान दस्तावेज़ नहीं", + "document_collection": "दस्तावेज़ संग्रह", "no_content": "इस स्रोत में कोई सामग्री नहीं है", "zim_corrupted": "ZIM फ़ाइल दूषित या खाली हो सकती है", "loading": "लोड हो रहा है…", @@ -399,6 +403,7 @@ "ms_server": "सर्वर", "ms_security": "सुरक्षा", "ms_display_section": "डिस्प्ले", + "ms_reader_section": "पढ़ना", "welcome_lang_title": "{lang} सामग्री खोज रहे हैं?", "welcome_lang_body": "Zimi पूरे विश्वकोश ऑफ़लाइन संग्रहीत करता है। {lang} विकिपीडिया और अधिक डाउनलोड करने के लिए कैटलॉग ब्राउज़ करें।", "welcome_lang_browse": "कैटलॉग ब्राउज़ करें", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "विश्वव्यापी छुट्टियाँ", "alm_holidays_follow_hint": "मानचित्र पर आपके स्थान का अनुसरण करता है", "alm_region_holiday": "{c} की छुट्टी", + "alm_showing_all_countries": "सभी देशों के अवकाश दिखा रहे हैं", + "alm_scope_worldwide": "दुनिया भर", + "alm_scope_regional": "क्षेत्रीय", + "alm_scope_toggle_hint": "अपने क्षेत्र और सभी देशों के बीच स्विच करें", "alm_hol_1st_white_night": "पहली श्वेत रात्रि", "alm_hol_aban_festival": "आबान उत्सव", "alm_hol_annunciation": "मंगलवार्ता", @@ -874,6 +883,10 @@ "seed_ratio_zero_inline": "0 = कोई सीडिंग नहीं", "bt_limit_label": "गति सीमा", "bt_limit_hint": "0 = असीमित", + "bt_max_dl_label": "एक साथ डाउनलोड", + "bt_max_dl_hint": "एक साथ चलते हैं; बाकी कतार में", + "bt_max_conn_label": "अधिकतम कनेक्शन", + "bt_max_conn_hint": "पीयर कनेक्शन सीमा", "bt_limit_up": "अधिकतम अपलोड गति", "bt_limit_down": "अधिकतम डाउनलोड गति", "bt_port_word": "पोर्ट", @@ -940,6 +953,13 @@ "reader_size_larger": "बड़ा टेक्स्ट", "reader_auto": "हमेशा रीडर व्यू का उपयोग करें", "reader_auto_hint": "लेख रीडर व्यू में खोलें", + "app_theme": "थीम", + "app_theme_hint": "ऑटो आपके डिवाइस की लाइट या डार्क सेटिंग का अनुसरण करता है।", + "theme_auto": "ऑटो", + "theme_dark": "डार्क", + "theme_light": "लाइट", + "darken_articles": "लेख गहरे करें", + "darken_articles_hint": "डार्क मोड से मेल खाने के लिए चमकीले लेख पृष्ठों को मंद करें। रीडर व्यू अपनी थीम रखता है।", "reader_exit": "रीडर व्यू से बाहर निकलें", "reader_print": "प्रिंट करें / PDF के रूप में सहेजें", "reader_share": "साझा करें", @@ -948,10 +968,10 @@ "move_to": "यहाँ ले जाएँ…", "move_new_category": "नई श्रेणी…", "move_new_category_prompt": "नई श्रेणी का नाम", - "reorder_sections": "अनुभागों का क्रम बदलें", - "reorder_hint": "होम पेज पर श्रेणी और संग्रह अनुभागों का क्रम तय करें।", - "reorder_empty": "क्रम बदलने के लिए अभी कोई अनुभाग नहीं।", - "reorder": "पुनः क्रमित करें", + "reorder_sections": "श्रेणियाँ अनुकूलित करें", + "reorder_hint": "होम पेज पर श्रेणियों और संग्रहों का क्रम तय करें।", + "reorder_empty": "अनुकूलित करने के लिए अभी कोई श्रेणी नहीं।", + "reorder": "अनुकूलित करें", "reorder_drag_hint": "पुनः क्रमित करने के लिए खींचें", "move_up": "ऊपर ले जाएँ", "move_down": "नीचे ले जाएँ", @@ -994,6 +1014,20 @@ "users_role_user": "उपयोगकर्ता", "users_role_limited": "सीमित", "users_primary_admin": "प्राथमिक एडमिन", + "users_allow_search": "ZIM खोजें…", + "users_allow_all": "सभी चुनें", + "users_allow_none": "कोई नहीं", + "users_allow_count": "{total} में से {n} चयनित", + "users_pa_title": "सार्वजनिक पहुँच", + "users_pa_sub": "साइन इन करने से पहले आगंतुक क्या देखते हैं।", + "users_pa_open": "खुला", + "users_pa_open_desc": "कोई भी पूरी लाइब्रेरी ब्राउज़ कर सकता है।", + "users_pa_limited": "चयनित ZIM तक सीमित", + "users_pa_limited_desc": "आगंतुक केवल वही ZIM देखते हैं जो आप चुनते हैं।", + "users_pa_private": "साइन इन आवश्यक", + "users_pa_private_desc": "कुछ भी देखने के लिए आगंतुकों को साइन इन करना होगा।", + "users_pa_env": "पर्यावरण चर द्वारा सेट:", + "users_pa_saved": "सार्वजनिक पहुँच अपडेट की गई", "default_username_hint": "डिफ़ॉल्ट उपयोगकर्ता नाम: {name}", "users_need_name_pw": "नाम और पासवर्ड दर्ज करें।", "users_create_failed": "उपयोगकर्ता नहीं बनाया जा सका।", @@ -1003,6 +1037,9 @@ "define_loading": "खोज रहे हैं…", "define_no_results": "कोई परिभाषा नहीं मिली", "define_open_full": "पूरी प्रविष्टि खोलें →", + "define_hint": "सुझाव: किसी भी शब्द का अर्थ देखने के लिए उसे चुनें", + "define_lookup": "शब्द खोजें", + "define_lookup_prompt": "किसी भी शब्द पर टैप करें", "library_health": "लाइब्रेरी अखंडता जांचें", "library_health_running": "लाइब्रेरी जाँच रहे हैं…", "library_health_failed": "स्वास्थ्य जाँच विफल", @@ -1054,5 +1091,83 @@ "users_scope_limited": "सीमित पहुँच", "library_view": "लाइब्रेरी दृश्य", "view_list": "सूची दृश्य", - "view_tiles": "टाइल दृश्य" + "view_tiles": "टाइल दृश्य", + "downloads_section": "डाउनलोड", + "dl_schedule_toggle": "केवल रात की एक विंडो के दौरान डाउनलोड करें", + "dl_window_start": "शुरू", + "dl_window_end": "अंत", + "dl_window_hint": "इस विंडो के बाहर शुरू किए गए डाउनलोड विंडो खुलने तक प्रतीक्षा करते हैं। 23:00–06:00 जैसी विंडो मध्यरात्रि पार करती है। समय सर्वर के स्थानीय समय में हैं।", + "dl_window_env_locked": "ZIMI_DL_WINDOW एनवायरनमेंट वेरिएबल द्वारा नियंत्रित।", + "dl_in_window": "अभी विंडो में", + "dl_waiting_window": "विंडो की प्रतीक्षा", + "dl_speed_limit": "डाउनलोड गति सीमा", + "dl_speed_unit": "KB/s", + "dl_speed_hint": "0 = असीमित। सभी ट्रांसफर पर लागू (HTTP और BitTorrent)।", + "dl_speed_env_locked": "ZIMI_BT एनवायरनमेंट वेरिएबल द्वारा नियंत्रित।", + "dl_scheduled": "निर्धारित", + "dl_scheduled_tip": "रात की डाउनलोड विंडो खुलने की प्रतीक्षा।", + "dl_scheduled_starts": "{time} पर शुरू", + "dl_start_now": "अभी शुरू करें", + "dl_start_now_tip": "विंडो की प्रतीक्षा किए बिना यह डाउनलोड अभी शुरू करें।", + "dl_pause_all": "सभी रोकें", + "dl_resume_all": "सभी फिर शुरू करें", + "dl_delete_all": "सभी हटाएँ", + "dl_delete_all_confirm": "सभी डाउनलोड हटाएँ? सक्रिय डाउनलोड रद्द कर दिए जाएँगे और सूची साफ़ हो जाएगी।", + "show_all_n": "सभी दिखाएँ ({n})", + "bt_up_limit_label": "अपलोड सीमा", + "backup_section": "बैकअप", + "backup_intro": "अपनी लाइब्रेरी सूची, संग्रह, बुकमार्क और प्राथमिकताएँ एक ही फ़ाइल में निर्यात करें — फिर उन्हें किसी अन्य मशीन पर या रीसेट के बाद पुनर्स्थापित करें।", + "backup_export_all": "सब निर्यात करें", + "backup_import": "आयात…", + "backup_exported": "बैकअप डाउनलोड हुआ", + "backup_imported": "बैकअप पुनर्स्थापित", + "backup_bad_file": "मान्य Zimi बैकअप फ़ाइल नहीं", + "backup_library_complete": "बैकअप के सभी ZIM पहले से इंस्टॉल हैं।", + "backup_missing_found": "बैकअप के {n} ZIM यहाँ इंस्टॉल नहीं हैं।", + "backup_missing_none": "बैकअप में इंस्टॉल न किए गए ZIM सूचीबद्ध हैं, पर कोई कैटलॉग से मेल नहीं खाता।", + "backup_missing_unresolved": "{n} कैटलॉग में नहीं मिले और मैन्युअल रूप से जोड़ने होंगे।", + "backup_download_missing": "{n} अनुपलब्ध ZIM डाउनलोड करें", + "backup_queued": "{n} कतार में", + "backup_export_device": "इस डिवाइस का बैकअप लें", + "backup_export_server": "पूर्ण सर्वर बैकअप", + "backup_scope_device": "यह डिवाइस: आपकी लाइब्रेरी सूची, संग्रह, बुकमार्क और प्राथमिकताएँ।", + "backup_scope_server": "पूर्ण सर्वर (एडमिन): उपरोक्त सब कुछ के साथ पासवर्ड हैश सहित उपयोगकर्ता खाते, एक्सेस नीति, शेड्यूल और साझाकरण सेटिंग्स — इस फ़ाइल को निजी रखें।", + "backup_overwrite": "मर्ज करने के बजाय अधिलेखित करें (सब बदलें)", + "backup_apply": "लागू करें", + "backup_cancel": "रद्द करें", + "backup_cancelled": "आयात रद्द — कुछ नहीं बदला।", + "backup_preview_title": "लागू करने से पहले इन बदलावों की समीक्षा करें:", + "backup_pv_collections": "संग्रह: {added} जोड़े, {replaced} अपडेट", + "backup_pv_favorites": "पसंदीदा: {added} जोड़े, {dupes} डुप्लिकेट छोड़े", + "backup_pv_bookmarks": "बुकमार्क: {added} मर्ज, {dupes} डुप्लिकेट छोड़े", + "backup_pv_overrides": "लाइब्रेरी लेआउट: {added} जोड़े, {changed} बदले", + "backup_pv_users": "उपयोगकर्ता: {added} जोड़े, {replaced} अपडेट", + "backup_pv_settings": "{n} सेटिंग्स बदलीं", + "backup_pv_missing": "{n} अनुपलब्ध ZIM डाउनलोड के लिए उपलब्ध", + "dl_upload_restrict": "अपलोड को विंडो तक सीमित करें", + "dl_upload_trickle": "विंडो के बाहर सीमित गति", + "dl_upload_trickle_hint": "विंडो के बाहर सीडिंग इस दर तक सीमित रहती है।", + "dl_upload_throttled_now": "अपलोड अभी सीमित हैं — विंडो के बाहर।", + "add_section": "श्रेणी जोड़ें", + "add_section_prompt": "नई श्रेणी का नाम", + "remove_section": "श्रेणी हटाएँ", + "section_exists": "वह श्रेणी पहले से मौजूद है", + "reorder_moved_hint": "श्रेणी क्रम अब लाइब्रेरी सेटिंग्स में है।", + "open_library_settings": "लाइब्रेरी सेटिंग्स", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/i18n/pt.json b/zimi/static/i18n/pt.json index 38ba4ba9..d9d87d4a 100644 --- a/zimi/static/i18n/pt.json +++ b/zimi/static/i18n/pt.json @@ -23,6 +23,7 @@ "no_sources_matching": "Nenhuma fonte correspondente a «{query}»", "all_sources": "← Todas as fontes", "discover": "Descobrir", + "play_video": "Reproduzir vídeo", "discover_hidden": "Descobrir oculto", "undo": "Desfazer", "today": "Hoje", @@ -54,6 +55,9 @@ "show_more": "Mostrar mais {n} resultados", "found_results_in": "{n} resultados encontrados em {time}s", "documents": "{n} documentos", + "filter_documents": "Filtrar documentos…", + "no_matching_documents": "Nenhum documento correspondente", + "document_collection": "Coleção de documentos", "no_content": "Esta fonte não tem conteúdo", "zim_corrupted": "O arquivo ZIM pode estar corrompido ou vazio", "loading": "Carregando…", @@ -399,6 +403,7 @@ "ms_server": "Servidor", "ms_security": "Segurança", "ms_display_section": "Exibição", + "ms_reader_section": "Leitura", "welcome_lang_title": "Procurando conteúdo em {lang}?", "welcome_lang_body": "Zimi armazena enciclopédias inteiras offline. Navegue pelo Catálogo para baixar a Wikipédia em {lang} e mais.", "welcome_lang_browse": "Navegar no Catálogo", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "Mostrando feriados mundiais", "alm_holidays_follow_hint": "Segue sua localização no mapa", "alm_region_holiday": "Feriado de {c}", + "alm_showing_all_countries": "Mostrando feriados de todos os países", + "alm_scope_worldwide": "Todo o mundo", + "alm_scope_regional": "Regional", + "alm_scope_toggle_hint": "Alternar entre a sua região e todos os países", "alm_hol_1st_white_night": "1ª Noite Branca", "alm_hol_aban_festival": "Festival de Aban", "alm_hol_annunciation": "Anunciação", @@ -874,6 +883,10 @@ "seed_ratio_zero_inline": "0 = sem seed", "bt_limit_label": "Limite de velocidade", "bt_limit_hint": "0 = sem limite", + "bt_max_dl_label": "Downloads simultâneos", + "bt_max_dl_hint": "Ao mesmo tempo; o resto na fila", + "bt_max_conn_label": "Conexões máximas", + "bt_max_conn_hint": "Limite de conexões de pares", "bt_limit_up": "Envio máximo", "bt_limit_down": "Descarga máxima", "bt_port_word": "Porta", @@ -940,6 +953,13 @@ "reader_size_larger": "Texto maior", "reader_auto": "Sempre usar Modo de leitura", "reader_auto_hint": "Abrir artigos no Modo de leitura", + "app_theme": "Tema", + "app_theme_hint": "Automático segue a definição clara ou escura do seu dispositivo.", + "theme_auto": "Auto", + "theme_dark": "Escuro", + "theme_light": "Claro", + "darken_articles": "Escurecer artigos", + "darken_articles_hint": "Escurece páginas de artigos claras para o modo escuro. A Vista de leitura mantém os seus próprios temas.", "reader_exit": "Sair do Modo de leitura", "reader_print": "Imprimir / Guardar como PDF", "reader_share": "Partilhar", @@ -948,10 +968,10 @@ "move_to": "Mover para…", "move_new_category": "Nova categoria…", "move_new_category_prompt": "Nome da nova categoria", - "reorder_sections": "Reordenar seções", - "reorder_hint": "Ordene as seções de categorias e coleções mostradas na página inicial.", - "reorder_empty": "Ainda não há seções para reordenar.", - "reorder": "Reordenar", + "reorder_sections": "Personalizar categorias", + "reorder_hint": "Ordene as categorias e coleções mostradas na página inicial.", + "reorder_empty": "Ainda não há categorias para personalizar.", + "reorder": "Personalizar", "reorder_drag_hint": "Arraste para reordenar", "move_up": "Mover para cima", "move_down": "Mover para baixo", @@ -994,6 +1014,20 @@ "users_role_user": "Usuário", "users_role_limited": "Limitado", "users_primary_admin": "Administrador principal", + "users_allow_search": "Pesquisar ZIMs…", + "users_allow_all": "Selecionar tudo", + "users_allow_none": "Nenhum", + "users_allow_count": "{n} de {total} selecionados", + "users_pa_title": "Acesso público", + "users_pa_sub": "O que os visitantes veem antes de entrar.", + "users_pa_open": "Aberto", + "users_pa_open_desc": "Qualquer pessoa pode navegar por toda a biblioteca.", + "users_pa_limited": "Limitado aos ZIMs selecionados", + "users_pa_limited_desc": "Os visitantes veem apenas os ZIMs que você escolher.", + "users_pa_private": "Login obrigatório", + "users_pa_private_desc": "Os visitantes precisam entrar para ver qualquer coisa.", + "users_pa_env": "Definido por variável de ambiente:", + "users_pa_saved": "Acesso público atualizado", "default_username_hint": "Nome de usuário padrão: {name}", "users_need_name_pw": "Introduza um nome e uma palavra-passe.", "users_create_failed": "Não foi possível criar o utilizador.", @@ -1003,6 +1037,9 @@ "define_loading": "Procurando…", "define_no_results": "Nenhuma definição encontrada", "define_open_full": "Abrir entrada completa →", + "define_hint": "Dica: selecione qualquer palavra para ver sua definição", + "define_lookup": "Procurar uma palavra", + "define_lookup_prompt": "Toque em qualquer palavra", "library_health": "Verificar integridade da biblioteca", "library_health_running": "Verificando a biblioteca…", "library_health_failed": "Falha na verificação", @@ -1054,5 +1091,83 @@ "users_scope_limited": "Acesso limitado", "library_view": "Vista da biblioteca", "view_list": "Vista de lista", - "view_tiles": "Vista de mosaico" + "view_tiles": "Vista de mosaico", + "downloads_section": "Transferências", + "dl_schedule_toggle": "Transferir apenas durante uma janela noturna", + "dl_window_start": "Início", + "dl_window_end": "Fim", + "dl_window_hint": "As transferências iniciadas fora desta janela aguardam até ela abrir. Uma janela como 23:00–06:00 atravessa a meia-noite. As horas são a hora local do servidor.", + "dl_window_env_locked": "Controlado pela variável de ambiente ZIMI_DL_WINDOW.", + "dl_in_window": "Dentro da janela", + "dl_waiting_window": "À espera da janela", + "dl_speed_limit": "Limite de velocidade de transferência", + "dl_speed_unit": "KB/s", + "dl_speed_hint": "0 = ilimitado. Aplica-se a todas as transferências (HTTP e BitTorrent).", + "dl_speed_env_locked": "Controlado pela variável de ambiente ZIMI_BT.", + "dl_scheduled": "Agendada", + "dl_scheduled_tip": "À espera de que a janela de transferência noturna abra.", + "dl_scheduled_starts": "começa às {time}", + "dl_start_now": "Começar agora", + "dl_start_now_tip": "Iniciar esta transferência agora em vez de esperar pela janela.", + "dl_pause_all": "Pausar tudo", + "dl_resume_all": "Retomar tudo", + "dl_delete_all": "Excluir tudo", + "dl_delete_all_confirm": "Excluir todos os downloads? Os downloads ativos serão cancelados e a lista será limpa.", + "show_all_n": "Mostrar tudo ({n})", + "bt_up_limit_label": "Limite de envio", + "backup_section": "Cópia de segurança", + "backup_intro": "Exporte a sua lista de biblioteca, coleções, marcadores e preferências para um único ficheiro e restaure-os noutra máquina ou após uma reposição.", + "backup_export_all": "Exportar tudo", + "backup_import": "Importar…", + "backup_exported": "Cópia transferida", + "backup_imported": "Cópia restaurada", + "backup_bad_file": "Ficheiro de cópia Zimi inválido", + "backup_library_complete": "Todos os ZIM da cópia já estão instalados.", + "backup_missing_found": "{n} ZIM da cópia não estão instalados aqui.", + "backup_missing_none": "A cópia lista ZIM não instalados, mas nenhum corresponde ao catálogo.", + "backup_missing_unresolved": "{n} não puderam ser encontrados no catálogo e devem ser adicionados manualmente.", + "backup_download_missing": "Transferir {n} ZIM em falta", + "backup_queued": "{n} em fila", + "backup_export_device": "Fazer backup deste dispositivo", + "backup_export_server": "Backup completo do servidor", + "backup_scope_device": "Este dispositivo: sua lista de biblioteca, coleções, favoritos e preferências.", + "backup_scope_server": "Servidor completo (admin): tudo acima mais as contas de usuário com hashes de senha, a política de acesso, o agendamento e as configurações de compartilhamento — mantenha este arquivo privado.", + "backup_overwrite": "Substituir em vez de mesclar (substituir tudo)", + "backup_apply": "Aplicar", + "backup_cancel": "Cancelar", + "backup_cancelled": "Importação cancelada — nada mudou.", + "backup_preview_title": "Revise estas alterações antes de aplicar:", + "backup_pv_collections": "Coleções: {added} adicionadas, {replaced} atualizadas", + "backup_pv_favorites": "Favoritos: {added} adicionados, {dupes} duplicados ignorados", + "backup_pv_bookmarks": "Marcadores: {added} mesclados, {dupes} duplicados ignorados", + "backup_pv_overrides": "Layout da biblioteca: {added} adicionados, {changed} alterados", + "backup_pv_users": "Usuários: {added} adicionados, {replaced} atualizados", + "backup_pv_settings": "{n} configurações alteradas", + "backup_pv_missing": "{n} ZIMs ausentes disponíveis para download", + "dl_upload_restrict": "Restringir envios à janela", + "dl_upload_trickle": "Fluxo reduzido fora da janela", + "dl_upload_trickle_hint": "O compartilhamento é limitado a esta taxa fora da janela.", + "dl_upload_throttled_now": "Os envios estão reduzidos agora — fora da janela.", + "add_section": "Adicionar categoria", + "add_section_prompt": "Nome da nova categoria", + "remove_section": "Remover categoria", + "section_exists": "Essa categoria já existe", + "reorder_moved_hint": "A ordem das categorias agora fica nas configurações da biblioteca.", + "open_library_settings": "Configurações da biblioteca", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/i18n/ru.json b/zimi/static/i18n/ru.json index c4e43fc5..2c741ee0 100644 --- a/zimi/static/i18n/ru.json +++ b/zimi/static/i18n/ru.json @@ -23,6 +23,7 @@ "no_sources_matching": "Нет источников по запросу «{query}»", "all_sources": "← Все источники", "discover": "Обзор", + "play_video": "Воспроизвести видео", "discover_hidden": "Обзор скрыт", "undo": "Отменить", "today": "Сегодня", @@ -54,6 +55,9 @@ "show_more": "Показать ещё {n}", "found_results_in": "Найдено {n} результатов за {time} с", "documents": "Документов: {n}", + "filter_documents": "Фильтр документов…", + "no_matching_documents": "Нет подходящих документов", + "document_collection": "Коллекция документов", "no_content": "Этот источник не содержит данных", "zim_corrupted": "Файл ZIM может быть повреждён или пуст", "loading": "Загрузка…", @@ -399,6 +403,7 @@ "ms_server": "Сервер", "ms_security": "Безопасность", "ms_display_section": "Отображение", + "ms_reader_section": "Чтение", "welcome_lang_title": "Ищете материалы на {lang}?", "welcome_lang_body": "Zimi хранит целые энциклопедии офлайн. Просмотрите Каталог, чтобы скачать Википедию на {lang} и другие источники.", "welcome_lang_browse": "Просмотр Каталога", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "Всемирные праздники", "alm_holidays_follow_hint": "Следует за вашим местоположением на карте", "alm_region_holiday": "Праздник ({c})", + "alm_showing_all_countries": "Показаны праздники всех стран", + "alm_scope_worldwide": "Весь мир", + "alm_scope_regional": "Регион", + "alm_scope_toggle_hint": "Переключение между вашим регионом и всеми странами", "alm_hol_1st_white_night": "1-я Белая ночь", "alm_hol_aban_festival": "Праздник Абана", "alm_hol_annunciation": "Благовещение", @@ -874,6 +883,10 @@ "seed_ratio_zero_inline": "0 = без раздачи", "bt_limit_label": "Ограничение скорости", "bt_limit_hint": "0 = без ограничений", + "bt_max_dl_label": "Одновременные загрузки", + "bt_max_dl_hint": "Сразу; остальные в очереди", + "bt_max_conn_label": "Макс. подключений", + "bt_max_conn_hint": "Лимит подключений к пирам", "bt_limit_up": "Макс. отдача", "bt_limit_down": "Макс. загрузка", "bt_port_word": "Порт", @@ -940,6 +953,13 @@ "reader_size_larger": "Крупнее", "reader_auto": "Всегда использовать режим чтения", "reader_auto_hint": "Открывать статьи в режиме чтения", + "app_theme": "Тема", + "app_theme_hint": "«Авто» следует светлой или тёмной настройке вашего устройства.", + "theme_auto": "Авто", + "theme_dark": "Тёмная", + "theme_light": "Светлая", + "darken_articles": "Затемнять статьи", + "darken_articles_hint": "Приглушает яркие страницы статей под тёмный режим. Режим чтения сохраняет свои темы.", "reader_exit": "Выйти из режима чтения", "reader_print": "Печать / Сохранить как PDF", "reader_share": "Поделиться", @@ -948,10 +968,10 @@ "move_to": "Переместить в…", "move_new_category": "Новая категория…", "move_new_category_prompt": "Название новой категории", - "reorder_sections": "Изменить порядок разделов", - "reorder_hint": "Задайте порядок разделов категорий и коллекций на главной странице.", - "reorder_empty": "Пока нет разделов для сортировки.", - "reorder": "Порядок", + "reorder_sections": "Настроить категории", + "reorder_hint": "Задайте порядок категорий и коллекций на главной странице.", + "reorder_empty": "Пока нет категорий для настройки.", + "reorder": "Настроить", "reorder_drag_hint": "Перетащите, чтобы изменить порядок", "move_up": "Вверх", "move_down": "Вниз", @@ -994,6 +1014,20 @@ "users_role_user": "Пользователь", "users_role_limited": "Ограниченный", "users_primary_admin": "Главный администратор", + "users_allow_search": "Поиск ZIM…", + "users_allow_all": "Выбрать все", + "users_allow_none": "Ничего", + "users_allow_count": "Выбрано {n} из {total}", + "users_pa_title": "Публичный доступ", + "users_pa_sub": "Что видят посетители до входа.", + "users_pa_open": "Открытый", + "users_pa_open_desc": "Любой может просматривать всю библиотеку.", + "users_pa_limited": "Только выбранные ZIM", + "users_pa_limited_desc": "Посетители видят только выбранные вами ZIM.", + "users_pa_private": "Требуется вход", + "users_pa_private_desc": "Чтобы что-то увидеть, посетители должны войти.", + "users_pa_env": "Задано переменной окружения:", + "users_pa_saved": "Публичный доступ обновлён", "default_username_hint": "Имя пользователя по умолчанию: {name}", "users_need_name_pw": "Введите имя и пароль.", "users_create_failed": "Не удалось создать пользователя.", @@ -1003,6 +1037,9 @@ "define_loading": "Поиск…", "define_no_results": "Определение не найдено", "define_open_full": "Открыть полную статью →", + "define_hint": "Совет: выделите любое слово, чтобы увидеть его определение", + "define_lookup": "Найти слово", + "define_lookup_prompt": "Коснитесь любого слова", "library_health": "Проверить целостность библиотеки", "library_health_running": "Проверка библиотеки…", "library_health_failed": "Ошибка проверки", @@ -1054,5 +1091,83 @@ "users_scope_limited": "Ограниченный доступ", "library_view": "Вид библиотеки", "view_list": "Списком", - "view_tiles": "Плиткой" + "view_tiles": "Плиткой", + "downloads_section": "Загрузки", + "dl_schedule_toggle": "Загружать только в ночном интервале", + "dl_window_start": "Начало", + "dl_window_end": "Конец", + "dl_window_hint": "Загрузки, начатые вне этого интервала, ждут его открытия. Интервал вроде 23:00–06:00 проходит через полночь. Время указано по местному времени сервера.", + "dl_window_env_locked": "Управляется переменной окружения ZIMI_DL_WINDOW.", + "dl_in_window": "В интервале", + "dl_waiting_window": "Ожидание интервала", + "dl_speed_limit": "Ограничение скорости загрузки", + "dl_speed_unit": "КБ/с", + "dl_speed_hint": "0 = без ограничения. Применяется ко всем передачам (HTTP и BitTorrent).", + "dl_speed_env_locked": "Управляется переменной окружения ZIMI_BT.", + "dl_scheduled": "Запланировано", + "dl_scheduled_tip": "Ожидание открытия ночного интервала загрузки.", + "dl_scheduled_starts": "начнётся в {time}", + "dl_start_now": "Начать сейчас", + "dl_start_now_tip": "Начать эту загрузку сейчас, не дожидаясь интервала.", + "dl_pause_all": "Приостановить все", + "dl_resume_all": "Возобновить все", + "dl_delete_all": "Удалить все", + "dl_delete_all_confirm": "Удалить все загрузки? Активные загрузки будут отменены, а список очищен.", + "show_all_n": "Показать все ({n})", + "bt_up_limit_label": "Ограничение отдачи", + "backup_section": "Резервная копия", + "backup_intro": "Экспортируйте список библиотеки, коллекции, закладки и настройки в один файл, затем восстановите их на другом устройстве или после сброса.", + "backup_export_all": "Экспортировать всё", + "backup_import": "Импорт…", + "backup_exported": "Копия загружена", + "backup_imported": "Копия восстановлена", + "backup_bad_file": "Недопустимый файл резервной копии Zimi", + "backup_library_complete": "Все ZIM из копии уже установлены.", + "backup_missing_found": "{n} ZIM из копии здесь не установлены.", + "backup_missing_none": "В копии есть неустановленные ZIM, но ни один не найден в каталоге.", + "backup_missing_unresolved": "{n} не удалось найти в каталоге, их нужно добавить вручную.", + "backup_download_missing": "Загрузить {n} недостающих ZIM", + "backup_queued": "{n} в очереди", + "backup_export_device": "Резервная копия этого устройства", + "backup_export_server": "Полная копия сервера", + "backup_scope_device": "Это устройство: список библиотеки, коллекции, закладки и настройки.", + "backup_scope_server": "Весь сервер (админ): всё вышеперечисленное, а также учётные записи с хешами паролей, политика доступа, расписание и настройки раздачи — храните этот файл в секрете.", + "backup_overwrite": "Перезаписать вместо объединения (заменить всё)", + "backup_apply": "Применить", + "backup_cancel": "Отмена", + "backup_cancelled": "Импорт отменён — ничего не изменилось.", + "backup_preview_title": "Проверьте эти изменения перед применением:", + "backup_pv_collections": "Коллекции: {added} добавлено, {replaced} обновлено", + "backup_pv_favorites": "Избранное: {added} добавлено, {dupes} дубликатов пропущено", + "backup_pv_bookmarks": "Закладки: {added} объединено, {dupes} дубликатов пропущено", + "backup_pv_overrides": "Оформление библиотеки: {added} добавлено, {changed} изменено", + "backup_pv_users": "Пользователи: {added} добавлено, {replaced} обновлено", + "backup_pv_settings": "Изменено настроек: {n}", + "backup_pv_missing": "{n} отсутствующих ZIM доступно для загрузки", + "dl_upload_restrict": "Ограничить отдачу окном", + "dl_upload_trickle": "Ограничение вне окна", + "dl_upload_trickle_hint": "Вне окна раздача ограничивается этой скоростью.", + "dl_upload_throttled_now": "Отдача сейчас ограничена — вне окна.", + "add_section": "Добавить категорию", + "add_section_prompt": "Название новой категории", + "remove_section": "Удалить категорию", + "section_exists": "Такая категория уже существует", + "reorder_moved_hint": "Порядок категорий теперь находится в настройках библиотеки.", + "open_library_settings": "Настройки библиотеки", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/i18n/zh.json b/zimi/static/i18n/zh.json index bd589e0e..9bd8216c 100644 --- a/zimi/static/i18n/zh.json +++ b/zimi/static/i18n/zh.json @@ -23,6 +23,7 @@ "no_sources_matching": "没有匹配“{query}”的来源", "all_sources": "← 所有来源", "discover": "发现", + "play_video": "播放视频", "discover_hidden": "发现已隐藏", "undo": "撤销", "today": "今天", @@ -54,6 +55,9 @@ "show_more": "再显示 {n} 条结果", "found_results_in": "找到 {n} 条结果，用时 {time} 秒", "documents": "{n} 份文档", + "filter_documents": "筛选文档…", + "no_matching_documents": "没有匹配的文档", + "document_collection": "文档合集", "no_content": "此来源没有内容", "zim_corrupted": "ZIM 文件可能已损坏或为空", "loading": "加载中…", @@ -399,6 +403,7 @@ "ms_server": "服务器", "ms_security": "安全", "ms_display_section": "显示", + "ms_reader_section": "阅读", "welcome_lang_title": "在寻找{lang}内容？", "welcome_lang_body": "Zimi 可离线存储整部百科全书。浏览目录下载{lang}维基百科等来源。", "welcome_lang_browse": "浏览目录", @@ -573,6 +578,10 @@ "alm_showing_worldwide": "显示全球节假日", "alm_holidays_follow_hint": "跟随您在地图上的位置", "alm_region_holiday": "{c}节假日", + "alm_showing_all_countries": "显示所有国家的节日", + "alm_scope_worldwide": "全球", + "alm_scope_regional": "地区", + "alm_scope_toggle_hint": "在你的地区和所有国家之间切换", "alm_hol_1st_white_night": "第一个白夜", "alm_hol_aban_festival": "阿班节", "alm_hol_annunciation": "圣母领报节", @@ -874,6 +883,10 @@ "seed_ratio_zero_inline": "0 表示不做种", "bt_limit_label": "速度限制", "bt_limit_hint": "0 = 无限制", + "bt_max_dl_label": "并发下载数", + "bt_max_dl_hint": "同时进行，其余排队", + "bt_max_conn_label": "最大连接数", + "bt_max_conn_hint": "对等连接上限", "bt_limit_up": "最大上传速度", "bt_limit_down": "最大下载速度", "bt_port_word": "端口", @@ -940,6 +953,13 @@ "reader_size_larger": "放大文字", "reader_auto": "始终使用阅读视图", "reader_auto_hint": "在阅读视图中打开文章", + "app_theme": "主题", + "app_theme_hint": "“自动”跟随设备的浅色或深色设置。", + "theme_auto": "自动", + "theme_dark": "深色", + "theme_light": "浅色", + "darken_articles": "调暗文章", + "darken_articles_hint": "将明亮的文章页面调暗以匹配深色模式。阅读视图保留其自身主题。", "reader_exit": "退出阅读视图", "reader_print": "打印 / 另存为 PDF", "reader_share": "分享", @@ -948,10 +968,10 @@ "move_to": "移动到…", "move_new_category": "新建分类…", "move_new_category_prompt": "新分类名称", - "reorder_sections": "重新排序板块", - "reorder_hint": "调整首页上分类和合集板块的顺序。", - "reorder_empty": "暂无可排序的板块。", - "reorder": "重新排序", + "reorder_sections": "自定义分类", + "reorder_hint": "调整首页上分类和合集的顺序。", + "reorder_empty": "暂无可自定义的分类。", + "reorder": "自定义", "reorder_drag_hint": "拖动以重新排序", "move_up": "上移", "move_down": "下移", @@ -994,6 +1014,20 @@ "users_role_user": "用户", "users_role_limited": "受限", "users_primary_admin": "主管理员", + "users_allow_search": "搜索 ZIM…", + "users_allow_all": "全选", + "users_allow_none": "全不选", + "users_allow_count": "已选择 {n} / {total}", + "users_pa_title": "公开访问", + "users_pa_sub": "访客登录前所能看到的内容。", + "users_pa_open": "开放", + "users_pa_open_desc": "任何人都可以浏览整个库。", + "users_pa_limited": "仅限所选 ZIM", + "users_pa_limited_desc": "访客只能看到你选择的 ZIM。", + "users_pa_private": "需要登录", + "users_pa_private_desc": "访客必须登录才能查看内容。", + "users_pa_env": "由环境变量设置：", + "users_pa_saved": "公开访问已更新", "default_username_hint": "默认用户名：{name}", "users_need_name_pw": "请输入名称和密码。", "users_create_failed": "无法创建用户。", @@ -1003,6 +1037,9 @@ "define_loading": "查询中…", "define_no_results": "未找到释义", "define_open_full": "打开完整词条 →", + "define_hint": "提示：选择任意单词即可查看释义", + "define_lookup": "查词", + "define_lookup_prompt": "点按任意单词", "library_health": "检查库完整性", "library_health_running": "正在检查库…", "library_health_failed": "健康检查失败", @@ -1054,5 +1091,83 @@ "users_scope_limited": "受限访问", "library_view": "库视图", "view_list": "列表视图", - "view_tiles": "平铺视图" + "view_tiles": "平铺视图", + "downloads_section": "下载", + "dl_schedule_toggle": "仅在每晚的时间窗口内下载", + "dl_window_start": "开始", + "dl_window_end": "结束", + "dl_window_hint": "在此窗口之外启动的下载会等到窗口开启。像 23:00–06:00 这样的窗口会跨越午夜。时间为服务器本地时间。", + "dl_window_env_locked": "由环境变量 ZIMI_DL_WINDOW 控制。", + "dl_in_window": "当前在窗口内", + "dl_waiting_window": "等待窗口开启", + "dl_speed_limit": "下载速度限制", + "dl_speed_unit": "KB/s", + "dl_speed_hint": "0 = 不限速。适用于所有传输（HTTP 和 BitTorrent）。", + "dl_speed_env_locked": "由环境变量 ZIMI_BT 控制。", + "dl_scheduled": "已排程", + "dl_scheduled_tip": "等待每晚的下载窗口开启。", + "dl_scheduled_starts": "{time} 开始", + "dl_start_now": "立即开始", + "dl_start_now_tip": "立即开始此下载，而不必等待窗口。", + "dl_pause_all": "全部暂停", + "dl_resume_all": "全部继续", + "dl_delete_all": "全部删除", + "dl_delete_all_confirm": "删除所有下载？正在进行的下载将被取消，列表将被清空。", + "show_all_n": "显示全部 ({n})", + "bt_up_limit_label": "上传限制", + "backup_section": "备份", + "backup_intro": "将你的库列表、合集、书签和偏好导出为单个文件，然后在另一台机器上或重置后恢复。", + "backup_export_all": "全部导出", + "backup_import": "导入…", + "backup_exported": "备份已下载", + "backup_imported": "备份已恢复", + "backup_bad_file": "不是有效的 Zimi 备份文件", + "backup_library_complete": "备份中的所有 ZIM 均已安装。", + "backup_missing_found": "备份中的 {n} 个 ZIM 未在此安装。", + "backup_missing_none": "备份中列出了未安装的 ZIM，但没有一个能在目录中匹配。", + "backup_missing_unresolved": "{n} 个无法在目录中匹配，需手动添加。", + "backup_download_missing": "下载 {n} 个缺失的 ZIM", + "backup_queued": "{n} 个已加入队列", + "backup_export_device": "备份此设备", + "backup_export_server": "完整服务器备份", + "backup_scope_device": "此设备：你的库列表、合集、书签和偏好设置。", + "backup_scope_server": "完整服务器（管理员）：以上全部，外加含密码哈希的用户账户、访问策略、计划和分享设置——请妥善保管此文件。", + "backup_overwrite": "覆盖而非合并（全部替换）", + "backup_apply": "应用", + "backup_cancel": "取消", + "backup_cancelled": "已取消导入——未做任何更改。", + "backup_preview_title": "应用前请查看这些更改：", + "backup_pv_collections": "合集：新增 {added} 个，更新 {replaced} 个", + "backup_pv_favorites": "收藏：新增 {added} 个，跳过 {dupes} 个重复", + "backup_pv_bookmarks": "书签：合并 {added} 个，跳过 {dupes} 个重复", + "backup_pv_overrides": "库布局：新增 {added} 项，更改 {changed} 项", + "backup_pv_users": "用户：新增 {added} 个，更新 {replaced} 个", + "backup_pv_settings": "更改了 {n} 项设置", + "backup_pv_missing": "有 {n} 个缺失的 ZIM 可供下载", + "dl_upload_restrict": "仅在时间窗内上传", + "dl_upload_trickle": "窗外限速", + "dl_upload_trickle_hint": "在时间窗之外，做种被限制为此速率。", + "dl_upload_throttled_now": "上传正在限速中——当前不在时间窗内。", + "add_section": "添加分类", + "add_section_prompt": "新分类名称", + "remove_section": "移除分类", + "section_exists": "该分类已存在", + "reorder_moved_hint": "分类顺序现在位于图库设置中。", + "open_library_settings": "图库设置", + "backup_mydata_title": "My data", + "backup_mydata_intro": "Your bookmarks, reading history, and preferences. They live in this browser — export a copy to a file, or sync them to your account.", + "backup_server_title": "Server backup", + "backup_server_intro": "The whole server: library list, collections, home layout, user accounts (with password hashes), access policy, schedule, sharing, seed intents, hot list, auto-update, event history, and every user's saved data. Keep this file private.", + "backup_export_file": "Export to file", + "backup_import_file": "Import from file", + "backup_save_server": "Save to server", + "backup_restore_server": "Restore from server", + "backup_mydata_exported": "My data downloaded", + "backup_mydata_imported": "My data restored", + "backup_saved_server": "Saved to your account", + "backup_restored_server": "Restored from your account", + "backup_wrong_card_server": "That's a full server backup — import it in the Server backup card.", + "backup_wrong_card_mydata": "That's a My data backup — import it in the My data card.", + "backup_pv_history": "Event history: {n} events", + "backup_pv_userdata": "Saved user data: {n} users" } diff --git a/zimi/static/sw.js b/zimi/static/sw.js index a97274f5..417591bd 100644 --- a/zimi/static/sw.js +++ b/zimi/static/sw.js @@ -67,50 +67,82 @@ async function checkVersion() { } } -// Fetch strategy router -self.addEventListener('fetch', event => { - const url = new URL(event.request.url); - const path = url.pathname; +// Identity + auth-scoped data endpoints. Their responses vary by the +// authenticated identity (anonymous vs named user vs admin) AND by the +// public-access mode, so the service worker MUST NEVER cache or serve them +// stale. Caching them leaks one identity's view to another: +// - a stale /whoami re-shows the login gate to a just-signed-in user (they +// "sign in twice"), or hides it from someone who logged out; +// - a cached full-library /list (or /search) served on a network blip shows +// the whole library to a now-anonymous visitor of a private instance. +// These fail CLOSED: on network failure they return the offline page rather +// than a wrong-identity cached response. Kept as a single source of truth so +// the classification is testable (see tests/test_sw_route_classification.mjs). +const NETWORK_ONLY_PREFIXES = ['/whoami', '/login', '/logout', '/list', '/search', '/suggest', '/random']; - // API calls: network-first - if (path.startsWith('/search') || path.startsWith('/read') || - path.startsWith('/list') || path.startsWith('/suggest') || - path.startsWith('/random') || path.startsWith('/health') || - path.startsWith('/manage') || path.startsWith('/article-languages') || - path.startsWith('/languages')) { - event.respondWith(networkFirst(event.request)); - return; +// Non-identity API/data (article reads, health, manage, language lists). These +// do not expose the library index and tolerate a cached fallback when offline. +const NETWORK_FIRST_PREFIXES = ['/read', '/health', '/manage', '/article-languages', '/languages']; + +function _hasPrefix(path, prefixes) { + for (let i = 0; i < prefixes.length; i++) { + if (path === prefixes[i] || path.startsWith(prefixes[i] + '/') || + path.startsWith(prefixes[i] + '?')) return true; } + return false; +} - // ZIM content: top-level navigation (reload/bookmark) needs the SPA shell - // so the client-side router handles the deep link. Fetch from network; if - // offline, fall back to the cached root '/' (same SPA shell). - // Sub-resource requests (iframe, images, CSS) use cache-first for speed. +// The single source of truth for which cache strategy a request uses. Pure +// function of the pathname + request mode so it can be asserted directly. +function routeStrategy(path, requestMode) { + if (_hasPrefix(path, NETWORK_ONLY_PREFIXES)) return 'networkOnly'; + if (_hasPrefix(path, NETWORK_FIRST_PREFIXES)) return 'networkFirst'; + // ZIM content: top-level navigation (reload/bookmark) needs the SPA shell so + // the client-side router handles the deep link; sub-resources cache-first. if (path.startsWith('/w/')) { - if (event.request.mode === 'navigate') { + return requestMode === 'navigate' ? 'navigateShell' : 'cacheFirst'; + } + if (path.startsWith('/static/')) return 'staleWhileRevalidate'; + // Root page: network-first (always serve latest after deploy). + if (path === '/' || requestMode === 'navigate') return 'networkFirst'; + return 'staleWhileRevalidate'; +} +self.routeStrategy = routeStrategy; // test hook + +// Fetch strategy router +self.addEventListener('fetch', event => { + const url = new URL(event.request.url); + switch (routeStrategy(url.pathname, event.request.mode)) { + case 'networkOnly': + event.respondWith(networkOnly(event.request)); + return; + case 'networkFirst': + event.respondWith(networkFirst(event.request)); + return; + case 'navigateShell': + // Fetch from network; if offline, fall back to the cached SPA shell '/'. event.respondWith( fetch(event.request).catch(() => caches.match('/').then(r => r || offlineResponse())) ); - } else { + return; + case 'cacheFirst': event.respondWith(cacheFirst(event.request)); - } - return; - } - - // Static assets: stale-while-revalidate - if (path.startsWith('/static/')) { - event.respondWith(staleWhileRevalidate(event.request)); - return; + return; + default: + event.respondWith(staleWhileRevalidate(event.request)); } +}); - // Root page: network-first (always serve latest after deploy) - // Favicons/other assets: stale-while-revalidate - if (path === '/' || event.request.mode === 'navigate') { - event.respondWith(networkFirst(event.request)); - } else { - event.respondWith(staleWhileRevalidate(event.request)); +// Network-only: never read or write the cache. Identity/auth-scoped endpoints +// use this so a stale response can never stand in for the live, correctly +// authorized one. Offline → the offline page, never a wrong-identity cache hit. +async function networkOnly(request) { + try { + return await fetch(request); + } catch (e) { + return offlineResponse(); } -}); +} // Network-first: try network, fall back to cache, then offline page async function networkFirst(request) { diff --git a/zimi/templates/index.html b/zimi/templates/index.html index 935b64d1..6f46885a 100644 --- a/zimi/templates/index.html +++ b/zimi/templates/index.html @@ -3,6 +3,12 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> +<!-- Declare both schemes so the UA knows the page is theme-aware; the boot + below pins the *resolved* scheme via documentElement.style.colorScheme, + which is what Safari paints the tab backdrop / scrollbars from. Without it, + a light-app user on a dark-mode OS gets a dark compositor flash when + switching back to the tab. --> +<meta name="color-scheme" content="light dark"> <title>Zimi @@ -13,6 +19,50 @@ + + @@ -86,7 +136,7 @@Enter password
- +diff --git a/zimi/users.py b/zimi/users.py index addd7e05..43cdf95a 100644 --- a/zimi/users.py +++ b/zimi/users.py @@ -67,6 +67,17 @@ _SESSION_TOKEN_BYTES = 32 # secrets.token_urlsafe(32) → ~43 url-safe chars +#: sessions.json stores USER sessions keyed by casefold username. The PRIMARY +#: admin is the password account, not a users.json record, so its session rides +#: under a sentinel key that no real username can produce (names are +#: ``[\w .\-]{1,32}`` — a NUL byte is unrepresentable). This lets the admin reuse +#: the exact session machinery named users use (random token, hashed at rest, TTL +#: expiry, logout drop) so header-less transports — the /w/ reader iframe and the +#: plain-fetch data endpoints — can carry admin identity via the zimi_session +#: cookie. Recognised by ``manage._primary_admin_authorized``; never resolves as a +#: named user (see ``resolve_session``). +_ADMIN_SESSION_USER = "\x00admin" + #: Server-side session lifetime. The cookie carries a matching Max-Age, but that #: is a hint the holder controls — this is the half that actually expires a #: stolen token, and it bounds sessions.json instead of letting it grow one @@ -316,6 +327,7 @@ def delete_user(name): del users[_key(name)] _save_users(users) _drop_user_sessions_locked(_key(name)) + delete_user_data(name) # their server-side bookmarks/history go with them log.info("User deleted: %s", name) return True, None @@ -384,6 +396,287 @@ def is_admin_user(name): return bool(rec) and _effective_role(rec) == "admin" +# ============================================================================ +# Per-user data — bookmarks / history / preferences stored SERVER-SIDE per user +# ============================================================================ +# +# The tasteful bridge to the 1.9 full users-v2 migration: when a NAMED user is +# signed in, their "My data" (the browser-half a device otherwise keeps only in +# localStorage) round-trips through the server so it follows them across devices. +# One opaque JSON doc per user under ZIMI_DATA_DIR/userdata/.json, +# atomic writes, deleted with the account. Anonymous / admin-without-a-named-user +# never reach here — their bookmarks stay in the browser (see http.py's gate). + +_USERDATA_VERSION = 1 +#: Hard ceiling per blob so one account can't fill the disk (server-side twin of +#: the client cap). Comfortably above a heavy bookmarks+history set. +_USERDATA_MAX_BYTES = 4 * 1024 * 1024 + + +def _userdata_dir(): + return os.path.join(_srv.ZIMI_DATA_DIR, "userdata") + + +def _safe_userdata_key(name): + """Casefold key for a user's data file, or None if it can't be a safe + filename. Names are validated on creation, but this is the last gate before + a path join, so it stays strict: no separators, no dot-only names.""" + key = _key(name) + if ( + not key + or key in (".", "..") + or os.sep in key + or (os.altsep and os.altsep in key) + ): + return None + return key + + +def _userdata_path(name): + return os.path.join(_userdata_dir(), _safe_userdata_key(name) + ".json") + + +def _empty_user_data(): + return { + "version": _USERDATA_VERSION, + "bookmarks": [], + "history": [], + "preferences": {}, + } + + +def load_user_data(name): + """Return a user's stored data blob, or a fresh-empty one when none exists. + Caller has already authorized the requester for ``name``.""" + if _safe_userdata_key(name) is None: + return _empty_user_data() + try: + import json + + with open(_userdata_path(name), encoding="utf-8") as f: + data = json.load(f) + if isinstance(data, dict): + return data + except (FileNotFoundError, ValueError, OSError): + pass + return _empty_user_data() + + +def save_user_data(name, blob): + """Persist a user's data blob (bookmarks/history/preferences). Returns + (ok, error). Caller has already authorized the requester for ``name``.""" + import json + + if _safe_userdata_key(name) is None: + return False, "invalid user" + if not isinstance(blob, dict): + return False, "invalid data" + bookmarks = blob.get("bookmarks") + history = blob.get("history") + prefs = blob.get("preferences") + doc = { + "version": _USERDATA_VERSION, + "bookmarks": bookmarks if isinstance(bookmarks, list) else [], + "history": history if isinstance(history, list) else [], + "preferences": prefs if isinstance(prefs, dict) else {}, + "updated": int(time.time()), + } + if len(json.dumps(doc)) > _USERDATA_MAX_BYTES: + return False, "data too large" + with _lock: + os.makedirs(_userdata_dir(), exist_ok=True) + _srv._atomic_write_json(_userdata_path(name), doc, indent=2) + return True, None + + +def delete_user_data(name): + """Remove a user's stored data file (best-effort; a missing file is fine).""" + if _safe_userdata_key(name) is None: + return + try: + os.remove(_userdata_path(name)) + except FileNotFoundError: + pass + except OSError as e: + log.warning("Could not delete user data for %s: %s", name, e) + + +def all_user_data(): + """Every per-user blob, keyed by casefold name — for the full-server backup. + Keys are the on-disk filenames (already casefold), so restore round-trips.""" + import json + + out = {} + d = _userdata_dir() + if not os.path.isdir(d): + return out + try: + names = os.listdir(d) + except OSError: + return out + for fn in names: + if not fn.endswith(".json"): + continue + try: + with open(os.path.join(d, fn), encoding="utf-8") as f: + data = json.load(f) + if isinstance(data, dict): + out[fn[: -len(".json")]] = data + except (ValueError, OSError): + pass + return out + + +def restore_user_data(blobs, overwrite=False): + """Restore per-user blobs from a full-server backup. ``blobs`` is keyed by + casefold name (as ``all_user_data`` emits). ``overwrite`` clears every + existing blob first; otherwise incoming wins per user, others untouched. + Returns the number of user blobs written.""" + if not isinstance(blobs, dict): + return 0 + if overwrite: + for key in list(all_user_data().keys()): + delete_user_data(key) + written = 0 + for key, blob in blobs.items(): + ok, _ = save_user_data(key, blob) # key is already casefold; _key is idempotent + if ok: + written += 1 + return written + + +# ============================================================================ +# Public-access policy — what an ANONYMOUS (not logged-in) visitor may see +# ============================================================================ +# +# Three modes, stored in ``access.json`` under ZIMI_DATA_DIR (kept out of +# users.json so the user schema stays stable and the policy can be swapped +# atomically on its own): +# +# {"version": 1, "mode": "open"|"limited"|"private", "allowlist": [...]} +# +# - ``open`` — default, legacy behaviour: anonymous sees the whole library +# (``request_allow`` → None, the all-access sentinel). +# - ``limited`` — anonymous is filtered to ``allowlist`` using the EXACT same +# choke points as a limited USER (``current_allow`` thread-local +# → get_zim_files/list_zims/zim_allowed/search-cache key). No new +# filtering path, so no new leak surface. +# - ``private`` — anonymous gets nothing but the login screen; every read +# endpoint requires a session (enforced by the request gate in +# http.py). ``request_allow`` returns an EMPTY set as defence in +# depth so a gate bypass still yields an empty library. +# +# Env override ``ZIMI_PUBLIC_ACCESS`` (open|limited|private) wins over the file +# for docker/compose deployments. When it selects ``limited`` the allowlist +# still comes from access.json (env can't carry a list); an unconfigured +# allowlist there → empty set → anonymous sees nothing, which is safe. +# +# FAIL CLOSED: a file that is PRESENT but corrupt/unreadable, with no env +# override, resolves to ``private`` — never silently back to ``open`` (that +# would dump the whole library to the internet on a hand-edited or truncated +# config). A MISSING file is the legacy default → ``open`` (installs that never +# configured a policy must not suddenly lock out). + +_ACCESS_VERSION = 1 +_ACCESS_MODES = ("open", "limited", "private") +_DEFAULT_ACCESS_MODE = "open" + + +def _access_path(): + return os.path.join(_srv.ZIMI_DATA_DIR, "access.json") + + +def _env_access_mode(): + """The ZIMI_PUBLIC_ACCESS override, or None if unset/invalid.""" + raw = (os.environ.get("ZIMI_PUBLIC_ACCESS") or "").strip().lower() + return raw if raw in _ACCESS_MODES else None + + +def _load_access(): + """Return ``(mode, allowlist, ok)``. + + ``ok`` is False ONLY when the file exists but could not be read/parsed as a + valid policy — the fail-closed signal. A missing file is the legacy default + (``open``, ok=True), NOT an error. + """ + path = _access_path() + if not os.path.exists(path): + return _DEFAULT_ACCESS_MODE, [], True + try: + import json + + with open(path, encoding="utf-8") as f: + data = json.load(f) + if not isinstance(data, dict): + return _DEFAULT_ACCESS_MODE, [], False + mode = data.get("mode") + if mode not in _ACCESS_MODES: + return _DEFAULT_ACCESS_MODE, [], False + raw = data.get("allowlist") + allow = [a for a in raw if isinstance(a, str)] if isinstance(raw, list) else [] + return mode, allow, True + except (ValueError, OSError): + return _DEFAULT_ACCESS_MODE, [], False + + +def get_public_access(): + """The effective anonymous policy as ``(mode, allowlist)``. + + Env override wins over the file. With no override, an unreadable-but-present + config fails closed to ``private``. See the section header for the full + contract. + """ + mode, allow, ok = _load_access() + env = _env_access_mode() + if env is not None: + mode = env + elif not ok: + mode = "private" # fail closed + return mode, allow + + +def set_public_access(mode, allowlist=None): + """Persist the anonymous-access policy. Returns (ok, error). + + ``limited`` stores the cleaned allowlist; ``open``/``private`` ignore it + (stored empty). The env override, if set, still wins at read time — callers + should surface that to the admin, but we still persist so a later env + removal restores intent. + """ + if mode not in _ACCESS_MODES: + return False, "invalid mode" + allow, err = _clean_allowlist(allowlist if allowlist is not None else []) + if err: + return False, err + stored = allow if mode == "limited" else [] + with _lock: + _srv._atomic_write_json( + _access_path(), + {"version": _ACCESS_VERSION, "mode": mode, "allowlist": stored}, + indent=2, + ) + log.info("Public access set: mode=%s (allowlist=%d)", mode, len(stored)) + return True, None + + +def public_access_status(): + """Admin-facing view of the policy: the effective mode/allowlist plus + whether the env override is forcing it (so the UI can show a read-only + banner). The stored file mode is surfaced separately from the effective + mode so the admin sees what they saved even when env overrides it.""" + file_mode, file_allow, _ = _load_access() + env = _env_access_mode() + eff_mode, eff_allow = get_public_access() + return { + "mode": eff_mode, + "allowlist": eff_allow, + "stored_mode": file_mode, + "stored_allowlist": file_allow, + "env_controlled": env is not None, + "env_mode": env, + } + + # ============================================================================ # Authentication + sessions # ============================================================================ @@ -430,9 +723,9 @@ def _session_expired(ent, now=None): return (now if now is not None else int(time.time())) - created > SESSION_TTL_S -def create_session(name): - """Mint a random session token for a user, persist it (hashed), return the - plaintext token (shown once, delivered via cookie + login response).""" +def _mint_session(user_key): + """Mint a random session token for a stored user key, persist it (hashed), + return the plaintext token. Shared by named-user and admin sessions.""" token = secrets.token_urlsafe(_SESSION_TOKEN_BYTES) now = int(time.time()) with _lock: @@ -441,11 +734,41 @@ def create_session(name): # only grow by one entry between two sweeps of the same account. for h in [h for h, e in sessions.items() if _session_expired(e, now)]: del sessions[h] - sessions[_token_hash(token)] = {"user": _key(name), "created": now} + sessions[_token_hash(token)] = {"user": user_key, "created": now} _save_sessions(sessions) return token +def create_session(name): + """Mint a random session token for a user, persist it (hashed), return the + plaintext token (shown once, delivered via cookie + login response).""" + return _mint_session(_key(name)) + + +def create_admin_session(): + """Mint a session token for the PRIMARY admin (the password account) so + header-less transports carry admin identity via the zimi_session cookie: the + /w/ reader iframe (a browser navigation that cannot send an Authorization + header) and the plain-fetch data endpoints (/list, /search, …). Stored and + expired exactly like a user session; recognised by + ``manage._primary_admin_authorized`` via ``is_admin_session``.""" + return _mint_session(_ADMIN_SESSION_USER) + + +def is_admin_session(token): + """True if the token is a live PRIMARY-admin session (see + ``create_admin_session``). Fails closed: empty / unknown / expired → False. + As unforgeable as the password Bearer — a random token, hashed at rest.""" + if not token: + return False + ent = _load_sessions().get(_token_hash(token)) + return ( + bool(ent) + and not _session_expired(ent) + and ent.get("user") == _ADMIN_SESSION_USER + ) + + def resolve_session(token): """Return the display name for a valid session token, or None. Fails closed: an unknown token, or a token whose user was deleted, resolves to None (→ @@ -456,6 +779,10 @@ def resolve_session(token): ent = sessions.get(_token_hash(token)) if not ent or _session_expired(ent): return None + # An admin session is not a named user — never let it resolve as one (it + # would fail the users.json lookup anyway; this is defence in depth). + if ent.get("user") == _ADMIN_SESSION_USER: + return None rec = _load_users().get(ent.get("user")) if not rec: return None @@ -471,6 +798,16 @@ def drop_session(token): _save_sessions(sessions) +def drop_admin_sessions(): + """Invalidate every primary-admin session (see ``create_admin_session``). + Called when the manage password changes or clears so an old admin cookie + can't outlive a password rotation — matching the pre-cookie model where the + admin's Bearer WAS the password and changing it locked out the old one + immediately.""" + with _lock: + _drop_user_sessions_locked(_ADMIN_SESSION_USER) + + def _drop_user_sessions_locked(key): """Remove every session for a casefold user key. Caller holds _lock.""" sessions = _load_sessions() @@ -522,19 +859,44 @@ def resolve_request_user(handler): return resolve_session(_cookie_token(handler)) +def _request_is_admin(handler): + """True if the request is an authorized admin (primary or secondary) — the + account that always sees the whole library regardless of the public-access + policy. Fails CLOSED: any error resolving admin status → False (treat as a + non-admin, i.e. restricted), never accidentally all-access.""" + try: + from zimi import manage as _manage + + return _manage._check_manage_auth(handler) is None + except Exception: + return False + + def request_allow(handler): """The request's ZIM allow set, or None for all-access. - None → admin / anonymous / all-access user → sees everything. - set() → a logged-in user with an explicit allowlist → restricted. + Resolution order: + - A logged-in USER → their own allowlist (set) or None (all-access user). + - Otherwise (anonymous OR admin) the public-access policy applies: + * ``open`` → None (all-access) — the common default; no admin probe. + * ``limited`` → admin gets None, anonymous gets set(public allowlist). + * ``private`` → admin gets None, anonymous gets an EMPTY set (defence in + depth; the http.py request gate 401s them before any + read handler runs). """ name = resolve_request_user(handler) - if not name: - return None - rec = get_user(name) - if not rec: + if name: + rec = get_user(name) + if not rec: + return None + allowlist = rec.get("allowlist") + return set(allowlist) if isinstance(allowlist, list) else None + + mode, allow = get_public_access() + if mode == "open": + return None # fast path — no admin probe for the default deployment + if _request_is_admin(handler): return None - allowlist = rec.get("allowlist") - if isinstance(allowlist, list): - return set(allowlist) - return None + if mode == "limited": + return set(allow) + return set() # private → empty library; gate returns 401 first
- definitions.
@@ -430,11 +627,16 @@ def _extract_preview_wiktionary(html_str, zim_name, result):
# Simple Wiktionary: treat entire page as English content
eng_section = html_str[:30000]
# Part of speech: Simple Wiktionary uses
(next language section) or end eng_start = eng_m.start() - next_h2 = re.search(r'
/
, definition from
- parsing found nothing, try
- (quote + attribution).
# Use a simple stack-based approach to find balanced top-level
- blocks.
- for ul_m in re.finditer(r'
- ', html_str):
+ for ul_m in re.finditer(r"
- ", html_str):
start = ul_m.start()
# Find the matching
- (attribution) to be a quote block
- if block.count('
- and first nested
-
# Strip the wrapping