diff --git a/web/core/views.py b/web/core/views.py index e28c2c2..315baa1 100644 --- a/web/core/views.py +++ b/web/core/views.py @@ -1245,4 +1245,51 @@ def set_theme(request): request.session["theme"] = theme messages.success(request, f"Theme set to {theme.title()}.") - return redirect("settings_home") \ No newline at end of file + return redirect("settings_home") + +# web/core/views.py +import json +import os +from django.conf import settings +from django.contrib.auth.decorators import login_required, user_passes_test +from django.http import JsonResponse, HttpResponseBadRequest +from django.views.decorators.http import require_POST + +@require_POST +@login_required +@user_passes_test(lambda u: u.is_superuser) +def api_update_pub_codes(request): + """ + Accepts a 'json' field (string) that should parse to {"pub_codes": [..]}. + Normalizes, de-duplicates, and writes to web/static/data/wol-pub-codes.v1.json. + """ + payload = request.POST.get("json") or (request.body.decode("utf-8") if request.body else "") + if not payload: + return HttpResponseBadRequest("Missing 'json'.") + + try: + data = json.loads(payload) + except Exception as e: + return HttpResponseBadRequest(f"Invalid JSON: {e}") + + if not isinstance(data, dict) or "pub_codes" not in data or not isinstance(data["pub_codes"], list): + return HttpResponseBadRequest('JSON must be an object with a "pub_codes" array.') + + # Normalize to unique, lowercase, trimmed strings + seen = set() + codes = [] + for c in data["pub_codes"]: + s = str(c or "").strip().lower() + if s and s not in seen: + seen.add(s) + codes.append(s) + + # Write back to static data file + target_path = os.path.join(settings.BASE_DIR, "web", "static", "data", "wol-pub-codes.v1.json") + try: + with open(target_path, "w", encoding="utf-8") as f: + json.dump({"pub_codes": codes}, f, ensure_ascii=False, indent=2) + except Exception as e: + return HttpResponseBadRequest(f"Could not write file: {e}") + + return JsonResponse({"ok": True, "count": len(codes)}) \ No newline at end of file diff --git a/web/illustrations/urls.py b/web/illustrations/urls.py index 4132680..14bf051 100644 --- a/web/illustrations/urls.py +++ b/web/illustrations/urls.py @@ -1,6 +1,6 @@ # illustrations/urls.py from django.contrib import admin -from django.urls import path, re_path +from django.urls import path, re_path, include from django.contrib.auth import views as auth_views from django.views.generic import TemplateView # NEW: for manifest / service worker / offline @@ -54,6 +54,7 @@ urlpatterns = [ path("api/get-recent-views/", feat_views.api_get_recent_views, name="api_get_recent_views"), path("settings/", core_views.settings_home, name="settings_home"), path("settings/theme/", core_views.set_theme, name="set_theme"), # ✅ FIXED + path("api/update-pub-codes/", core_views.api_update_pub_codes, name="api_update_pub_codes"), # --- NEW (PWA) --- re_path( diff --git a/web/static/data/wol-pub-codes.v1.json b/web/static/data/wol-pub-codes.v1.json new file mode 100644 index 0000000..b6cc314 --- /dev/null +++ b/web/static/data/wol-pub-codes.v1.json @@ -0,0 +1,10 @@ +{ + "pub_codes": [ + "wp", "ws", "yb", "mwb", "w", "g", + "ap", "apf", "be", "bh", "br", "bt", "btg", "cf", "cl", "ct", "dp", + "fg", "fy", "gt", "hb", "im", "ip", "it", "jv", "ka", "kj", "kl", + "lf", "lff", "ll", "ly", "my", "od", "pe", "po", "pt", "rr", "rs", + "sg", "sh", "si", "td", "tp", "tr", "ts", "un", "jy", + "uw", "su", "re", "lvs", "lp", "yy", "yp2", "yp", "sl", "pm", "kc" + ] +} \ No newline at end of file diff --git a/web/static/js/source-validator.v1.js b/web/static/js/source-validator.v1.js index ea18b2b..95a34cc 100644 --- a/web/static/js/source-validator.v1.js +++ b/web/static/js/source-validator.v1.js @@ -1,22 +1,47 @@ /* source-validator.v1.js Centralizes logic for deciding if a "Source" string should link to WOL. + Loads publication codes from /static/data/wol-pub-codes.v1.json. + Exposes: - SourceValidator.isWOLSource(text) -> boolean - SourceValidator.buildWOLSearchURL(text) -> string */ window.SourceValidator = (function () { - // Publications / codes that produce valid WOL links. - // Added: uw, su, re, lvs, rs (rs was already present). - const PUB_CODES = [ - "wp","ws","yb","mwb","w","g","ap","apf","be","bh","br","bt","btg","cf","cl","ct","dp", - "fg","fy","gt","hb","im","ip","it","jv","ka","kj","kl","lf","lff","ll","ly","my","od", - "pe","po","pt","rr","rs","sg","sh","si","td","tp","tr","ts","un","jy", - "uw","su","re","lvs","lp","yy","yp2","yp","jv","sl","pm"// new - ]; + // ---- Load publication codes (sync so callers can use API immediately) ---- + function loadPubCodesSync() { + try { + var xhr = new XMLHttpRequest(); + xhr.open("GET", "/static/data/wol-pub-codes.v1.json", false); // synchronous + xhr.send(null); + if (xhr.status >= 200 && xhr.status < 300) { + var data = JSON.parse(xhr.responseText || "{}"); + if (data && Array.isArray(data.pub_codes)) { + // de-duplicate and normalize to lowercase strings + var uniq = Object.create(null), out = []; + for (var i = 0; i < data.pub_codes.length; i++) { + var c = String(data.pub_codes[i] || "").trim().toLowerCase(); + if (!c) continue; + if (!uniq[c]) { uniq[c] = 1; out.push(c); } + } + return out; + } + } + } catch (e) { + // fall through to fallback + } + // Fallback (very small set) — only used if JSON cannot be loaded + return ["w", "wp", "ws", "g", "rs"]; + } + + // Publications / codes loaded from JSON + var PUB_CODES = loadPubCodesSync(); + + // Choose the longest matching code at the start (so "ws" beats "w"). + var PUB_CODES_SORTED = PUB_CODES.slice().sort(function (a, b) { return b.length - a.length; }); // Year validation rules (applies only if a year can be parsed from the source). // Watchtower (w/wp/ws) back to 1950; Awake (g) back to 1970. - const YEAR_RULES = [ + var YEAR_RULES = [ { codes: ["w","wp","ws"], minYear: 1950 }, { codes: ["g"], minYear: 1970 } ]; @@ -24,12 +49,10 @@ window.SourceValidator = (function () { // Normalize helper function normalize(s) { return (s || "").trim().toLowerCase(); } - // Choose the longest matching code at the start (so "ws" beats "w"). - const PUB_CODES_SORTED = [...PUB_CODES].sort((a,b)=>b.length-a.length); - function leadingCode(textLower) { - for (const code of PUB_CODES_SORTED) { - if (textLower.startsWith(code)) return code; + for (var i = 0; i < PUB_CODES_SORTED.length; i++) { + var code = PUB_CODES_SORTED[i]; + if (textLower.indexOf(code) === 0) return code; } return null; } @@ -37,60 +60,51 @@ window.SourceValidator = (function () { // Try to extract a year that appears right after the leading code (allow spaces), // accepting either 4-digit (e.g., 1955, 2001) or 2-digit (e.g., 55, 95, 12) forms. function extractYearAfterCode(textLower, code) { - let s = textLower.slice(code.length).trim(); + var s = textLower.slice(code.length).trim(); - // 1) Look for a 4-digit year first - let m = s.match(/\b(1[89]\d{2}|20\d{2})\b/); // 1800-2099 (broad, but OK) - if (m) { - return parseInt(m[1], 10); - } + // 1) Look for a 4-digit year first (1800–2099) + var m = s.match(/\b(1[89]\d{2}|20\d{2})\b/); + if (m) return parseInt(m[1], 10); - // 2) If not found, accept a 2-digit year at the *start* of the remainder, - // or right after an optional space: e.g., "w55 1/1", "w 95", "g70 1/22" + // 2) If not found, accept a 2-digit year at the *start* of the remainder + // (e.g., "w55 1/1", "w 95", "g70 1/22") m = s.match(/^\s*(\d{2})\b/); if (m) { - const yy = parseInt(m[1], 10); - // Infer century based on publication + threshold logic - // - For Watchtower: 50–99 -> 1950–1999; 00–49 -> 2000–2049 - // - For Awake: 70–99 -> 1970–1999; 00–69 -> 2000–2069 - if (code === "g") { - return yy >= 70 ? (1900 + yy) : (2000 + yy); - } - if (code === "w" || code === "wp" || code === "ws") { - return yy >= 50 ? (1900 + yy) : (2000 + yy); - } - // For other pubs, if they ever include 2-digit years, assume 1900+yy≥70 else 2000+yy + var yy = parseInt(m[1], 10); + if (code === "g") return yy >= 70 ? (1900 + yy) : (2000 + yy); + if (code === "w" || code === "wp" || code === "ws") + return yy >= 50 ? (1900 + yy) : (2000 + yy); return yy >= 70 ? (1900 + yy) : (2000 + yy); } - // No recognizable year → don't enforce year limits return null; } function passesYearRuleIfPresent(textLower, code) { - const rule = YEAR_RULES.find(r => r.codes.includes(code)); + var rule = null; + for (var i=0;i= rule.minYear; } function isWOLSource(text) { - const t = normalize(text); + var t = normalize(text); if (!t) return false; - - const code = leadingCode(t); + var code = leadingCode(t); if (!code) return false; - // If starts with a known pub code, it’s WOL-capable — but enforce year rules where applicable. return passesYearRuleIfPresent(t, code); } function buildWOLSearchURL(text) { - const q = encodeURIComponent(text || ""); - return `https://wol.jw.org/en/wol/l/r1/lp-e?q=${q}`; + var q = encodeURIComponent(text || ""); + return "https://wol.jw.org/en/wol/l/r1/lp-e?q=" + q; } - return { isWOLSource, buildWOLSearchURL }; + return { isWOLSource: isWOLSource, buildWOLSearchURL: buildWOLSearchURL }; })(); \ No newline at end of file diff --git a/web/templates/settings/home.html b/web/templates/settings/home.html index 4e9c309..f20262a 100644 --- a/web/templates/settings/home.html +++ b/web/templates/settings/home.html @@ -162,6 +162,25 @@ + +
+
+
Comms
+

Publication Codes (JSON)

+
+
+
+ +
+
+ + +
+
+
+
+ {% endif %} @@ -335,6 +354,71 @@ textarea.tool-input{min-height:140px;resize:vertical;width:100%;} }); window.addEventListener('keydown', (e)=>{ if (e.key === 'Escape' && modal.style.display === 'flex') closeModal(); }); })(); + + // === Publication Codes Editor (superuser) === + (function(){ + const ta = document.getElementById('pubCodesEditor'); + const btnR = document.getElementById('pubCodesReloadBtn'); + const btnS = document.getElementById('pubCodesSaveBtn'); + const stat = document.getElementById('pubCodesStatus'); + if (!ta || !btnR || !btnS) return; // not superuser or card missing + + function setStatus(msg, ok=true){ + if (!stat) return; + stat.textContent = msg; + stat.style.color = ok ? '#64748b' : '#b91c1c'; + } + + async function reloadJSON(){ + try{ + setStatus('Loading…'); + const r = await fetch('/static/data/wol-pub-codes.v1.json', { cache:'no-store' }); + if (!r.ok) throw new Error('HTTP '+r.status); + const data = await r.json(); + ta.value = JSON.stringify(data, null, 2); + setStatus('Loaded.'); + }catch(err){ + setStatus('Failed to load JSON: ' + (err?.message||err), false); + } + } + + async function saveJSON(){ + let parsed; + try{ + parsed = JSON.parse(ta.value); + if (!parsed || typeof parsed !== 'object' || !Array.isArray(parsed.pub_codes)) + throw new Error('JSON must be an object with a "pub_codes" array.'); + }catch(err){ + setStatus('Invalid JSON: ' + (err?.message||err), false); + return; + } + + try{ + setStatus('Saving…'); + const fd = new FormData(); + fd.append('json', JSON.stringify(parsed)); + const r = await fetch("{% url 'api_update_pub_codes' %}", { + method: 'POST', + body: fd, + credentials: 'same-origin', + headers: { 'X-CSRFToken': (document.cookie.match(/(^|;)\s*csrftoken\s*=\s*([^;]+)/)||[]).pop() || '' } + }); + if (!r.ok) { + const txt = await r.text().catch(()=>String(r.status)); + throw new Error(txt.slice(0,200)); + } + const out = await r.json().catch(()=>({ok:false})); + if (!out.ok) throw new Error('Server rejected the update.'); + setStatus('Saved. ' + out.count + ' codes.'); + }catch(err){ + setStatus('Save failed: ' + (err?.message||err), false); + } + } + + btnR.addEventListener('click', reloadJSON); + btnS.addEventListener('click', saveJSON); + reloadJSON(); // initial load + })(); })(); diff --git a/web/version.txt b/web/version.txt index 7fb4b7b..45596cd 100644 --- a/web/version.txt +++ b/web/version.txt @@ -1 +1 @@ -v4.1.22 \ No newline at end of file +v4.1.24 \ No newline at end of file