matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Extract file-content-hashing functionality to new private function

Browse source
This commit is contained in:
Matthias Beyer 2016-06-23 15:26:18 +02:00
parent 7613526aff
commit 6757c673c4
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libimagref/src/reference.rs
View file

@ -5,6 +5,8 @@ use std::path::PathBuf;
use std::ops::Deref; use std::ops::Deref;
use std::ops::DerefMut; use std::ops::DerefMut;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::fs::File;
use std::io::Read;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
use libimagstore::storeid::StoreId; use libimagstore::storeid::StoreId;
@ -13,6 +15,8 @@ use libimagstore::store::Store;
use libimagerror::into::IntoError; use libimagerror::into::IntoError;
use toml::Value; use toml::Value;
use crypto::sha1::Sha1;
use crypto::digest::Digest;
use error::RefErrorKind as REK; use error::RefErrorKind as REK;
use flags::RefFlags; use flags::RefFlags;
@ -43,11 +47,6 @@ impl<'a> Ref<'a> {
/// Create a Ref object which refers to `pb` /// Create a Ref object which refers to `pb`
pub fn create(store: &'a Store, pb: PathBuf, flags: RefFlags) -> Result<Ref<'a>> { pub fn create(store: &'a Store, pb: PathBuf, flags: RefFlags) -> Result<Ref<'a>> {
use std::fs::File;
use std::io::Read;
use crypto::sha1::Sha1;
use crypto::digest::Digest;
if !pb.exists() { if !pb.exists() {
return Err(REK::RefTargetDoesNotExist.into_error()); return Err(REK::RefTargetDoesNotExist.into_error());
} }
@ -64,11 +63,7 @@ impl<'a> Ref<'a> {
// we hash the contents of the file and return (file, hash) // we hash the contents of the file and return (file, hash)
.and_then(|mut file| { .and_then(|mut file| {
let opt_contenthash = if flags.get_content_hashing() { let opt_contenthash = if flags.get_content_hashing() {
let mut hasher = Sha1::new(); Some(hash_file_contents(&mut file))
let mut s = String::new();
file.read_to_string(&mut s);
hasher.input_str(&s[..]);
Some(hasher.result_str())
} else { } else {
None None
}; };
@ -285,3 +280,12 @@ impl<'a> DerefMut for Ref<'a> {
} }
} }
fn hash_file_contents(f: &mut File) -> String {
let mut hasher = Sha1::new();
let mut s = String::new();
f.read_to_string(&mut s);
hasher.input_str(&s[..]);
hasher.result_str()
}