update

Author: hhstore

crates/rs-tauri-vue/src-tauri/src/command/mod.rs

@@ -1 +1,2 @@
 pub mod calc;
+pub mod todo;

crates/rs-tauri-vue/src-tauri/src/command/todo.rs

@@ -0,0 +1,5 @@
+#[tauri::command]
+pub fn add_todo(title: String, description: String) -> bool {
+    // AppService::new().ctx.sql.
+    false
+}

crates/rs-tauri-vue/src-tauri/src/ctx/mod.rs

@@ -1,10 +1,12 @@
+use std::sync::Arc;
+
+use once_cell::sync::OnceCell;
+use parking_lot::Mutex;
+
 use crate::{
     config::AppConfig,
-    storage::{AppEncryptedKVStorage, AppKvStorage},
+    storage::{db::AppSqlStorage, AppEncryptedKVStorage, AppKvStorage},
 };
-use once_cell::sync::OnceCell;
-use parking_lot::Mutex;
-use std::sync::Arc;
 
 #[derive(Clone)]
 pub struct AppContext {
@@ -21,17 +23,23 @@ pub struct AppContext {
 
     // kv 加密存储:
     pub kv_enc: Arc<Mutex<AppEncryptedKVStorage>>,
+
+    // sqlite3
+    pub sql: Arc<Mutex<AppSqlStorage>>,
 }
 
 impl AppContext {
     // 单例模式:
-    pub fn global() -> &'static AppContext {
+    pub async fn global() -> &'static AppContext {
         static DATA: OnceCell<AppContext> = OnceCell::new();
 
+        let sql = AppSqlStorage::default().await;
+
         DATA.get_or_init(|| AppContext {
             config: Arc::new(Mutex::new(AppConfig::default())),
             kv: Arc::new(Mutex::new(AppKvStorage::default())),
             kv_enc: Arc::new(Mutex::new(AppEncryptedKVStorage::default())),
+            sql: Arc::new(Mutex::new(sql)),
         })
     }
 }
@@ -40,9 +48,9 @@ impl AppContext {
 mod tests {
     use super::*;
 
-    #[test]
-    fn it_works() {
-        let ctx = AppContext::global();
+    #[tokio::test]
+    async fn it_works() {
+        let ctx = AppContext::global().await;
 
         let mut kv = ctx.kv.lock();
 

crates/rs-tauri-vue/src-tauri/src/service/app.rs

@@ -1,9 +1,12 @@
-pub struct AppService {}
+use crate::ctx::AppContext;
+
+pub struct AppService {
+    pub ctx: &'static AppContext,
+}
 
 impl AppService {
-    pub fn new() -> AppService {
-        Self {}
+    pub async fn new() -> Self {
+        let ctx = AppContext::global().await;
+        Self { ctx }
     }
-
-    pub fn update_locale() {}
 }

crates/rs-tauri-vue/src-tauri/src/storage/sql/db.rs

@@ -3,15 +3,15 @@ use std::{env, str::FromStr};
 use sqlx::{
     migrate::Migrator,
     sqlite::{SqliteConnectOptions, SqlitePool, SqlitePoolOptions},
-    Acquire, ConnectOptions, Executor,
+    Acquire, ConnectOptions, Error, Executor, Pool, Sqlite,
 };
 use tracing::info;
 
 use crate::util;
 
 // kv存储方案:
 pub struct AppSqlStorage {
-    pub db: SqlitePool,
+    pub conn: SqlitePool,
 }
 
 impl AppSqlStorage {
@@ -29,15 +29,15 @@ impl AppSqlStorage {
             .connect()
             .await;
 
-        let db = SqlitePoolOptions::new().min_connections(2).connect(&url).await;
+        let conn = SqlitePoolOptions::new().min_connections(2).connect(&url).await;
 
-        match db {
-            Ok(db) => {
-                info!("connect to sqlite db success");
-                Self { db }
+        match conn {
+            Ok(conn) => {
+                info!("sqlite conn: {:?}", conn);
+                Self { conn }
             },
             Err(e) => {
-                panic!("db create error: {:?}", e);
+                panic!("sqlite conn err: {:?}", e);
             },
         }
     }
@@ -62,7 +62,7 @@ impl AppSqlStorage {
         match db {
             Ok(db) => {
                 info!("connect to sqlite db success");
-                Self { db }
+                Self { conn: db }
             },
             Err(e) => {
                 panic!("db create error: {:?}", e);
@@ -76,7 +76,7 @@ impl AppSqlStorage {
             .await
             .expect("migrations failed");
 
-        match m.run(&self.db).await {
+        match m.run(&self.conn).await {
             Ok(_) => {
                 println!("migrations run success");
             },

crates/rs-tauri-vue/src-tauri/src/storage/sql/todo.rs

@@ -2,9 +2,17 @@ use sqlx::{Acquire, Executor, Statement};
 
 use crate::{proto::TodoEntity, storage::db::AppSqlStorage};
 
-impl AppSqlStorage {
+pub struct TodoStorage {
+    pub db: AppSqlStorage,
+}
+
+impl TodoStorage {
+    pub fn new(db: AppSqlStorage) -> Self {
+        Self { db }
+    }
+
     pub async fn add_todo(&self, todo: &TodoEntity) -> anyhow::Result<i64> {
-        let mut conn = self.db.acquire().await?;
+        let mut conn = self.db.conn.acquire().await?;
 
         // Insert the task, then obtain the ID of this row
         let id = sqlx::query!(
@@ -23,7 +31,7 @@ impl AppSqlStorage {
     }
 
     pub async fn list_todo(&self) -> anyhow::Result<Vec<TodoEntity>> {
-        let mut conn = self.db.acquire().await?;
+        let mut conn = self.db.conn.acquire().await?;
 
         let rows = sqlx::query!(
             r#"
@@ -51,7 +59,7 @@ ORDER BY id
     }
 
     pub async fn get_todo(&self, id: i64) -> anyhow::Result<TodoEntity> {
-        let mut conn = self.db.acquire().await?;
+        let mut conn = self.db.conn.acquire().await?;
 
         let row =
             sqlx::query!(r#"SELECT id, title, description, completed FROM todos WHERE id = ?"#, id)
@@ -76,10 +84,11 @@ mod test {
 
     use super::*;
 
-    async fn setup() -> AppSqlStorage {
+    async fn setup() -> TodoStorage {
         let mut db = AppSqlStorage::new("test.db").await;
         db.init_migrations().await;
-        db
+
+        TodoStorage::new(db)
     }
 
     #[tokio::test]