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

src/tools.rs: move hex_to_digest and digest_to_hex to proxmox::tools

Browse Source
This commit is contained in:
Dietmar Maurer
2019-06-14 11:40:04 +02:00
parent 00388226e6
commit bffd40d6b7
9 changed files with 21 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backup/chunk_store.rs
View File

@ -148,7 +148,7 @@ impl ChunkStore {
let mut chunk_path = self.chunk_dir.clone();
let prefix = digest_to_prefix(&digest);
chunk_path.push(&prefix);
let digest_str = tools::digest_to_hex(&digest);
let digest_str = proxmox::tools::digest_to_hex(&digest);
chunk_path.push(&digest_str);
const UTIME_NOW: i64 = ((1 << 30) - 1);
@ -177,7 +177,7 @@ impl ChunkStore {
let mut chunk_path = self.chunk_dir.clone();
let prefix = digest_to_prefix(digest);
chunk_path.push(&prefix);
let digest_str = tools::digest_to_hex(digest);
let digest_str = proxmox::tools::digest_to_hex(digest);
chunk_path.push(&digest_str);
let mut file = std::fs::File::open(&chunk_path)
@ -324,12 +324,12 @@ impl ChunkStore {
let digest = chunk.digest();
//println!("DIGEST {}", tools::digest_to_hex(digest));
//println!("DIGEST {}", proxmox::tools::digest_to_hex(digest));
let mut chunk_path = self.chunk_dir.clone();
let prefix = digest_to_prefix(digest);
chunk_path.push(&prefix);
let digest_str = tools::digest_to_hex(digest);
let digest_str = proxmox::tools::digest_to_hex(digest);
chunk_path.push(&digest_str);
let lock = self.mutex.lock();

4
src/backup/dynamic_index.rs
View File

@ -182,7 +182,7 @@ impl DynamicIndexReader {
let digest = self.chunk_digest(pos);
if let Err(err) = self.store.touch_chunk(digest) {
bail!("unable to access chunk {}, required by {:?} - {}",
tools::digest_to_hex(digest), self.filename, err);
proxmox::tools::digest_to_hex(digest), self.filename, err);
}
}
Ok(())
@ -589,7 +589,7 @@ impl DynamicChunkWriter {
}
println!("ADD CHUNK {:016x} {} {}% {} {}", self.chunk_offset, chunk_size,
(compressed_size*100)/(chunk_size as u64), is_duplicate, tools::digest_to_hex(digest));
(compressed_size*100)/(chunk_size as u64), is_duplicate, proxmox::tools::digest_to_hex(digest));
self.index.add_chunk(self.chunk_offset as u64, &digest)?;
self.chunk_buffer.truncate(0);
return Ok(());

4
src/backup/fixed_index.rs
View File

@ -158,7 +158,7 @@ impl FixedIndexReader {
let digest = self.index_digest(pos).unwrap();
if let Err(err) = self.store.touch_chunk(digest) {
bail!("unable to access chunk {}, required by {:?} - {}",
tools::digest_to_hex(digest), self.filename, err);
proxmox::tools::digest_to_hex(digest), self.filename, err);
}
}
@ -361,7 +361,7 @@ impl FixedIndexWriter {
let digest = chunk_info.chunk.digest();
println!("ADD CHUNK {} {} {}% {} {}", pos, chunk_len,
(compressed_size*100)/(chunk_len as u64), is_duplicate, tools::digest_to_hex(digest));
(compressed_size*100)/(chunk_len as u64), is_duplicate, proxmox::tools::digest_to_hex(digest));
if is_duplicate {
stat.duplicate_chunks += 1;