update

Author: hhstore

crates/rs-pkg/src/lib.rs

@@ -1,3 +1,4 @@
+pub mod util;
 pub mod x;
 
 pub fn add(left: usize, right: usize) -> usize {

crates/rs-pkg/src/util/mod.rs

@@ -0,0 +1,3 @@
+pub use path::*;
+
+pub mod path;

crates/rs-pkg/src/util/path.rs

@@ -0,0 +1,39 @@
+use std::{env, fs, path::PathBuf};
+
+pub fn local_dir(folder: Option<&str>) -> PathBuf {
+    let current_dir = env::current_dir().expect("get current directory failed");
+
+    let dest_dir = current_dir.join(folder.unwrap_or("tmp"));
+    if !dest_dir.exists() {
+        fs::create_dir(&dest_dir).expect("create dir failed");
+    }
+    dest_dir
+}
+
+pub fn local_sqlite_url(db_name: Option<&str>) -> &str {
+    let fp = db_name.unwrap_or("app.db");
+    let prefix = "sqlite:";
+
+    // get or create:
+    let d = local_dir(None);
+
+    // return db url
+    let db_url = format!("{}{}", prefix, d.join(fp).to_str().unwrap());
+    Box::leak(db_url.into_boxed_str())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_get_local_sqlite_url() {
+        let cases = [None, Some("test.db")];
+
+        // iter
+        for case in cases.iter() {
+            let url = local_sqlite_url(*case);
+            println!("url: {}", url);
+        }
+    }
+}

crates/rs-pkg/src/x/storage/kv.rs

@@ -0,0 +1,63 @@
+use std::{io::Write, path::PathBuf};
+
+use pickledb::{PickleDb, PickleDbDumpPolicy, SerializationMethod};
+
+use crate::util;
+
+// kv存储方案:
+pub struct KvClient {
+    pub cli: PickleDb,
+}
+
+impl KvClient {
+    pub fn default() -> Self {
+        Self::new(None, None)
+    }
+
+    pub fn new(
+        db_path: Option<PathBuf>,
+        serialization_method: Option<SerializationMethod>,
+    ) -> Self {
+        let db_name = "app.kv.json";
+        let fp = db_path.unwrap_or(util::local_dir(None).join(db_name));
+        // println!("kv file: {:?}", fp);
+
+        // default = json
+        let m = serialization_method.unwrap_or(SerializationMethod::Json);
+
+        // load file:
+        if fp.exists() {
+            let db = PickleDb::load(fp.clone(), PickleDbDumpPolicy::AutoDump, m)
+                .expect("load kv db failed");
+            return Self { cli: db }
+        }
+
+        // new file:
+        let db = PickleDb::new(fp, PickleDbDumpPolicy::AutoDump, m);
+        Self { cli: db }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_new_kv_client() {
+        let mut kv = KvClient::default();
+
+        let case = [
+            ("test", "test value"),
+            ("test2", "test value2"),
+            ("test3", "test value3"),
+            ("test4", "test value4"),
+        ];
+
+        for (k, v) in case.iter() {
+            kv.cli.set(k, v);
+
+            let v: String = kv.cli.get(k).unwrap();
+            print!("k={}, v={}", k, v);
+        }
+    }
+}

crates/rs-pkg/src/x/storage/sql.rs

@@ -6,6 +6,8 @@ use sqlx::{
     ConnectOptions, SqlitePool,
 };
 
+use crate::util;
+
 // db 存储方案: SqlClient
 pub struct SqliteClient {
     pub cli: SqlitePool,
@@ -74,48 +76,6 @@ impl SqliteClient {
     }
 }
 
-pub mod util {
-    use std::{env, path::PathBuf};
-
-    pub fn local_dir(folder: Option<&str>) -> PathBuf {
-        let mut current_dir = env::current_dir().expect("get current directory failed");
-
-        let dest_dir = current_dir.join(folder.unwrap_or("tmp"));
-        if !dest_dir.exists() {
-            std::fs::create_dir(&dest_dir).expect("create tmp dir failed");
-        }
-        dest_dir
-    }
-
-    pub fn local_sqlite_url(db_name: Option<&str>) -> &str {
-        let fp = db_name.unwrap_or("app.db");
-        let mut prefix = "sqlite:";
-
-        // get or create:
-        let d = local_dir(None);
-
-        // return db url
-        let db_url = format!("{}{}", prefix, d.join(fp).to_str().unwrap());
-        Box::leak(db_url.into_boxed_str())
-    }
-
-    #[cfg(test)]
-    mod test {
-        use super::*;
-
-        #[test]
-        fn test_get_local_sqlite_url() {
-            let cases = [None, Some("test.db")];
-
-            // iter
-            for case in cases.iter() {
-                let url = local_sqlite_url(*case);
-                println!("url: {}", url);
-            }
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
     use tokio;