Merge pull request #667 from matthiasbeyer/rewrite-storeid-type

Rewrite storeid type

2 files changed, 11 insertions, 6 deletions

diff --git a/libimagbookmark/src/collection.rs b/libimagbookmark/src/collection.rs
index b7fc4459..b2cde9ef 100644
--- a/libimagbookmark/src/collection.rs
+++ b/libimagbookmark/src/collection.rs
@@ -51,8 +51,9 @@ impl<'a> DerefMut for BookmarkCollection<'a> {
 impl<'a> BookmarkCollection<'a> {
 
     pub fn new(store: &'a Store, name: &str) -> Result<BookmarkCollection<'a>> {
-        let id = ModuleEntryPath::new(name).into_storeid();
-        store.create(id)
+        ModuleEntryPath::new(name)
+            .into_storeid()
+            .and_then(|id| store.create(id))
             .map(|fle| {
                 BookmarkCollection {
                     fle: fle,
@@ -63,8 +64,9 @@ impl<'a> BookmarkCollection<'a> {
     }
 
     pub fn get(store: &'a Store, name: &str) -> Result<BookmarkCollection<'a>> {
-        let id = ModuleEntryPath::new(name).into_storeid();
-        store.get(id)
+        ModuleEntryPath::new(name)
+            .into_storeid()
+            .and_then(|id| store.get(id))
             .map_err_into(BEK::StoreReadError)
             .and_then(|fle| {
                 match fle {
@@ -78,7 +80,10 @@ impl<'a> BookmarkCollection<'a> {
     }
 
     pub fn delete(store: &Store, name: &str) -> Result<()> {
-        store.delete(ModuleEntryPath::new(name).into_storeid()).map_err_into(BEK::StoreReadError)
+        ModuleEntryPath::new(name)
+            .into_storeid()
+            .and_then(|id| store.delete(id))
+            .map_err_into(BEK::StoreReadError)
     }
 
     pub fn links(&self) -> Result<Vec<Url>> {
diff --git a/libimagbookmark/src/lib.rs b/libimagbookmark/src/lib.rs
index 5b0a82ef..bc98b061 100644
--- a/libimagbookmark/src/lib.rs
+++ b/libimagbookmark/src/lib.rs
@@ -21,7 +21,7 @@ extern crate regex;
 #[macro_use] extern crate libimagerror;
 extern crate libimagentrylink;
 
-module_entry_path_mod!("bookmark", "0.1.0");
+module_entry_path_mod!("bookmark");
 
 pub mod collection;
 pub mod error;