use record id as hashmap value

src/profile/bookmark/database.rs

@@ -5,7 +5,7 @@ use std::{rc::Rc, sync::RwLock};
 pub struct Table {
     pub id: i64,
     //pub profile_id: i64,
-    pub time: DateTime,
+    //pub time: DateTime,
     pub request: String,
 }
 
@@ -52,21 +52,20 @@ impl Database {
         }
     }
 
-    pub fn delete(&self, request: &str) -> Result<(), ()> {
+    pub fn delete(&self, id: i64) -> Result<(), ()> {
         // Begin new transaction
         let mut writable = self.connection.write().unwrap();
         let tx = writable.transaction().unwrap();
 
         // Delete records match request
-        for record in select(&tx, self.profile_id, Some(request)).unwrap() {
-            let _ = delete(&tx, record.id);
-        }
-
-        // Done
-        match tx.commit() {
-            Ok(_) => Ok(()),
+        match delete(&tx, id) {
+            Ok(_) => match tx.commit() {
+                Ok(_) => Ok(()),
+                Err(_) => Err(()),
+            },
             Err(_) => Err(()),
-        } // @TODO handle result
+        }
+        // @TODO handle result
     }
 }
 
@@ -116,7 +115,7 @@ pub fn select(
         Ok(Table {
             id: row.get(0)?,
             //profile_id: row.get(1)?,
-            time: DateTime::from_unix_local(row.get(2)?).unwrap(),
+            //time: DateTime::from_unix_local(row.get(2)?).unwrap(),
             request: row.get(3)?,
         })
     })?;

src/profile/bookmark/error.rs

@@ -3,4 +3,5 @@ pub enum Error {
     DatabaseDelete,
     MemoryAdd,
     MemoryDelete,
+    MemoryNotFound,
 }

src/profile/bookmark/memory.rs

@@ -1,12 +1,11 @@
 mod error;
 use error::Error;
 
-use gtk::glib::DateTime;
 use std::{cell::RefCell, collections::HashMap};
 
 /// Reduce disk usage by cache Bookmarks index in memory
 pub struct Memory {
-    index: RefCell<HashMap<String, DateTime>>,
+    index: RefCell<HashMap<String, i64>>,
 }
 
 impl Memory {
@@ -21,16 +20,17 @@ impl Memory {
 
     // Actions
 
-    /// Add new record for given `request`
-    /// * validates record with same key does not exist yet
-    pub fn add(&self, request: String, time: DateTime) -> Result<(), Error> {
-        match self.index.borrow_mut().insert(request, time) {
+    /// Add new record with `request` as key and `id` as value
+    /// * validate record with same key does not exist yet
+    pub fn add(&self, request: String, id: i64) -> Result<(), Error> {
+        match self.index.borrow_mut().insert(request, id) {
             Some(_) => Err(Error::Overwrite),
             None => Ok(()),
         }
     }
 
     /// Delete record from index by `request`
+    /// * validate record key is exist
     pub fn delete(&self, request: &str) -> Result<(), Error> {
         match self.index.borrow_mut().remove(request) {
             Some(_) => Ok(()),
@@ -38,8 +38,11 @@ impl Memory {
         }
     }
 
-    /// Check `request` exist in memory index
-    pub fn is_exist(&self, request: &str) -> bool {
-        self.index.borrow().get(request).is_some()
+    /// Get `id` by `request` from memory index
+    pub fn get(&self, request: &str) -> Result<i64, Error> {
+        match self.index.borrow().get(request) {
+            Some(&id) => Ok(id),
+            None => Err(Error::NotFound),
+        }
     }
 }