Partially implement get_entry

libimagstore/src/error.rs

@@ -8,7 +8,7 @@ use toml;
 /**
  * Kind of store error
  */
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub enum StoreErrorKind {
     FileError,
     IdLocked,

libimagstore/src/store.rs

@@ -21,39 +21,38 @@ use lazyfile::LazyFile;
 pub type Result<T> = RResult<T, StoreError>;
 
 
-/// A store entry, depending on the option type it is either borrowed currently
+#[derive(PartialEq)]
-/// or not.
+enum StoreEntryStatus {
-enum StoreEntry {
+    Present,
-    Present(StoreId, LazyFile),
     Borrowed
 }
 
-impl PartialEq for StoreEntry {
+/// A store entry, depending on the option type it is either borrowed currently
-    fn eq(&self, other: &StoreEntry) -> bool {
+/// or not.
-        use store::StoreEntry::*;
+struct StoreEntry {
-        match (*self, *other) {
+    id: StoreId,
-            (Borrowed, Borrowed) => true,
+    file: LazyFile,
-            (Borrowed, Present(_,_)) => false,
+    status: StoreEntryStatus,
-            (Present(_,_), Borrowed) => false,
-            (Present(ref a,_), Present(ref b, _)) => a == b
 }
-    }
-}
-
 
 impl StoreEntry {
     /// The entry is currently borrowed, meaning that some thread is currently
     /// mutating it
     fn is_borrowed(&self) -> bool {
-        *self == StoreEntry::Borrowed
+        self.status == StoreEntryStatus::Borrowed
     }
 
-    fn get_entry(&self) -> Result<Entry> {
+    fn get_entry(&mut self) -> Result<Entry> {
-        if let &StoreEntry::Present(ref id, ref file) = self {
+        if !self.is_borrowed() {
-            let file = file.get_file();
+            let file = self.file.get_file();
-            if let Err(StoreError{err_type: StoreErrorKind::FileNotFound, ..}) = file {
+            if let Err(err) = file {
-                Ok(Entry::new(id.clone()))
+                if err.err_type() == StoreErrorKind::FileNotFound {
+                    Ok(Entry::new(self.id.clone()))
                 } else {
+                    Err(err)
+                }
+            } else {
+                // TODO:
                 unimplemented!()
             }
         } else {