thegeneralist01/archivr
1
Fork 0
mirror of https://github.com/thegeneralist01/archivr synced 2026-07-22 03:05:32 +02:00
Code Issues Activity

feat: uBlock Origin Lite integration for ad-blocking during WebPage captures

Browse source 
- singlefile.rs: when ARCHIVR_UBLOCK=true and ARCHIVR_UBLOCK_EXT is set,
  archivr owns Chrome's lifecycle (--headless=new, --remote-debugging-port,
  --load-extension); single-file connects via --browser-server instead of
  launching its own Chrome. Falls back to old behaviour with ublock_skipped=true
  when the ext path is missing or invalid.
- capture.rs: thread ublock_skipped through CaptureResult
- database.rs: add notes_json TEXT column to capture_jobs (DDL + idempotent
  ALTER TABLE migration); update_capture_job_status gains notes_json param
- archive.rs: expose notes_json in CaptureJobSummary
- routes.rs: store {"ublock_skipped":true} in notes_json on completed captures
- ToastStack.jsx: warning toast variant (toast--warning) with Details expander
  and Ignore button
- CaptureDialog.jsx: fire warning toast when poll result has ublock_skipped
- App.jsx: sessionStorage-backed Ignore suppression for ublock warnings
- styles.css: .toast--warning (amber left border) + .toast-warning-detail
- flake.nix: ublockLite derivation fetches uBOLite_2026.705.2152.chromium.zip
  (pinned SHA256) from uBlockOrigin/uBOL-home; sets ARCHIVR_UBLOCK_EXT in both
  archivr and archivr-server wrappers

Env vars:
  ARCHIVR_UBLOCK=true (default) — enable uBlock during WebPage captures
  ARCHIVR_UBLOCK_EXT — path to unpacked uBOL extension dir (set by Nix)
This commit is contained in:
TheGeneralist 2026-07-07 17:18:55 +02:00
parent dae61e585d
commit 8a90259a76
Signed by: thegeneralist01
SSH key fingerprint: SHA256:pp9qddbCNmVNoSjevdvQvM5z0DHN7LTa8qBMbcMq/R4
14 changed files with 546 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/archivr-server/src/routes.rs
View file

@ -756,15 +756,21 @@ async fn capture_handler(
return;
}
};
database::update_capture_job_status(&conn, &job_uid_bg, "running", None, None).ok();
database::update_capture_job_status(&conn, &job_uid_bg, "running", None, None, None).ok();
match capture::perform_capture(&archive_paths, &locator, Some(&archive_id_bg), quality.as_deref(), &capture_config) {
Ok(result) => {
let notes = if result.ublock_skipped {
Some(r#"{"ublock_skipped":true}"#)
} else {
None
};
database::update_capture_job_status(
&conn,
&job_uid_bg,
"completed",
Some(&result.run_uid),
None,
notes,
)
.ok();
}
@ -775,6 +781,7 @@ async fn capture_handler(
"failed",
None,
Some(&format!("{e:#}")),
None,
)
.ok();
}

2
crates/archivr-server/static/assets/index-BW0QKHXE.css → crates/archivr-server/static/assets/index-BGSI2WEx.css
View file

File diff suppressed because one or more lines are too long

40
crates/archivr-server/static/assets/index-BpXoSc97.js Normal file
View file

File diff suppressed because one or more lines are too long

40
crates/archivr-server/static/assets/index-CHDuICqH.js
View file

File diff suppressed because one or more lines are too long

4
crates/archivr-server/static/index.html
View file

@ -4,8 +4,8 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Archivr</title>
<script type="module" crossorigin src="/assets/index-CHDuICqH.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-BW0QKHXE.css">
<script type="module" crossorigin src="/assets/index-BpXoSc97.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-BGSI2WEx.css">
</head>
<body>
<div id="root"></div>