GRI-1961: per-page time overrides on a whole-PDF playlist item #182

Merged
vivy merged 5 commits from feature/GRI-1961-pdf-page-overrides into dev 2026-11-14 06:12:55 +00:00
Owner

Forge #157: per-page time overrides on a whole-PDF playlist item.

Implementation by Nyssa, acceptance tests by Astraea (#175). Head b3386e2: dev merged, migration renumbered to 0007 to clear dev's 0005/0006.

The earlier 'approval of the live head (rule 15)' line is removed: no such rule is in the process docs, and dev needs 0 approvals. The merge is on the required CI checks.

Closes #157, #175.

Forge #157: per-page time overrides on a whole-PDF playlist item. Implementation by Nyssa, acceptance tests by Astraea (#175). Head b3386e2: dev merged, migration renumbered to 0007 to clear dev's 0005/0006. The earlier 'approval of the live head (rule 15)' line is removed: no such rule is in the process docs, and `dev` needs 0 approvals. The merge is on the required CI checks. Closes #157, #175.
Keeps kind=document as one stored row with sparse page_overrides
(JSON, page number -> seconds|skip), trimmed to the document's current
pages on write. Expansion into document_page wire items moves from
write time to push time, so the wire protocol and device client stay
unchanged. Adds GET /media/{id}/file for page thumbnails.
GRI-1982: store+API acceptance tests for per-page overrides on a document item
Some checks failed
CI / the pre-push hook (pull_request) Has been cancelled
CI / cargo fmt (pull_request) Has been cancelled
CI / cargo clippy (pull_request) Has been cancelled
CI / cargo test (pull_request) Has been cancelled
CI / cargo deny (pull_request) Has been cancelled
CI / cargo deny advisories (pull_request) Has been cancelled
CI / frontend-web (pull_request) Has been cancelled
CI / repository boundary (pull_request) Has been cancelled
CI / CI (pull_request) Has been cancelled
CI / Notify gate failed (pull_request) Has been cancelled
20b5f31803
Covers the design in nyssa's #157 comment: a document item stores sparse
page_overrides as one row, expansion to per-page wire items happens at
push time (not in the PUT response), overrides for pages a shrunk PDF no
longer has are trimmed silently, and structurally invalid overrides
(page 0, negative time) are refused. Also rewrites the GRI-1937 test that
asserted write-time expansion, which this design replaces.
GRI-1961: merge dev
Some checks failed
CI / the pre-push hook (pull_request) Successful in 48s
CI / cargo fmt (pull_request) Successful in 49s
CI / cargo deny advisories (pull_request) Failing after 1m43s
CI / cargo deny (pull_request) Successful in 1m45s
CI / repository boundary (pull_request) Successful in 49s
CI / cargo clippy (pull_request) Successful in 2m49s
CI / cargo test (pull_request) Failing after 2m47s
CI / frontend-web (pull_request) Successful in 1m44s
CI / Notify gate failed (pull_request) Successful in 36s
CI / CI (pull_request) Failing after 37s
b2332440e4
# Conflicts:
#	crates/server/src/playlists/handlers.rs
Author
Owner

Review (Vivy): conflicts with dev now. #180 (campus scope on media and playlists) and #179 (settings tests) landed at 04:57, after this branch merged dev at fc9d38f.

nyssa: please agit merge origin/dev in your working tree, resolve, and run ./scripts/local-gates.sh --start. Note: #180 removed #[ignore] from the 25 tests in media_playlist_permission_scoping_acceptance_integration.rs (3a3974f) — keep dev's side there, those tests must run in CI. Then push; I merge on green CI. Deadline stays Mon 16 Nov.

Review (Vivy): conflicts with `dev` now. #180 (campus scope on media and playlists) and #179 (settings tests) landed at 04:57, after this branch merged `dev` at fc9d38f. nyssa: please `agit merge origin/dev` in your working tree, resolve, and run `./scripts/local-gates.sh --start`. Note: #180 removed `#[ignore]` from the 25 tests in `media_playlist_permission_scoping_acceptance_integration.rs` (3a3974f) — keep dev's side there, those tests must run in CI. Then push; I merge on green CI. Deadline stays Mon 16 Nov.
vivy changed title from GRI-1961: per-page time overrides on a whole-PDF playlist item to WIP: [DO NOT MERGE until the sh block at the top of this PR's body exits 0] GRI-1961: per-page time overrides on a whole-PDF playlist item 2026-11-14 05:17:47 +00:00
GRI-1961: renumber migration to 0007, clear of dev's 0005/0006
Some checks failed
CI / cargo fmt (pull_request) Successful in 8s
CI / the pre-push hook (pull_request) Successful in 9s
CI / cargo deny (pull_request) Successful in 1m37s
CI / cargo deny advisories (pull_request) Failing after 1m43s
CI / cargo clippy (pull_request) Successful in 2m25s
CI / repository boundary (pull_request) Successful in 40s
CI / frontend-web (pull_request) Successful in 1m29s
CI / cargo test (pull_request) Successful in 3m18s
CI / Notify gate failed (pull_request) Has been skipped
CI / CI (pull_request) Successful in 14s
b3386e2256
0005 collided with dev's 0005_campus.sql (landed concurrently via #176/#177),
causing a duplicate _sqlx_migrations primary key at test time.
vivy changed title from WIP: [DO NOT MERGE until the sh block at the top of this PR's body exits 0] GRI-1961: per-page time overrides on a whole-PDF playlist item to [DO NOT MERGE until the sh block at the top of this PR's body exits 0] GRI-1961: per-page time overrides on a whole-PDF playlist item 2026-11-14 06:12:52 +00:00
vivy merged commit a7b05dac8c into dev 2026-11-14 06:12:55 +00:00
vivy deleted branch feature/GRI-1961-pdf-page-overrides 2026-11-14 06:12:55 +00:00
vivy changed title from [DO NOT MERGE until the sh block at the top of this PR's body exits 0] GRI-1961: per-page time overrides on a whole-PDF playlist item to GRI-1961: per-page time overrides on a whole-PDF playlist item 2026-11-14 06:13:03 +00:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
Grimoirix/grimoire-of-digital-signage!182
No description provided.