matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Flock hook: Rewrite EntryFlock trait to return HookResult

Browse source
This commit is contained in:
Matthias Beyer 2016-09-06 14:07:09 +02:00
parent af4a0bfaf2
commit 144a8bf897
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libimagstorestdhook/src/flock.rs
View file

@ -1,6 +1,3 @@
use std::io::Result as IoResult;
use std::path::PathBuf;
use toml::Value; use toml::Value;
use fs2::FileExt; use fs2::FileExt;
@ -12,30 +9,38 @@ 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}; use libimagstore::hook::error::{HookError, HookErrorKind, MapErrInto};
use libimagstore::storeid::StoreId; use libimagstore::storeid::StoreId;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
use libimagstore::store::Entry; use libimagstore::store::Entry;
trait EntryFlock { trait EntryFlock {
fn lock(&self) -> IoResult<()>; fn lock(&self) -> HookResult<()>;
fn unlock(&self) -> IoResult<()>; fn unlock(&self) -> HookResult<()>;
} }
impl EntryFlock for Entry { impl EntryFlock for Entry {
fn lock(&self) -> IoResult<()> { fn lock(&self) -> HookResult<()> {
use std::fs::File; use std::fs::File;
let location : PathBuf = self.get_location().clone().into(); self.get_location()
File::open(location).and_then(|file| file.lock_exclusive()) .clone()
.into_pathbuf()
.map_err_into(HookErrorKind::HookExecutionError)
.and_then(|loc| File::open(loc).map_err_into(HookErrorKind::HookExecutionError))
.and_then(|file| file.lock_exclusive().map_err_into(HookErrorKind::HookExecutionError))
} }
fn unlock(&self) -> IoResult<()> { fn unlock(&self) -> HookResult<()> {
use std::fs::File; use std::fs::File;
let location : PathBuf = self.get_location().clone().into(); self.get_location()
File::open(location).and_then(|file| file.unlock()) .clone()
.into_pathbuf()
.map_err_into(HookErrorKind::HookExecutionError)
.and_then(|loc| File::open(loc).map_err_into(HookErrorKind::HookExecutionError))
.and_then(|file| file.unlock().map_err_into(HookErrorKind::HookExecutionError))
} }
} }