Manual rebase VI

Cargo.toml

@@ -203,7 +203,7 @@ reqwest = { version = "0.11", default-features = false, features = [
     "blocking",
 ] }
 backoff = "0.4"
-url = "2.3.1"
+url = "2.4.0"
 
 # rclone backend
 semver = "1"
@@ -226,7 +226,7 @@ rhai = { version = "1.15", features = [
     "only_i64",
 ] }
 simplelog = "0.12"
-comfy-table = "6.1.4"
+comfy-table = "7.0.1"
 
 # cache
 dirs = "5"
@@ -241,19 +241,19 @@ path-dedot = "3"
 dunce = "1"
 gethostname = "0.4"
 bytesize = "1"
-itertools = "0.10"
+itertools = "0.11"
 humantime = "2"
 clap_complete = "4"
 clap = { version = "4", features = ["derive", "env", "wrap_help"] }
-once_cell = "1.17"
-self_update = { version = "0.36", default-features = false, features = [
+once_cell = "1.18"
+self_update = { version = "0.37", default-features = false, features = [
     "rustls",
     "archive-tar",
     "compression-flate2",
 ] }
 
 # dev dependencies
-rstest = "0.17"
+rstest = "0.18"
 quickcheck = "1"
 quickcheck_macros = "1"
 tempfile = "3.7"

crates/rustic_core/Cargo.toml

@@ -115,7 +115,7 @@ sha2 = "0.10"
 xattr = "1"
 
 [dev-dependencies]
-rustup-toolchain = "0.1.4"
+rustup-toolchain = "0.1.5"
 rustdoc-json = "0.8.7"
 public-api = "0.31.3"
 rstest = { workspace = true }

crates/rustic_core/src/backend.rs

@@ -292,7 +292,7 @@ pub trait ReadSourceOpen {
 }
 
 /// Trait for backends that can read from a source.
-/// 
+///
 /// This trait is implemented by all backends that can read data from a source.
 pub trait ReadSource {
     type Open: ReadSourceOpen;
@@ -306,7 +306,7 @@ pub trait ReadSource {
 }
 
 /// Trait for backends that can write to a source.
-/// 
+///
 /// This trait is implemented by all backends that can write data to a source.
 pub trait WriteSource: Clone {
     /// Create a new source.

crates/rustic_core/src/backend/local.rs

@@ -31,7 +31,6 @@ use crate::{
     },
     error::{LocalErrorKind, RusticResult},
     id::Id,
-    repository::parse_command,
 };
 
 /// Local backend, used when backing up.

crates/rustic_core/src/blob.rs

@@ -76,7 +76,7 @@ impl<T: Default> Initialize<T> for BlobTypeMap<T> {
 pub(crate) struct Blob {
     /// The type of the blob
     tpe: BlobType,
-    
+
     /// The id of the blob
     id: Id,
 }

crates/rustic_core/src/blob/tree.rs

@@ -253,6 +253,7 @@ where
     ///
     /// * [`TreeErrorKind::BlobIdNotFound`] - If the tree ID is not found in the backend.
     /// * [`TreeErrorKind::DeserializingTreeFailed`] - If deserialization fails.
+    #[allow(unused)]
     pub fn new(be: BE, node: &Node) -> RusticResult<Self> {
         Self::new_streamer(be, node, None, true)
     }
@@ -305,12 +306,7 @@ where
     ///
     /// * [`TreeErrorKind::BuildingNodeStreamerFailed`] - If building the streamer fails.
     /// * [`TreeErrorKind::ReadingFileStringFromGlobsFailed`] - If reading a glob file fails.
-    pub fn new_with_glob(
-        be: BE,
-        node: &Node,
-        opts: &TreeStreamerOptions,
-        recursive: bool,
-    ) -> RusticResult<Self> {
+    pub fn new_with_glob(be: BE, node: &Node, opts: &TreeStreamerOptions) -> RusticResult<Self> {
         let mut override_builder = OverrideBuilder::new("");
 
         for g in &opts.glob {

crates/rustic_core/src/chunker.rs

@@ -40,25 +40,25 @@ pub(crate) struct ChunkIter<R: Read + Send> {
 
     /// The position in the buffer.
     pos: usize,
-    
+
     /// The reader.
     reader: R,
-    
+
     /// The predicate used to determine if a chunk is a chunk boundary.
     predicate: fn(u64) -> bool,
-    
+
     /// The rolling hash.
     rabin: Rabin64,
-    
+
     /// The size hint is used to optimize memory allocation; this should be an upper bound on the size.
     size_hint: usize,
-    
+
     /// The minimum size of a chunk.
     min_size: usize,
-    
+
     /// The maximum size of a chunk.
     max_size: usize,
-    
+
     /// If the iterator is finished.
     finished: bool,
 }

crates/rustic_core/src/repository.rs

@@ -1103,9 +1103,8 @@ impl<P: ProgressBars, S: IndexedTree> Repository<P, S> {
         &self,
         node: &Node,
         ls_opts: &LsOptions,
-        recursive: bool,
     ) -> RusticResult<impl Iterator<Item = RusticResult<(PathBuf, Node)>> + Clone> {
-        NodeStreamer::new_with_glob(self.index().clone(), node, ls_opts, recursive)
+        NodeStreamer::new_with_glob(self.index().clone(), node, ls_opts)
     }
 
     /// Restore a given [`RestorePlan`] to a local destination

src/commands/backup.rs

@@ -10,17 +10,15 @@ use crate::{
     {status_err, Application, RUSTIC_APP},
 };
 use abscissa_core::{Command, Runnable, Shutdown};
-use anyhow::{bail, Result};
+use anyhow::{bail, Context, Result};
 use log::{debug, info, warn};
 
-use chrono::Local;
-
 use merge::Merge;
 use serde::Deserialize;
 
 use rustic_core::{
-    BackupOpts, LocalSourceFilterOptions, LocalSourceSaveOptions, ParentOpts, PathList,
-    SnapshotFile, SnapshotOptions,
+    BackupOptions, LocalSourceFilterOptions, LocalSourceSaveOptions, ParentOptions, PathList,
+    SnapshotOptions,
 };
 
 /// `backup` subcommand
@@ -60,7 +58,7 @@ pub struct BackupCmd {
 
     #[clap(flatten, next_help_heading = "Options for parent processing")]
     #[serde(flatten)]
-    parent_opts: ParentOpts,
+    parent_opts: ParentOptions,
 
     #[clap(flatten, next_help_heading = "Exclude options")]
     #[serde(flatten)]
@@ -98,13 +96,6 @@ impl Runnable for BackupCmd {
 
 impl BackupCmd {
     fn inner_run(&self) -> Result<()> {
-        let time = Local::now();
-
-        let command: String = std::env::args_os()
-            .map(|s| s.to_string_lossy().to_string())
-            .collect::<Vec<_>>()
-            .join(" ");
-
         let config = RUSTIC_APP.config();
 
         let repo = open_repository(&config)?.to_indexed_ids()?;
@@ -123,21 +114,26 @@ impl BackupCmd {
 
         let config_sources: Vec<_> = config_opts
             .iter()
-            .filter_map(|opt| match PathList::from_string(&opt.source, true) {
+            .map(|opt| -> Result<_> {
+                Ok(PathList::from_string(&opt.source)?
+                    .sanitize()
+                    .with_context(|| {
+                        format!("error sanitizing source=\"{}\" in config file", opt.source)
+                    })?
+                    .merge())
+            })
+            .filter_map(|p| match p {
                 Ok(paths) => Some(paths),
                 Err(err) => {
-                    warn!(
-                        "error sanitizing source=\"{}\" in config file: {err}",
-                        opt.source
-                    );
+                    warn!("{err}");
                     None
                 }
             })
             .collect();
 
         let sources = match (self.cli_sources.is_empty(), config_opts.is_empty()) {
             (false, _) => {
-                let item = PathList::from_strings(&self.cli_sources, true)?;
+                let item = PathList::from_strings(&self.cli_sources).sanitize()?;
                 vec![item]
             }
             (true, false) => {
@@ -174,15 +170,14 @@ impl BackupCmd {
             // merge "backup" section from config file, if given
             opts.merge(config.backup.clone());
 
-            let snap = SnapshotFile::new_from_options(&opts.snap_opts, time, command.clone())?;
-            let backup_opts = BackupOpts {
-                stdin_filename: opts.stdin_filename,
-                as_path: opts.as_path,
-                parent_opts: opts.parent_opts,
-                ignore_save_opts: opts.ignore_save_opts,
-                ignore_filter_opts: opts.ignore_filter_opts,
-            };
-            let snap = repo.backup(&backup_opts, source.clone(), snap, config.global.dry_run)?;
+            let backup_opts = BackupOptions::default()
+                .stdin_filename(opts.stdin_filename)
+                .as_path(opts.as_path)
+                .parent_opts(opts.parent_opts)
+                .ignore_save_opts(opts.ignore_save_opts)
+                .ignore_filter_opts(opts.ignore_filter_opts)
+                .dry_run(config.global.dry_run);
+            let snap = repo.backup(&backup_opts, source.clone(), opts.snap_opts.to_snapshot()?)?;
 
             if opts.json {
                 let mut stdout = std::io::stdout();

src/commands/cat.rs

@@ -8,7 +8,7 @@ use abscissa_core::{Command, Runnable, Shutdown};
 
 use anyhow::Result;
 
-use rustic_core::{BlobType, FileType};
+use rustic_core::repofile::{BlobType, FileType};
 
 /// `cat` subcommand
 #[derive(clap::Parser, Command, Debug)]
@@ -64,10 +64,10 @@ impl CatCmd {
             CatSubCmd::Config => repo.cat_file(FileType::Config, "")?,
             CatSubCmd::Index(opt) => repo.cat_file(FileType::Index, &opt.id)?,
             CatSubCmd::Snapshot(opt) => repo.cat_file(FileType::Snapshot, &opt.id)?,
-            // special treatment for cating blobs: read the index and use it to locate the blob
+            // special treatment for 'cat'ing blobs: read the index and use it to locate the blob
             CatSubCmd::TreeBlob(opt) => repo.to_indexed()?.cat_blob(BlobType::Tree, &opt.id)?,
             CatSubCmd::DataBlob(opt) => repo.to_indexed()?.cat_blob(BlobType::Data, &opt.id)?,
-            // special treatment for cating a tree within a snapshot
+            // special treatment for 'cat'ing a tree within a snapshot
             CatSubCmd::Tree(opt) => repo
                 .to_indexed()?
                 .cat_tree(&opt.snap, |sn| config.snapshot_filter.matches(sn))?,

src/commands/check.rs

@@ -6,13 +6,13 @@ use crate::{commands::open_repository, status_err, Application, RUSTIC_APP};
 
 use abscissa_core::{Command, Runnable, Shutdown};
 use anyhow::Result;
-use rustic_core::CheckOpts;
+use rustic_core::CheckOptions;
 
 /// `check` subcommand
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct CheckCmd {
     #[clap(flatten)]
-    opts: CheckOpts,
+    opts: CheckOptions,
 }
 
 impl Runnable for CheckCmd {

src/commands/config.rs

@@ -8,13 +8,13 @@ use abscissa_core::{Command, Runnable, Shutdown};
 
 use anyhow::Result;
 
-use rustic_core::ConfigOpts;
+use rustic_core::ConfigOptions;
 
 /// `config` subcommand
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct ConfigCmd {
     #[clap(flatten)]
-    config_opts: ConfigOpts,
+    config_opts: ConfigOptions,
 }
 
 impl Runnable for ConfigCmd {

src/commands/copy.rs

@@ -12,7 +12,7 @@ use log::{error, info};
 use merge::Merge;
 use serde::Deserialize;
 
-use rustic_core::{CopySnapshot, Id, KeyOpts, Open, Repository, RepositoryOptions};
+use rustic_core::{CopySnapshot, Id, KeyOptions, Repository, RepositoryOptions};
 
 /// `copy` subcommand
 #[derive(clap::Parser, Command, Debug)]
@@ -26,7 +26,7 @@ pub(crate) struct CopyCmd {
     init: bool,
 
     #[clap(flatten, next_help_heading = "Key options (when using --init)")]
-    key_opts: KeyOpts,
+    key_opts: KeyOptions,
 }
 
 #[derive(Default, Clone, Debug, Deserialize, Merge)]

src/commands/diff.rs

@@ -11,9 +11,9 @@ use std::path::{Path, PathBuf};
 use anyhow::{bail, Context, Result};
 
 use rustic_core::{
-    BlobType, IndexedFull, LocalDestination, LocalSource, LocalSourceFilterOptions,
-    LocalSourceSaveOptions, Node, NodeType, ReadSourceEntry, Repository, RusticResult,
-    TreeStreamerOptions,
+    repofile::{BlobType, Node, NodeType},
+    IndexedFull, LocalDestination, LocalSource, LocalSourceFilterOptions, LocalSourceSaveOptions,
+    LsOptions, ReadSourceEntry, Repository, RusticResult,
 };
 
 /// `diff` subcommand
@@ -60,7 +60,7 @@ impl DiffCmd {
         _ = match (id1, id2) {
             (Some(id1), Some(id2)) => {
                 // diff between two snapshots
-                let snaps = repo.get_snapshots(&[id1.to_string(), id2.to_string()])?;
+                let snaps = repo.get_snapshots(&[id1, id2])?;
 
                 let snap1 = &snaps[0];
                 let snap2 = &snaps[1];
@@ -69,8 +69,8 @@ impl DiffCmd {
                 let node2 = repo.node_from_snapshot_and_path(snap2, path2)?;
 
                 diff(
-                    repo.ls(&node1, &TreeStreamerOptions::default(), true)?,
-                    repo.ls(&node2, &TreeStreamerOptions::default(), true)?,
+                    repo.ls(&node1, &LsOptions::default())?,
+                    repo.ls(&node2, &LsOptions::default())?,
                     self.no_content,
                     |_path, node1, node2| Ok(node1.content == node2.content),
                     self.metadata,
@@ -106,7 +106,7 @@ impl DiffCmd {
                 });
 
                 diff(
-                    repo.ls(&node1, &TreeStreamerOptions::default(), true)?,
+                    repo.ls(&node1, &LsOptions::default())?,
                     src,
                     self.no_content,
                     |path, node1, _node2| identical_content_local(&local, &repo, path, node1),

src/commands/init.rs

@@ -9,16 +9,16 @@ use crate::{Application, RUSTIC_APP};
 
 use dialoguer::Password;
 
-use rustic_core::{ConfigOpts, KeyOpts, Repository};
+use rustic_core::{ConfigOptions, KeyOptions, Repository};
 
 /// `init` subcommand
 #[derive(clap::Parser, Command, Debug)]
 pub(crate) struct InitCmd {
     #[clap(flatten, next_help_heading = "Key options")]
-    key_opts: KeyOpts,
+    key_opts: KeyOptions,
 
     #[clap(flatten, next_help_heading = "Config options")]
-    config_opts: ConfigOpts,
+    config_opts: ConfigOptions,
 }
 
 impl Runnable for InitCmd {
@@ -48,8 +48,8 @@ impl InitCmd {
 
 pub(crate) fn init<P, S>(
     repo: Repository<P, S>,
-    key_opts: &KeyOpts,
-    config_opts: &ConfigOpts,
+    key_opts: &KeyOptions,
+    config_opts: &ConfigOptions,
 ) -> Result<()> {
     let pass = repo.password()?.unwrap_or_else(|| {
         match Password::new()