feat: Presentations, for a teacher who downloaded tonight's session
PRESENTATIONS_ENABLED, off by default, independent of everything else. A teacher downloads a session in ordinary Chrome and it is on the Presentations screen a few seconds later, ready for the television. No file manager, no import button, no Impress. WHY NOTHING LAUNCHES A DOCUMENT APPLICATION. The brief was to use existing presentation software, so the existing software was tried first, on Debian 13, before any of this was designed. `soffice --show` does start a real fullscreen slideshow — and needs XDG_SESSION_TYPE plus a VCL plugin or it dies with "Failed to open display", shows a splash, opened a "Tip of the Day: 1/225" dialog over the slides, and leaves the Impress editor when the show ends. `okular --presentation` opens THREE windows: the presentation, the ordinary document window behind it, and an information dialog. zathura is not a presenter. pdfpc is the closest and is another dependency with a presenter-console model. Every one of them leaves an application on screen that can open any file on the machine, and none of them knows there is a library to go back to. So LibreOffice converts once, headless, at import, with no window on any screen; poppler renders the pages; the classroom shows the pictures. Measured: 0.34s for a ten-slide PPTX, 0.03s for its ten thumbnails, 0.10s for one slide at 1920px. That is not a new renderer — it is the same engine Impress would have used live — and it means Escape is ours, presenting is instant, and a PDF exported from Google Slides skips the conversion entirely and keeps the appearance Google gave it. THE THREE THINGS KEPT APART. The library thumbnail, the starting slide and the retention clock are independent, because the first slide of a Bible study session is a generic opening shared by every session and the one that names it is usually the second. Quick Look chooses the picture; it does not change where the slideshow starts and it does not count as having presented anything. mark_presented() is called when a slide is actually drawn, not when Present is pressed: an intention is not a presentation, and a viewer that failed to start must not buy another thirty days. IMPORTING. The teacher's download is copied, never moved, renamed or deleted. A file with a .crdownload beside it is still arriving. Wonder Ink's own folder is not looked at. Two downloads of the same name are two presentations, the second titled (2) — found in the lab, where a PDF and a PPTX of one session both came out with the same name because the import being named was excluded from the taken-titles set BY TITLE, and a set holds one copy of a repeated string. Metadata is written saying "importing" before any work, so a reboot mid-conversion leaves a directory the next startup sweeps and imports again. A file that cannot be converted gets a card saying so, offering only Remove, with the teacher's download untouched. Retention: 180 days never presented, 30 days from the last presentation, every presentation starting the thirty over. The cleanup never touches a presentation being shown, never leaves the library directory, and never looks at Downloads. The dock order is unchanged: Presentations is appended after the disc player, so Wonder Ink, the browser and the player keep the places teachers have been reaching for. There is a test for exactly that. classroom-wonderink now asks feature() rather than carrying its own copy of the default, so the panel and the command cannot disagree. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
ekklesia
co-authored by
Claude Opus 5
Claude Opus 5
parent
30d2d99230
commit
55f4c183c7
@@ -85,8 +85,16 @@ check("a desktop can have Wonder Ink taken away",
|
||||
check("and keeps everything else",
|
||||
desktop_no_ink["DVD"] is True and desktop_no_ink["PARENT_CALL"] is True)
|
||||
|
||||
check("an existing room that has never heard of these keeps them all",
|
||||
all(module.wanted({}).values()), str(module.wanted({})))
|
||||
unset = module.wanted({})
|
||||
check("an existing room that has never heard of these keeps all three",
|
||||
unset["WONDERINK"] and unset["DVD"] and unset["PARENT_CALL"],
|
||||
str(unset))
|
||||
# The one that must NOT follow that rule. Every existing classroom has
|
||||
# Wonder Ink, a drive and Parent Call, so an upgrade has to leave all
|
||||
# three on. No existing classroom has Presentations, so an upgrade has to
|
||||
# leave it off — a new button on a bar nobody asked for is a support call.
|
||||
check("but Presentations is off until a device asks for it",
|
||||
unset["PRESENTATIONS"] is False, str(unset))
|
||||
|
||||
|
||||
print("3. a drive can only ever take the player away")
|
||||
@@ -126,13 +134,18 @@ check("and an unconfigured machine keeps every application",
|
||||
print("5. the bar that comes out, evaluated in node")
|
||||
STUB = r"""
|
||||
const fs = require("fs");
|
||||
const captured = {widgets: [], config: {}};
|
||||
const captured = {widgets: [], config: {}, launchers: []};
|
||||
let current = null;
|
||||
function makeWidget(type) {
|
||||
const w = {
|
||||
type: type,
|
||||
currentConfigGroup: [],
|
||||
writeConfig: function (k, v) { captured.config[type + "." + k] = String(v); },
|
||||
writeConfig: function (k, v) {
|
||||
captured.config[type + "." + k] = String(v);
|
||||
// Quick Launch widgets share a config key, so the last one
|
||||
// written would otherwise be the only one anybody could see.
|
||||
if (k === "launcherUrls") { captured.launchers.push(String(v)); }
|
||||
},
|
||||
reloadConfig: function () {}
|
||||
};
|
||||
captured.widgets.push(type);
|
||||
@@ -172,8 +185,15 @@ else:
|
||||
check("a classroom gets Wonder Ink, the browser and the player, in order",
|
||||
every and every["config"].get(LAUNCH) == f"{INK},{WEB},{DISC}",
|
||||
(every or {}).get("config", {}).get(LAUNCH, why))
|
||||
CALL = "file:///usr/share/applications/ekklesia-parent-call.desktop"
|
||||
HELP = "file:///usr/share/applications/ekklesia-manual.desktop"
|
||||
|
||||
check("and Parent Call in the corner",
|
||||
every and "org.kde.plasma.quicklaunch" in every["widgets"])
|
||||
every and CALL in every["launchers"],
|
||||
str((every or {}).get("launchers")))
|
||||
check("and Help beside it",
|
||||
every and HELP in every["launchers"],
|
||||
str((every or {}).get("launchers")))
|
||||
|
||||
no_ink, why = bar({"WONDERINK_ENABLED": "false"})
|
||||
check("a Bible study desktop has the browser first and no gap",
|
||||
@@ -188,8 +208,50 @@ else:
|
||||
bible and bible["config"].get(LAUNCH) == WEB,
|
||||
(bible or {}).get("config", {}).get(LAUNCH, why))
|
||||
check("with no Parent Call button on it",
|
||||
bible and "org.kde.plasma.quicklaunch" not in bible["widgets"],
|
||||
str((bible or {}).get("widgets")))
|
||||
bible and CALL not in bible["launchers"],
|
||||
str((bible or {}).get("launchers")))
|
||||
# Help is not optional. A teacher who needs the manual is by
|
||||
# definition one who does not know where to look, so every room has
|
||||
# it — what differs is which pages it opens on.
|
||||
check("but Help is still there, because every room has a manual",
|
||||
bible and HELP in bible["launchers"],
|
||||
str((bible or {}).get("launchers")))
|
||||
SLIDES = "applications:ekklesia-presentations.desktop"
|
||||
|
||||
# THE DOCK ORDER IS THE THING NOT TO BREAK.
|
||||
#
|
||||
# Every existing room has Wonder Ink, the browser and the player in
|
||||
# that order, and teachers have been pressing them in that order for
|
||||
# months. Presentations is appended, so all three keep their place on
|
||||
# every machine that upgrades into this release.
|
||||
module.has_optical_drive = lambda: True
|
||||
slides, why = bar({"PRESENTATIONS_ENABLED": "true"})
|
||||
check("Presentations goes on the END of the row, after the player",
|
||||
slides and slides["config"].get(LAUNCH)
|
||||
== f"{INK},{WEB},{DISC},{SLIDES}",
|
||||
(slides or {}).get("config", {}).get(LAUNCH, why))
|
||||
|
||||
without, why = bar({"PRESENTATIONS_ENABLED": "false"})
|
||||
check("and is absent entirely when the device does not offer it",
|
||||
without and SLIDES not in without["config"].get(LAUNCH, ""),
|
||||
(without or {}).get("config", {}).get(LAUNCH, why))
|
||||
check("which leaves the other three exactly where they were",
|
||||
without and without["config"].get(LAUNCH) == f"{INK},{WEB},{DISC}",
|
||||
(without or {}).get("config", {}).get(LAUNCH, why))
|
||||
|
||||
# The prayer-room laptop: the browser and Presentations, nothing else.
|
||||
module.has_optical_drive = lambda: False
|
||||
study, why = bar({"PRESENTATIONS_ENABLED": "true",
|
||||
"WONDERINK_ENABLED": "false",
|
||||
"PARENT_CALL_ENABLED": "false",
|
||||
"DEVICE_TYPE": "laptop"})
|
||||
check("the Bible study laptop gets the browser and Presentations",
|
||||
study and study["config"].get(LAUNCH) == f"{WEB},{SLIDES}",
|
||||
(study or {}).get("config", {}).get(LAUNCH, why))
|
||||
check("and still no Parent Call on it",
|
||||
study and CALL not in study["launchers"],
|
||||
str((study or {}).get("launchers")))
|
||||
|
||||
check("and the status corner is untouched",
|
||||
bible and "org.kde.plasma.volume" in bible["widgets"]
|
||||
and "org.kde.plasma.digitalclock" in bible["widgets"]
|
||||
@@ -227,12 +289,28 @@ print("7. a disabled application does not start either")
|
||||
# talked into running it by a stale desktop entry or a technician's
|
||||
# muscle memory.
|
||||
for script, setting in (("classroom-wonderink", "WONDERINK_ENABLED"),
|
||||
("classroom-parent-call", "PARENT_CALL_ENABLED")):
|
||||
("classroom-parent-call", "PARENT_CALL_ENABLED"),
|
||||
("classroom-presentations", "PRESENTATIONS_ENABLED"),
|
||||
("classroom-presentation-import",
|
||||
"PRESENTATIONS_ENABLED")):
|
||||
text = (root / "scripts" / script).read_text()
|
||||
check(f"{script} refuses when {setting} is false",
|
||||
setting in text and "not starting" in text)
|
||||
check(f"{script} defaults to starting, so existing rooms are unaffected",
|
||||
'default=True' in text or 'feature(' in text)
|
||||
check(f"{script} asks the shared helper rather than reading the file",
|
||||
"feature(" in text and "read_device_config()" in text)
|
||||
|
||||
# And each of them defaults the way its own room needs, which is not the
|
||||
# same answer for all four. Asserting one rule for all of them would pass
|
||||
# for the wrong reason on the one that differs.
|
||||
from classroom_config import feature as _feature # noqa: E402
|
||||
|
||||
for setting, default, why in (
|
||||
("WONDERINK_ENABLED", True, "every existing classroom has it"),
|
||||
("DVD_ENABLED", True, "every existing classroom has it"),
|
||||
("PARENT_CALL_ENABLED", True, "every existing classroom has it"),
|
||||
("PRESENTATIONS_ENABLED", False, "no existing classroom has it")):
|
||||
check(f"{setting} defaults to {default} — {why}",
|
||||
_feature({}, setting) is default)
|
||||
|
||||
print()
|
||||
print(f"{passed} passed, {failed} failed")
|
||||
|
||||
Reference in New Issue
Block a user