matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Resolve TODO: Ref::get_path_hash() should return Result<String>

Browse source
This commit is contained in:
Matthias Beyer 2016-10-19 20:05:02 +02:00
parent 41aaaf9ddc
commit 7a5134ead2
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libimagref/src/error.rs
View file

@ -23,6 +23,7 @@ generate_error_module!(
StoreWriteError => "Store write error",
IOError => "IO Error",
UTF8Error => "UTF8 Error",
StoreIdError => "Error with storeid",
HeaderTypeError => "Header type error",
HeaderFieldMissingError => "Header field missing error",
HeaderFieldWriteError => "Header field cannot be written",

2
libimagref/src/lister.rs
View file

@ -146,7 +146,7 @@ fn lister_fn(fle: FileLockEntry,
is_changed,
is_changed_content,
is_changed_permiss,
r.get_path_hash().unwrap_or_else(|| String::from("Cannot get hash")),
r.get_path_hash().unwrap_or_else(|_| String::from("Cannot get hash")),
r.get_location())
})
.map_err(|e| LEK::FormatError.into_error_with_cause(Box::new(e)))

7
libimagref/src/reference.rs
View file

@ -34,7 +34,6 @@ use libimagstore::storeid::StoreId;
use libimagstore::storeid::IntoStoreId;
use libimagstore::store::Store;
use libimagerror::into::IntoError;
use libimagerror::trace::MapErrTrace;
use toml::Value;
@ -249,18 +248,18 @@ impl<'a> Ref<'a> {
}
/// Get the hash from the path of the ref
pub fn get_path_hash(&self) -> Option<String> {
pub fn get_path_hash(&self) -> Result<String> {
self.0
.get_location()
.clone()
.into_pathbuf()
.map_err_trace()
.ok() // TODO: Hiding the error here is not so nice
.map_err_into(REK::StoreIdError)
.and_then(|pb| {
pb.file_name()
.and_then(|osstr| osstr.to_str())
.and_then(|s| s.split("~").next())
.map(String::from)
.ok_or(REK::StoreIdError.into_error())
})
}