matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Adapt store to not use StoreId::into() but new StoreId::into_pathbuf()

Browse source
This commit is contained in:
Matthias Beyer 2016-09-05 16:51:37 +02:00
parent a313cede06
commit 5f04d29345
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libimagstore/src/store.rs
View file

@ -124,12 +124,13 @@ impl Iterator for Walk {
impl StoreEntry { impl StoreEntry {
fn new(id: StoreId) -> StoreEntry { fn new(id: StoreId) -> Result<StoreEntry> {
StoreEntry { let pb = try!(id.clone().into_pathbuf());
id: id.clone(), Ok(StoreEntry {
file: FileAbstraction::Absent(id.into()), id: id,
file: FileAbstraction::Absent(pb),
status: StoreEntryStatus::Present, status: StoreEntryStatus::Present,
} })
} }
/// The entry is currently borrowed, meaning that some thread is currently /// The entry is currently borrowed, meaning that some thread is currently
@ -406,7 +407,7 @@ impl Store {
return Err(SEK::EntryAlreadyExists.into_error()).map_err_into(SEK::CreateCallError); return Err(SEK::EntryAlreadyExists.into_error()).map_err_into(SEK::CreateCallError);
} }
hsmap.insert(id.clone(), { hsmap.insert(id.clone(), {
let mut se = StoreEntry::new(id.clone()); let mut se = try!(StoreEntry::new(id.clone()));
se.status = StoreEntryStatus::Borrowed; se.status = StoreEntryStatus::Borrowed;
se se
}); });
@ -439,7 +440,8 @@ impl Store {
.write() .write()
.map_err(|_| SE::new(SEK::LockPoisoned, None)) .map_err(|_| SE::new(SEK::LockPoisoned, None))
.and_then(|mut es| { .and_then(|mut es| {
let mut se = es.entry(id.clone()).or_insert_with(|| StoreEntry::new(id.clone())); let new_se = try!(StoreEntry::new(id.clone()));
let mut se = es.entry(id.clone()).or_insert(new_se);
let entry = se.get_entry(); let entry = se.get_entry();
se.status = StoreEntryStatus::Borrowed; se.status = StoreEntryStatus::Borrowed;
entry entry
@ -550,7 +552,7 @@ impl Store {
return Err(SE::new(SEK::IdLocked, None)).map_err_into(SEK::RetrieveCopyCallError); return Err(SE::new(SEK::IdLocked, None)).map_err_into(SEK::RetrieveCopyCallError);
} }
StoreEntry::new(id).get_entry() try!(StoreEntry::new(id)).get_entry()
} }
/// Delete an entry /// Delete an entry
@ -578,7 +580,8 @@ impl Store {
// remove the entry first, then the file // remove the entry first, then the file
entries.remove(&id); entries.remove(&id);
if let Err(e) = FileAbstraction::remove_file(&id.clone().into()) { let pb = try!(id.clone().with_base(self.path().clone()).into_pathbuf());
if let Err(e) = FileAbstraction::remove_file(&pb) {
return Err(SEK::FileError.into_error_with_cause(Box::new(e))) return Err(SEK::FileError.into_error_with_cause(Box::new(e)))
.map_err_into(SEK::DeleteCallError); .map_err_into(SEK::DeleteCallError);
} }
@ -617,10 +620,12 @@ impl Store {
let old_id = entry.get_location().clone(); let old_id = entry.get_location().clone();
FileAbstraction::copy(&old_id.clone().into(), &new_id.clone().into()) let old_id_as_path = try!(old_id.clone().with_base(self.path().clone()).into_pathbuf());
let new_id_as_path = try!(new_id.clone().with_base(self.path().clone()).into_pathbuf());
FileAbstraction::copy(&old_id_as_path, &new_id_as_path)
.and_then(|_| { .and_then(|_| {
if remove_old { if remove_old {
FileAbstraction::remove_file(&old_id.clone().into()) FileAbstraction::remove_file(&old_id_as_path)
} else { } else {
Ok(()) Ok(())
} }
@ -654,8 +659,8 @@ impl Store {
if hsmap.contains_key(&old_id) { if hsmap.contains_key(&old_id) {
return Err(SE::new(SEK::EntryAlreadyBorrowed, None)); return Err(SE::new(SEK::EntryAlreadyBorrowed, None));
} else { } else {
let old_id_pb = old_id.clone().into(); let old_id_pb = try!(old_id.clone().with_base(self.path().clone()).into_pathbuf());
let new_id_pb = new_id.clone().into(); let new_id_pb = try!(new_id.clone().with_base(self.path().clone()).into_pathbuf());
match FileAbstraction::rename(&old_id_pb, &new_id_pb) { match FileAbstraction::rename(&old_id_pb, &new_id_pb) {
Err(e) => return Err(SEK::EntryRenameError.into_error_with_cause(Box::new(e))), Err(e) => return Err(SEK::EntryRenameError.into_error_with_cause(Box::new(e))),
Ok(_) => { Ok(_) => {

13
libimagstore/src/storeid.rs
View file

@ -65,17 +65,14 @@ impl StoreId {
/// Transform the StoreId object into a PathBuf, error if the base of the StoreId is not /// Transform the StoreId object into a PathBuf, error if the base of the StoreId is not
/// specified. /// specified.
pub fn into_pathbuf(self) -> Result<PathBuf> { pub fn into_pathbuf(self) -> Result<PathBuf> {
self.base let mut base = try!(self.base.ok_or(SEK::StoreIdHasNoBaseError.into_error()));
.ok_or(SEK::StoreIdHasNoBaseError.into_error()) base.push(self.id);
.map(|mut base| { Ok(base)
base.push(self.id);
base
})
} }
pub fn exists(&self) -> bool { pub fn exists(&self) -> bool {
let pb : PathBuf = self.clone().into(); // TODO: hiding error here.
pb.exists() self.clone().into_pathbuf().map(|pb| pb.exists()).unwrap_or(false)
} }
pub fn is_file(&self) -> bool { pub fn is_file(&self) -> bool {