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

Tree: Add function subtree_id and use in cat

Browse Source
This commit is contained in:
Alexander Weiss 2022-07-29 22:01:13 +02:00
parent 65a410efbb
commit 613f5da506
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/blob/tree.rs
View File

@ -1,6 +1,6 @@
use std::collections::{HashSet, VecDeque};
use std::mem;
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use std::pin::Pin;
use anyhow::{anyhow, Result};
@ -56,6 +56,24 @@ impl Tree {
Ok(serde_json::from_slice(&data)?)
}
pub async fn subtree_id(be: &impl IndexedBackend, mut id: Id, path: &Path) -> Result<Id> {
for p in path.iter() {
let p = p.to_str().unwrap();
// TODO: check for root instead
if p == "/" {
continue;
}
let tree = Tree::from_backend(be, id).await?;
let node = tree
.nodes()
.iter()
.find(|node| node.name() == p)
.ok_or_else(|| anyhow!("{} not found", p))?;
id = node.subtree().ok_or_else(|| anyhow!("{} is no dir", p))?;
}
Ok(id)
}
}
/// NodeStreamer recursively streams all nodes of a given tree including all subtrees in-order

20
src/commands/cat.rs
View File

@ -1,6 +1,6 @@
use std::path::PathBuf;
use anyhow::{anyhow, Result};
use anyhow::Result;
use clap::{Parser, Subcommand};
use indicatif::ProgressBar;
@ -78,23 +78,7 @@ async fn cat_blob(be: &impl DecryptReadBackend, tpe: BlobType, opt: IdOpt) -> Re
async fn cat_tree(be: &impl DecryptReadBackend, opts: TreeOpts) -> Result<()> {
let snap = SnapshotFile::from_str(be, &opts.id, |_| true, progress_counter()).await?;
let index = IndexBackend::new(be, progress_counter()).await?;
let mut id = snap.tree;
for p in opts.path.iter() {
let p = p.to_str().unwrap();
// TODO: check for root instead
if p == "/" {
continue;
}
let tree = Tree::from_backend(&index, id).await?;
let node = tree
.nodes()
.iter()
.find(|node| node.name() == p)
.ok_or_else(|| anyhow!("{} not found", p))?;
id = node.subtree().ok_or_else(|| anyhow!("{} is no dir", p))?;
}
let id = Tree::subtree_id(&index, snap.tree, &opts.path).await?;
let data = index.blob_from_backend(&BlobType::Tree, &id).await?;
println!("{}", String::from_utf8(data)?);