mirrors/rustic
2
0
Fork 0
mirror of https://github.com/rustic-rs/rustic.git synced 2025-10-26 11:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix paths in snapshot for multiple paths

Browse Source
This commit is contained in:
Alexander Weiss 2023-03-08 22:32:53 +01:00
parent 7a40896021
commit 44a5f003cf
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/commands/backup.rs
View File

@ -1,7 +1,7 @@
use std::path::PathBuf;
use std::str::FromStr;
use anyhow::{anyhow, bail, Result};
use anyhow::{bail, Result};
use chrono::Local;
use clap::{AppSettings, Parser};
use log::*;
@ -172,23 +172,12 @@ pub(super) fn execute(
None => None,
Some(p) => Some(p.parse_dot()?.to_path_buf()),
};
let backup_path_str = match &as_path {
Some(as_path) => vec![as_path],
None => backup_path.iter().collect(),
};
let backup_path_str = backup_path_str
.iter()
.map(|p| {
Ok(p.to_str()
.ok_or_else(|| anyhow!("non-unicode path {:?}", backup_path_str))?
.to_string())
})
.collect::<Result<Vec<_>>>()?
.join("\n");
let mut snap = SnapshotFile::new_from_options(opts.snap_opts, time, command.clone())?;
snap.paths.add(backup_path_str.clone());
match &as_path {
Some(p) => snap.paths.set_paths(&[p.to_path_buf()])?,
None => snap.paths.set_paths(&backup_path)?,
};
// get suitable snapshot group from snapshot and opts.group_by. This is used to filter snapshots for the parent detection
let group = SnapshotGroup::from_sn(
@ -226,7 +215,7 @@ pub(super) fn execute(
archiver.backup_reader(
std::io::stdin(),
Node::new(
backup_path_str,
opts.stdin_filename,
NodeType::File,
Metadata::default(),
None,

12
src/repofile/snapshotfile.rs
View File

@ -550,6 +550,18 @@ impl StringList {
}
}
pub fn set_paths(&mut self, paths: &[PathBuf]) -> Result<()> {
self.0 = paths
.iter()
.map(|p| {
Ok(p.to_str()
.ok_or_else(|| anyhow!("non-unicode path {:?}", p))?
.to_string())
})
.collect::<Result<Vec<_>>>()?;
Ok(())
}
pub fn remove_all(&mut self, string_lists: Vec<StringList>) {
self.0
.retain(|s| !string_lists.iter().any(|sl| sl.contains(s)));