matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Have and use internal error types for better error messages

Browse source
This commit is contained in:
Matthias Beyer 2016-09-06 14:24:57 +02:00
parent 04166dd7a3
commit 46123622b2
1 changed files with 42 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
libimagstorestdhook/src/flock.rs
View file

@ -9,38 +9,69 @@ use libimagstore::hook::accessor::StoreIdAccessor;
use libimagstore::hook::accessor::MutableHookDataAccessor; use libimagstore::hook::accessor::MutableHookDataAccessor;
use libimagstore::hook::accessor::NonMutableHookDataAccessor; use libimagstore::hook::accessor::NonMutableHookDataAccessor;
use libimagstore::hook::result::HookResult; use libimagstore::hook::result::HookResult;
use libimagstore::hook::error::{HookError, HookErrorKind, MapErrInto}; use libimagstore::hook::error::{HookError, HookErrorKind};
use libimagstore::storeid::StoreId; use libimagstore::storeid::StoreId;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
use libimagstore::store::Entry; use libimagstore::store::Entry;
mod error {
generate_error_imports!();
generate_error_types!(FlockError, FlockErrorKind,
IOError => "IO Error",
StoreIdPathBufConvertError => "Error while converting StoreId to PathBuf",
FileOpenError => "Error on File::open()",
LockError => "Error while lock()ing",
UnlockError => "Error while unlock()ing"
);
}
use self::error::FlockError as FE;
use self::error::FlockErrorKind as FEK;
use self::error::MapErrInto;
trait EntryFlock { trait EntryFlock {
fn lock(&self) -> HookResult<()>; fn lock(&self) -> Result<(), FE>;
fn unlock(&self) -> HookResult<()>; fn unlock(&self) -> Result<(), FE>;
} }
impl EntryFlock for Entry { impl EntryFlock for Entry {
fn lock(&self) -> HookResult<()> { fn lock(&self) -> Result<(), FE> {
use std::fs::File; use std::fs::File;
self.get_location() self.get_location()
.clone() .clone()
.into_pathbuf() .into_pathbuf()
.map_err_into(HookErrorKind::HookExecutionError) .map_err_into(FEK::StoreIdPathBufConvertError)
.and_then(|loc| File::open(loc).map_err_into(HookErrorKind::HookExecutionError)) .and_then(|loc| {
.and_then(|file| file.lock_exclusive().map_err_into(HookErrorKind::HookExecutionError)) File::open(loc)
.map_err_into(FEK::FileOpenError)
.map_err_into(FEK::IOError)
})
.and_then(|file| {
file.lock_exclusive()
.map_err_into(FEK::LockError)
.map_err_into(FEK::IOError)
})
} }
fn unlock(&self) -> HookResult<()> { fn unlock(&self) -> Result<(), FE> {
use std::fs::File; use std::fs::File;
self.get_location() self.get_location()
.clone() .clone()
.into_pathbuf() .into_pathbuf()
.map_err_into(HookErrorKind::HookExecutionError) .map_err_into(FEK::StoreIdPathBufConvertError)
.and_then(|loc| File::open(loc).map_err_into(HookErrorKind::HookExecutionError)) .and_then(|loc| {
.and_then(|file| file.unlock().map_err_into(HookErrorKind::HookExecutionError)) File::open(loc)
.map_err_into(FEK::FileOpenError)
.map_err_into(FEK::IOError)
})
.and_then(|file| {
file.unlock()
.map_err_into(FEK::UnlockError)
.map_err_into(FEK::LockError)
.map_err_into(FEK::IOError)
})
} }
} }