matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add param to EntryAlreadyExists error

Browse source
This commit is contained in:
Matthias Beyer 2017-09-09 21:38:59 +02:00
parent 83f9350d98
commit 6aa695974c
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/core/libimagstore/src/error.rs
View file

@ -143,9 +143,9 @@ error_chain! {
display("Entry is already borrowed: {:?}", id) display("Entry is already borrowed: {:?}", id)
} }
EntryAlreadyExists { EntryAlreadyExists(id: StoreId) {
description("Entry already exists") description("Entry already exists")
display("Entry already exists") display("Entry already exists: {:?}", id)
} }
MalformedEntry { MalformedEntry {

8
lib/core/libimagstore/src/store.rs
View file

@ -404,7 +404,8 @@ impl Store {
if hsmap.contains_key(&id) { if hsmap.contains_key(&id) {
debug!("Cannot create, internal cache already contains: '{}'", id); debug!("Cannot create, internal cache already contains: '{}'", id);
return Err(SE::from_kind(SEK::EntryAlreadyExists)).chain_err(|| SEK::CreateCallError); return Err(SE::from_kind(SEK::EntryAlreadyExists(id.clone())))
.chain_err(|| SEK::CreateCallError);
} }
hsmap.insert(id.clone(), { hsmap.insert(id.clone(), {
debug!("Creating: '{}'", id); debug!("Creating: '{}'", id);
@ -675,7 +676,8 @@ impl Store {
); );
if hsmap.contains_key(&new_id) { if hsmap.contains_key(&new_id) {
return Err(SE::from_kind(SEK::EntryAlreadyExists)).chain_err(|| SEK::MoveCallError) return Err(SE::from_kind(SEK::EntryAlreadyExists(new_id.clone())))
.chain_err(|| SEK::MoveCallError)
} }
let old_id = entry.get_location().clone(); let old_id = entry.get_location().clone();
@ -741,7 +743,7 @@ impl Store {
}; };
if hsmap.contains_key(&new_id) { if hsmap.contains_key(&new_id) {
return Err(SE::from_kind(SEK::EntryAlreadyExists)); return Err(SE::from_kind(SEK::EntryAlreadyExists(new_id.clone())));
} }
// if we do not have an entry here, we fail in `FileAbstraction::rename()` below. // if we do not have an entry here, we fail in `FileAbstraction::rename()` below.

2
lib/entry/libimagentrycategory/src/register.rs
View file

@ -84,7 +84,7 @@ impl CategoryRegister for Store {
.chain_err(|| CEK::HeaderWriteError) .chain_err(|| CEK::HeaderWriteError)
.chain_err(|| CEK::StoreWriteError) .chain_err(|| CEK::StoreWriteError)
} }
Err(store_error) => if is_match!(store_error.kind(), &SEK::EntryAlreadyExists) { Err(store_error) => if is_match!(store_error.kind(), &SEK::EntryAlreadyExists(_)) {
Ok(false) Ok(false)
} else { } else {
Err(store_error).chain_err(|| CEK::StoreWriteError) Err(store_error).chain_err(|| CEK::StoreWriteError)