refactor: various
parent
49cf2a5506
commit
1dfa08c955
|
@ -206,14 +206,7 @@ fn main() -> Result<()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
let entity = match entity {
|
let entity = match entity {
|
||||||
entity if entity.starts_with('=') => {
|
entity if entity.starts_with('=') => hash_path(&entity[1..])?.to_string(),
|
||||||
let filepath = Path::new(&entity[1..]);
|
|
||||||
debug!("Hashing {:?}...", filepath);
|
|
||||||
let fbuffer = FileBuffer::open(&filepath)?;
|
|
||||||
let digest = hash(&fbuffer);
|
|
||||||
trace!("Finished hashing {:?}...", &filepath);
|
|
||||||
Address::Hash(digest).to_string()
|
|
||||||
}
|
|
||||||
entity if entity.starts_with("http") => Address::Url(entity).to_string(),
|
entity if entity.starts_with("http") => Address::Url(entity).to_string(),
|
||||||
_ => entity,
|
_ => entity,
|
||||||
};
|
};
|
||||||
|
@ -245,14 +238,7 @@ fn main() -> Result<()> {
|
||||||
format,
|
format,
|
||||||
} => {
|
} => {
|
||||||
let address = match _type {
|
let address = match _type {
|
||||||
AddressType::File => {
|
AddressType::File => hash_path(&input)?,
|
||||||
let filepath = PathBuf::from(input);
|
|
||||||
debug!("Hashing {:?}...", filepath);
|
|
||||||
let fbuffer = FileBuffer::open(&filepath)?;
|
|
||||||
let digest = hash(&fbuffer);
|
|
||||||
trace!("Finished hashing {:?}...", &filepath);
|
|
||||||
Address::Hash(digest)
|
|
||||||
}
|
|
||||||
AddressType::Sha256sum => {
|
AddressType::Sha256sum => {
|
||||||
let digest = multibase::Base::Base16Lower.decode(input)?;
|
let digest = multibase::Base::Base16Lower.decode(input)?;
|
||||||
Address::Hash(upend::util::hash::Hash(digest))
|
Address::Hash(upend::util::hash::Hash(digest))
|
||||||
|
@ -456,3 +442,12 @@ fn main() -> Result<()> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn hash_path<P: AsRef<Path>>(filepath: P) -> Result<Address> {
|
||||||
|
let filepath = filepath.as_ref();
|
||||||
|
debug!("Hashing {:?}...", filepath);
|
||||||
|
let fbuffer = FileBuffer::open(filepath)?;
|
||||||
|
let digest = hash(&fbuffer);
|
||||||
|
trace!("Finished hashing {:?}...", filepath);
|
||||||
|
Ok(Address::Hash(digest))
|
||||||
|
}
|
||||||
|
|
|
@ -777,7 +777,7 @@ mod test {
|
||||||
let job_container = JobContainer::new();
|
let job_container = JobContainer::new();
|
||||||
|
|
||||||
// Store scan
|
// Store scan
|
||||||
let rescan_result = store.update(&open_result.db, job_container.clone(), false);
|
let rescan_result = store.update(&open_result.db, job_container, false);
|
||||||
assert!(rescan_result.is_ok());
|
assert!(rescan_result.is_ok());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -821,7 +821,7 @@ mod test {
|
||||||
let rescan_result = rescan_result.unwrap();
|
let rescan_result = rescan_result.unwrap();
|
||||||
assert_eq!(rescan_result.len(), 3);
|
assert_eq!(rescan_result.len(), 3);
|
||||||
rescan_result.into_iter().for_each(|outcome| match outcome {
|
rescan_result.into_iter().for_each(|outcome| match outcome {
|
||||||
UpdatePathOutcome::Added(_) => assert!(true),
|
UpdatePathOutcome::Added(_) => (),
|
||||||
UpdatePathOutcome::Skipped(path) => assert_eq!(path, empty_path),
|
UpdatePathOutcome::Skipped(path) => assert_eq!(path, empty_path),
|
||||||
outcome => panic!("Unexpected outcome: {:?}", outcome),
|
outcome => panic!("Unexpected outcome: {:?}", outcome),
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue