tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify pxar module structure

Browse Source
This commit is contained in:
Dietmar Maurer
2019-03-15 08:24:32 +01:00
parent 1ef46b81d3
commit 3dbfe5b142
6 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/pxar.rs
View File

@ -12,8 +12,7 @@ use serde_json::{Value};
use std::io::Write;
use std::path::{Path, PathBuf};
use proxmox_backup::pxar::encoder::*;
use proxmox_backup::pxar::decoder::*;
use proxmox_backup::pxar;
fn print_filenames(
param: Value,
@ -26,7 +25,7 @@ fn print_filenames(
let mut reader = std::io::BufReader::new(file);
let mut decoder = PxarDecoder::new(&mut reader);
let mut decoder = pxar::SequentialDecoder::new(&mut reader);
let stdout = std::io::stdout();
let mut out = stdout.lock();
@ -48,7 +47,7 @@ fn dump_archive(
let mut reader = std::io::BufReader::new(file);
let mut decoder = PxarDecoder::new(&mut reader);
let mut decoder = pxar::SequentialDecoder::new(&mut reader);
let stdout = std::io::stdout();
let mut out = stdout.lock();
@ -75,7 +74,7 @@ fn extract_archive(
let mut reader = std::io::BufReader::new(file);
let mut decoder = PxarDecoder::new(&mut reader);
let mut decoder = pxar::SequentialDecoder::new(&mut reader);
decoder.restore(Path::new(target), & |path| {
if verbose {
@ -110,7 +109,7 @@ fn create_archive(
let mut writer = std::io::BufWriter::with_capacity(1024*1024, file);
PxarEncoder::encode(source, &mut dir, &mut writer, all_file_systems, verbose)?;
pxar::Encoder::encode(source, &mut dir, &mut writer, all_file_systems, verbose)?;
writer.flush()?;