diff --git a/src/bin/backfill.rs b/src/bin/backfill.rs index 03b9d2f..dc76bd6 100644 --- a/src/bin/backfill.rs +++ b/src/bin/backfill.rs @@ -1,8 +1,9 @@ use allegedly::{ - Db, Dt, ExportPage, FjallDb, FolderSource, HttpSource, SeqPage, backfill, backfill_to_pg, + Db, Dt, ExportPage, FjallDb, FolderSource, HttpSource, SeqPage, backfill, backfill_to_fjall, + backfill_to_pg, bin::{GlobalArgs, bin_init}, full_pages, full_pages_seq, logo, pages_to_pg, pages_to_stdout, poll_upstream, - poll_upstream_seq, seq_pages_to_fjall, + poll_upstream_seq, }; use clap::Parser; use reqwest::Url; @@ -121,7 +122,7 @@ pub async fn run( tasks.spawn(poll_upstream_seq(None, upstream, throttle, poll_tx)); tasks.spawn(full_pages_seq(poll_out, full_tx)); - tasks.spawn(seq_pages_to_fjall(db, full_out)); + tasks.spawn(backfill_to_fjall(db, reset, full_out, None)); } else { tasks.spawn(poll_upstream(None, upstream, throttle, poll_tx)); tasks.spawn(full_pages(poll_out, full_tx)); diff --git a/src/crypto.rs b/src/crypto.rs index 25bc1ab..5d639f6 100644 --- a/src/crypto.rs +++ b/src/crypto.rs @@ -199,8 +199,7 @@ mod tests { assert!( !valid_keys.is_empty(), - "no keys to verify against for {}", - path + "{path}/{cid}: no keys to verify against" ); let results = assure_valid_sig(&valid_keys, &sig, &data) diff --git a/src/mirror/fjall.rs b/src/mirror/fjall.rs index 6603204..657b082 100644 --- a/src/mirror/fjall.rs +++ b/src/mirror/fjall.rs @@ -277,7 +277,7 @@ async fn export( let db = fjall.clone(); let ops = spawn_blocking(move || { - let iter = db.export_ops(after..)?; + let iter = db.export_ops((after + 1)..)?; iter.take(limit).collect::>>() }) .await?;