* Moving Keystore related methods into its own module

+ VideoStore Trait designed out
+ comon error types yey

dblib/src/err.rs

@@ -0,0 +1,4 @@
+use std::error::Error;
+pub type Result<T> = ::std::result::Result<T, Box<dyn Error>>;
+
+

dblib/src/keystore.rs

@@ -0,0 +1,67 @@
+use std::collections::HashMap;
+use std::fs::File;
+use std::io::BufReader;
+use std::io::BufWriter;
+use crate::{err, DB, dev_urandom, KeyStore};
+use crate::ApiKey;
+
+impl KeyStore for DB {
+    fn new_entry(filename: String, name: String) -> err::Result<String> {
+        //! Create a new API key entry in the data-store given by <filename>
+        //! Key value is generated via /dev/urandom on unix systems
+        let file = File::open(filename.as_str())?;
+        let reader = BufReader::new(file);
+
+        let mut data: DB = serde_json::from_reader(reader)?;
+        // Generate some new key data
+        let key = dev_urandom().unwrap(); // create a new key
+        let entry = ApiKey { key: key.clone(), name };
+
+        // Finally write back the data to the structure and disk
+        data.keys.push(entry);
+        let file = File::open(filename.as_str())?;
+        let writer = BufWriter::new(file);
+        serde_json::to_writer(writer, &data)?;
+
+        Ok(key)
+    }
+
+    fn remove_entry(filename: String, name: String) -> err::Result<bool> {
+        //! Removes the API key entry based on the given name 
+        let file = File::open(filename.as_str())?;
+        let reader = BufReader::new(file);
+
+        let mut data: DB  = serde_json::from_reader(reader)?;
+        let idx = data.keys.iter().position(|item| item.name == name);
+        if let Some(idx) = idx {
+            data.keys.remove(idx);
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    fn get_entry(filename: String, name: String) -> err::Result<Option<String>> {
+        //! Get the API key based on name
+        let file = File::open(filename.as_str())?;
+        let reader = BufReader::new(file);
+
+        let data: DB = serde_json::from_reader(reader)?;
+        // WARNING: extreme autism
+        match data.keys.iter().find(|item| item.name == name) {
+            Some(item) => Ok(Some(item.key.clone())),
+            None => Ok(None)
+        }
+    }
+
+    fn new_store(filename: String) -> err::Result<()> {
+        //!  Generate a new empty data store with the given filename
+        //! NOTE: The filename must include the extension(programmatically)
+        let file = File::create(filename)?;
+        let empty = DB { keys: vec![] , videos: HashMap::new() };
+        let writer = BufWriter::new(file);
+        serde_json::to_writer(writer, &empty)?;
+        Ok(())
+    }
+}
+

dblib/src/lib.rs

@@ -1,12 +1,12 @@
-use std::error::Error;
+use std::collections::HashMap;
 use std::fs::File;
-use std::io::BufReader;
-use std::io::BufWriter;
 use std::io::prelude::*;
 
 use serde::{Serialize, Deserialize};
 
 pub mod request;
+pub mod keystore;
+pub mod err;
 use request::ApiKey;
 
 fn dev_urandom() -> std::io::Result<String> {
@@ -23,69 +23,31 @@ fn dev_urandom() -> std::io::Result<String> {
     return Ok(output);
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct VideoMeta {
+    pub id: u64,
+    pub string: String,
+    pub desc: Option<String>
+}
 
 #[derive(Serialize, Deserialize)]
 pub struct DB {
-    keys: Vec<ApiKey>
+    keys: Vec<ApiKey>,
+    videos: HashMap<String, VideoMeta>
 }
 
-
-impl DB {
-    pub fn new_entry(filename: String, name: String) -> Result<String, Box<dyn Error>> {
-        //! Create a new API key entry in the data-store given by <filename>
-        //! Key value is generated via /dev/urandom on unix systems
-        let file = File::open(filename.as_str())?;
-        let reader = BufReader::new(file);
-
-        let mut data: DB = serde_json::from_reader(reader)?;
-        // Generate some new key data
-        let key = dev_urandom().unwrap(); // create a new key
-        let entry = ApiKey { key: key.clone(), name };
-
-        // Finally write back the data to the structure and disk
-        data.keys.push(entry);
-        let file = File::open(filename.as_str())?;
-        let writer = BufWriter::new(file);
-        serde_json::to_writer(writer, &data)?;
-
-        Ok(key)
-    }
-
-    pub fn remove_entry(filename: String, name: String) -> Result<bool, Box<dyn Error>> {
-        //! Removes the API key entry based on the given name 
-        let file = File::open(filename.as_str())?;
-        let reader = BufReader::new(file);
-
-        let mut data: DB  = serde_json::from_reader(reader)?;
-        let idx = data.keys.iter().position(|item| item.name == name);
-        if let Some(idx) = idx {
-            data.keys.remove(idx);
-            Ok(true)
-        } else {
-            Ok(false)
-        }
-    }
-
-    pub fn get_entry(filename: String, name: String) -> Result<Option<String>, Box<dyn Error>> {
-        //! Get the API key based on name
-        let file = File::open(filename.as_str())?;
-        let reader = BufReader::new(file);
-
-        let data: DB = serde_json::from_reader(reader)?;
-        // WARNING: extreme autism
-        match data.keys.iter().find(|item| item.name == name) {
-            Some(item) => Ok(Some(item.key.clone())),
-            None => Ok(None)
-        }
-    }
-
-    pub fn new_store(filename: String) -> Result<(), Box<dyn Error>> {
-        //!  Generate a new empty data store with the given filename
-        //! NOTE: The filename must include the extension(programmatically)
-        let file = File::create(filename)?;
-        let empty = DB { keys: vec![] };
-        let writer = BufWriter::new(file);
-        serde_json::to_writer(writer, &empty)?;
-        Ok(())
-    }
+// TODO: add some proper lifetime management here and some docs
+pub trait KeyStore {
+    fn new_entry(filename: String, name: String) -> err::Result<String>;
+    fn remove_entry(filename: String, name: String) -> err::Result<bool>;
+    fn get_entry(filename: String, name: String) -> err::Result<Option<String>>;
+    fn new_store(filename: String) -> err::Result<()>;
+}
+
+pub trait VideoStore {
+    fn new_video(name: &str, desc: &str) -> err::Result<()>;
+    fn del_video(id: u64) -> err::Result<()>;
+    fn get_video(id: Option<u64>, name: Option<&str>) -> err::Result<VideoMeta>;
+    fn rename_video(id: u64, new: &str) -> err::Result<()>;
+    fn redescribe_video(id: u64, new: &str) -> err::Result<()>;
 }

dblib/src/request.rs

@@ -1,5 +1,6 @@
 use std::env;
 use crate::DB;
+use crate::KeyStore;
 
 use rocket::request::{self, Request, FromRequest};
 use rocket::http::Status;