Cleaned up the cache interface.

src/morethantext/mod.rs

@@ -270,30 +270,37 @@ impl Cache {
         Ok(Self { channel: channel })
     }
 
-    async fn query(&self, qry: CacheQuery) {
+    async fn query(&self, qry: &Vec<String>) -> Result<HashMap<String, DataType>, MTTError> {
-        for id in qry.ids {
+        let mut output = HashMap::new();
+        for id in qry {
             if id == ENTRY {
-                let mut holder = HashMap::new();
+                output.insert(ENTRY.to_string(), DataType::new("store"));
-                holder.insert(ENTRY.to_string(), DataType::new("store"));
-                qry.reply.send(FromCache::Data(holder)).await.unwrap();
             } else {
-                qry.reply
+                return Err(MTTError::new("fred"))
-                    .send(FromCache::Error(MTTError::new("fred")))
-                    .await
-                    .unwrap();
             }
         }
+        Ok(output)
     }
 
-    async fn commit(&self, commit: CacheCommit) {
+    async fn commit(&self) -> Result<(), MTTError> {
-        commit.reply.send(FromCache::Ok).await.unwrap();
+        Ok(())
     }
 
     async fn start(&self) {
         loop {
             match self.channel.recv().await.unwrap() {
-                ToCache::Query(qry) => self.query(qry).await,
+                ToCache::Query(qry) => {
-                ToCache::Commit(commit) => self.commit(commit).await,
+                    match self.query(&qry.ids).await {
+                        Ok(data) => qry.reply.send(FromCache::Data(data)).await.unwrap(),
+                        Err(error) => qry.reply.send(FromCache::Error(error)).await.unwrap(),
+                    }
+                },
+                ToCache::Commit(commit) => {
+                    match self.commit().await {
+                        Ok(_) => commit.reply.send(FromCache::Ok).await.unwrap(),
+                        Err(error) => commit.reply.send(FromCache::Error(error)).await.unwrap(),
+                    }
+                },
             }
         }
     }