-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
reorganized files to prepare code for writing more test
1 parent
2d5ab5d
commit 8135ae8
Showing
2 changed files
with
120 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,120 @@ | ||
| pub mod patterns; | ||
| pub mod hasher; | ||
| pub mod finalizable; | ||
| pub mod enc_dec; | ||
| pub mod comp_decomp_2; | ||
| pub mod fixed_size_writer; | ||
| pub mod joiner; | ||
| pub mod multi_files_reader; | ||
| pub mod buffered_reader; | ||
| pub mod stats; | ||
| mod hasher; | ||
| use hasher::DataHasher; | ||
|
|
||
| mod finalizable; | ||
| use finalizable::DataSink; | ||
|
|
||
| mod enc_dec; | ||
| use enc_dec::{Encryptor, Decryptor}; | ||
|
|
||
| mod comp_decomp_2; | ||
| use comp_decomp_2::{Compressor2, Decompressor2}; | ||
|
|
||
| mod fixed_size_writer; | ||
| use fixed_size_writer::FixedSizeWriter; | ||
|
|
||
| mod joiner; | ||
| use joiner::{Joiner,read_metadata}; | ||
|
|
||
| mod multi_files_reader; | ||
| use multi_files_reader::MultiFilesReader; | ||
|
|
||
| mod buffered_reader; | ||
| use buffered_reader::BufferedReader; | ||
|
|
||
| mod stats; | ||
| use stats::Stats; | ||
|
|
||
| mod multi_files_writer; | ||
| use multi_files_writer::MultiFilesWriter; | ||
|
|
||
| mod splitter; | ||
| use splitter::Splitter; | ||
|
|
||
| pub mod arg_opts; | ||
| pub mod multi_files_writer; | ||
| pub mod splitter; | ||
| pub mod patterns; | ||
|
|
||
| use std::time::{SystemTime, UNIX_EPOCH}; | ||
| use std::io::{stdin, stdout}; | ||
| use std::io::Write; | ||
|
|
||
| pub fn backup( | ||
| auth: &str, auth_every_bytes: usize, split_size_bytes: usize, out_template: &str, | ||
| pass: &str, compress_level: u8, buf_size_bytes: usize) -> Result<(), String> | ||
| { | ||
| let hash_seed = SystemTime::now() | ||
| .duration_since(UNIX_EPOCH) | ||
| .unwrap() // SAFE: rely on fact that now() cannot return anything earlier than EPOCH | ||
| .as_secs(); | ||
|
|
||
| let mut stats = Stats::new(); | ||
| stats.auth_string = String::from(auth); | ||
| stats.auth_chunk_size = auth_every_bytes; | ||
| stats.out_chunk_size = Some(split_size_bytes); | ||
| stats.hash_seed = Some(hash_seed); | ||
|
|
||
| let mut fmgr = MultiFilesWriter::new(); | ||
| let mut spl: Splitter<'_, MultiFilesWriter> = Splitter::new(&mut fmgr, split_size_bytes, out_template)?; | ||
| { | ||
| let enc = Encryptor::new(&mut spl, pass, auth); | ||
| let mut fbuf = FixedSizeWriter::new(enc, auth_every_bytes); | ||
| let mut comp = Compressor2::new(&mut fbuf, compress_level as u32); | ||
| { | ||
| let mut hash_copier = DataHasher::with_writer(&mut comp, hash_seed); | ||
|
|
||
| let sin = &mut stdin(); | ||
| let mut stdinbuf = BufferedReader::new( | ||
| sin, &mut hash_copier, buf_size_bytes / 8, buf_size_bytes); | ||
|
|
||
| stdinbuf.read_and_write_all()?; | ||
|
|
||
| stats.in_data_len = Some(hash_copier.counter()); | ||
| stats.in_data_hash = Some(hash_copier.result()); | ||
| } | ||
| stats.compressed_len = Some(comp.compressed()); | ||
| } | ||
|
|
||
| spl.write_metadata(&stats) | ||
| } | ||
|
|
||
|
|
||
| pub fn check(restore: bool, cfg_path: &str, pass: &str, buf_size_bytes: usize, _check_free_space: bool) -> Result<(), String> { | ||
| struct StdoutWriter; | ||
|
|
||
| impl DataSink for StdoutWriter { | ||
| fn add(&mut self, data: &[u8]) -> Result<(), String> { | ||
| //eprintln!("writing {} bytes to stdout", data.len()); | ||
| stdout().write_all(data).map_err(|e| format!("could not write {} bytes to stdout: {}", data.len(), e)) | ||
| } | ||
|
|
||
| fn finish(&mut self) -> Result<(), String> { | ||
| stdout().flush().map_err(|e| format!("could not flush to stdout: {}", e)) | ||
| } | ||
| } | ||
|
|
||
| let stats = read_metadata::<MultiFilesReader>(cfg_path)?; | ||
|
|
||
| let mut out = StdoutWriter{}; | ||
|
|
||
| let mut hash_copier = | ||
| if restore { DataHasher::with_writer(&mut out, stats.hash_seed.unwrap() ) } | ||
| else { DataHasher::with_null(stats.hash_seed.unwrap()) }; // SAFE: read_metadata checked that all is set | ||
|
|
||
| { | ||
| let mut decomp = Decompressor2::new(&mut hash_copier); | ||
| let dec = Decryptor::new(&mut decomp, pass, &stats.auth_string); | ||
| let mut fbuf = FixedSizeWriter::new(dec, stats.auth_chunk_size + 16); | ||
| let fmgr = MultiFilesReader::new(); | ||
|
|
||
| let mut joiner = Joiner::from_metadata( | ||
| fmgr, &mut fbuf, cfg_path, buf_size_bytes)?; | ||
|
|
||
| joiner.read_and_write_all()?; | ||
| } | ||
|
|
||
| if hash_copier.result() != stats.in_data_hash.unwrap() { // SAFE: read_metadata checked that all is set | ||
| Err("hash verification error".to_owned()) | ||
| } else { | ||
| Ok(()) | ||
| } | ||
| } |