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

backup/parent: Use ctime and mtime; add --ignore options

Browse Source
This commit is contained in:
Alexander Weiss 2022-08-23 09:33:35 +02:00
parent 4b99e942b3
commit 5964c71201
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/archiver/parent.rs
View File

@ -10,6 +10,8 @@ pub struct Parent<BE: IndexedBackend> {
tree: Option<Tree>,
be: BE,
node_idx: usize,
ignore_ctime: bool,
ignore_inode: bool,
}
pub enum ParentResult<T> {
@ -19,7 +21,7 @@ pub enum ParentResult<T> {
}
impl<BE: IndexedBackend> Parent<BE> {
pub async fn new(be: &BE, tree_id: Option<Id>) -> Self {
pub async fn new(be: &BE, tree_id: Option<Id>, ignore_ctime: bool, ignore_inode: bool) -> Self {
// if tree_id is given, load tree from backend. Turn errors into None.
// TODO: print warning when loading failed
let tree = match tree_id {
@ -30,6 +32,8 @@ impl<BE: IndexedBackend> Parent<BE> {
tree,
be: be.clone(),
node_idx: 0,
ignore_ctime,
ignore_inode,
}
}
@ -58,13 +62,20 @@ impl<BE: IndexedBackend> Parent<BE> {
}
pub fn is_parent(&mut self, node: &Node) -> ParentResult<&Node> {
// use new variables as the mutable borrow is used later
let ignore_ctime = self.ignore_ctime;
let ignore_inode = self.ignore_inode;
match self.p_node(node) {
None => ParentResult::NotFound,
Some(p_node) => {
if p_node.node_type == node.node_type
&& p_node.meta.size == node.meta.size
&& p_node.meta().ctime == node.meta.ctime
&& (node.meta.inode == 0 || p_node.meta.inode == node.meta.inode)
&& p_node.meta.mtime == node.meta.mtime
&& (ignore_ctime || p_node.meta.ctime == node.meta.ctime)
&& (ignore_inode
|| p_node.meta.inode == 0
|| p_node.meta.inode == node.meta.inode)
{
ParentResult::Matched(p_node)
} else {
@ -91,6 +102,8 @@ impl<BE: IndexedBackend> Parent<BE> {
tree,
be: self.be.clone(),
node_idx: 0,
ignore_ctime: self.ignore_ctime,
ignore_inode: self.ignore_inode,
})
}
}

10
src/commands/backup.rs
View File

@ -31,6 +31,14 @@ pub(super) struct Opts {
#[clap(long, short, conflicts_with = "parent")]
force: bool,
/// Ignore ctime changes when checking for modified files
#[clap(long, conflicts_with = "force")]
ignore_ctime: bool,
/// Ignore inode number changes when checking for modified files
#[clap(long, conflicts_with = "force")]
ignore_inode: bool,
/// Tags to add to backup (can be specified multiple times)
#[clap(long, value_name = "TAG[,TAG,..]")]
tag: Vec<StringList>,
@ -119,7 +127,7 @@ pub(super) async fn execute(
let index = IndexBackend::only_full_trees(&be, progress_counter()).await?;
let parent = Parent::new(&index, parent_tree).await;
let parent = Parent::new(&index, parent_tree, opts.ignore_ctime, opts.ignore_inode).await;
let src = LocalSource::new(opts.ignore_opts, backup_path.to_path_buf())?;