luna/catacomb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enhance comment viewer + make SponsorBlock configurable (3.6 + parity)

Browse source 
Comment viewer (web UI): the flat tree gains search (highlight + keep
ancestor context), sort (threaded / top / newest / oldest), per-thread
collapse/expand with collapse-all/expand-all, an OP badge for the
uploader, and a "new since last visit" highlight + count (localStorage
per-video timestamp). API now returns each comment's `timestamp` and
`author_is_uploader`.

SponsorBlock: was a hardcoded `--sponsorblock-mark all`. Now a real
setting (off / mark / remove) with a per-channel override, threaded
through the full five touchpoints — config `[backup].sponsorblock_mode`
(default "mark", preserving prior behavior), DownloadOptions override,
a downloader resolver (apply_sponsorblock), and both UIs (egui Settings
+ channel dialog; web Settings modal + channel dialog + SettingsPayload).

Integration tests extended: settings round-trip asserts the sponsorblock
default + persistence; channel-options round-trip asserts the override.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Luna 2026-06-07 03:53:49 -07:00
parent 6f174f703b
commit 3031b5b0e5
7 changed files with 219 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/downloader.rs
View file

@ -17,7 +17,7 @@
//! | `--remux-video mkv` | Re-container to MKV (no re-encode) |
//! | `--embed-metadata --embed-info-json --embed-chapters` | Embed rich metadata into the MKV |
//! | `--xattrs` | Store metadata in filesystem extended attributes |
//! | `--sponsorblock-mark all` | Mark (but don't remove) SponsorBlock segments |
//! | `--sponsorblock-mark/-remove all` | SponsorBlock handling, per `sponsorblock_mode` (off/mark/remove; see [`Self::apply_sponsorblock`]) |
//! | `--impersonate <target>` | Browser TLS fingerprint per source platform (see [`crate::platform::Platform::impersonate_target`]) |
//! | `--break-on-existing` | Stop when the archive file records the video as already downloaded |
//! | `--download-archive archive.txt` | Record downloaded IDs to avoid re-downloading |
@ -314,6 +314,9 @@ pub struct Downloader {
/// yt-dlp defaults. Per-channel options can override. Set at
/// construction + on settings save.
pub youtube_player_clients: String,
/// Global `backup.sponsorblock_mode` ("off" / "mark" / "remove").
/// Per-channel options can override. Set at construction + on save.
pub sponsorblock_mode: String,
/// Global `[convert]` config. Drives the post-download ffmpeg pass.
/// Per-channel options override the mode. Set at construction + save.
pub convert_defaults: crate::config::ConvertSection,
@ -359,6 +362,7 @@ impl Downloader {
pot_server: None,
subtitle_defaults: crate::config::SubtitlesSection::default(),
youtube_player_clients: String::new(),
sponsorblock_mode: "mark".to_string(),
convert_defaults: crate::config::ConvertSection::default(),
retry_queue: Vec::new(),
rate_limited_backoff: false,
@ -391,6 +395,22 @@ impl Downloader {
.arg(format!("youtube:player_client={clients}"));
}
/// Apply SponsorBlock flags from the resolved mode (per-channel override
/// or global default). "mark" chapter-marks segments, "remove" cuts them,
/// anything else (incl. "off") omits the flags entirely.
fn apply_sponsorblock(&self, cmd: &mut Command, opts: Option<&DownloadOptions>) {
let mode = opts
.and_then(|o| o.sponsorblock_mode.as_deref())
.filter(|s| !s.trim().is_empty())
.unwrap_or(self.sponsorblock_mode.as_str())
.trim();
match mode {
"mark" => { cmd.arg("--sponsorblock-mark").arg("all"); }
"remove" => { cmd.arg("--sponsorblock-remove").arg("all"); }
_ => {} // "off" or unknown → no SponsorBlock processing
}
}
fn apply_subtitle_flags(&self, cmd: &mut Command, opts: Option<&DownloadOptions>) {
let g = &self.subtitle_defaults;
// Per-channel override-or-global for each knob.
@ -714,8 +734,6 @@ impl Downloader {
.arg("--embed-info-json")
.arg("--embed-chapters")
.arg("--xattrs")
.arg("--sponsorblock-mark")
.arg("all")
.arg("--progress");
if let Some(fmt) = quality.format_spec() {
cmd.arg("-f").arg(fmt);
@ -743,6 +761,8 @@ impl Downloader {
// YouTube player-client selection (global default + per-channel
// override). Lets the user route around a captcha-walled client.
self.apply_player_client(&mut cmd, channel_options);
// SponsorBlock: global default + per-channel override (off/mark/remove).
self.apply_sponsorblock(&mut cmd, channel_options);
// Post-download conversion: resolve global [convert] + per-channel
// override. When active, ask yt-dlp to print each finished file's
// final path (after_move) so we can enqueue an ffmpeg pass on it.