Merge branch 'database' into 'main'

Database

See merge request mycard/neos-rs!1

.gitmodules

+[submodule "ygopro-database"]
+	path = ygopro-database
+	url = git@git.mycard.moe:mycard/ygopro-database.git

Cargo.toml

@@ -13,3 +13,4 @@ log = "0.4"
 pretty_env_logger = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
+diesel = { version = "2.0.0", features = ["sqlite"] }

src/infra/mod.rs

+use diesel::{Connection, SqliteConnection};
+
+pub enum DbConn {
+    // Currently only sqlite Connection
+    SqliteConn(SqliteConnection),
+}
+
+impl DbConn {
+    pub fn establish_sqlite(database_url: &str) -> anyhow::Result<Self> {
+        Ok(Self::SqliteConn(SqliteConnection::establish(database_url)?))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::DbConn;
+
+    #[test]
+    fn test_establish_sqlite() {
+        let workspace = env!("CARGO_MANIFEST_DIR");
+        let db_url = format!("{}/ygopro-database/locales/zh-CN/cards.db", workspace);
+        let _conn = DbConn::establish_sqlite(&db_url).unwrap();
+    }
+}

src/main.rs

 use std::{net::SocketAddr, str::FromStr};
 use warp::Filter;
 
-mod deck;
+mod infra;
+mod service;
 
-const ADDR: &str = "127.0.0.1:3030";
+// TODO: Configurable
+const DECK_ADDR: &str = "127.0.0.1:3030";
+const CARDS_ADDR: &str = "127.0.0.1:3033";
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     pretty_env_logger::try_init()?;
 
-    // todo: use CORS correctly
+    // TODO: use CORS correctly
     let cors = warp::cors()
         .allow_any_origin()
         .allow_credentials(true)
         .allow_header("content-type")
         .allow_method("GET");
 
-    let deck = warp::path!("deck" / String).map(deck_service).with(cors);
-
-    warp::serve(deck).run(SocketAddr::from_str(ADDR)?).await;
+    let deck = warp::path!("deck" / String)
+        .map(service::deck_service)
+        .with(cors.clone());
+    warp::serve(deck)
+        .run(SocketAddr::from_str(DECK_ADDR)?)
+        .await;
+
+    // TODO: cards服务暂时仅支持单卡查询
+    let cards = warp::path!("cards" / String)
+        .map(service::cards_service)
+        .with(cors);
+    warp::serve(cards)
+        .run(SocketAddr::from_str(CARDS_ADDR)?)
+        .await;
 
     Ok(())
 }
-
-fn deck_service(param: String) -> String {
-    let deck = deck::Deck::from_path(format!("deck/{}", param)).unwrap_or_default();
-    serde_json::to_string(&deck).unwrap_or_default()
-}

src/service/cards/mod.rs

+pub fn service(param: String) -> String {
+    todo!()
+}

src/deck.rs → src/service/deck.rs

@@ -53,3 +53,8 @@ impl Deck {
         Ok(deck)
     }
 }
+
+pub fn service(param: String) -> String {
+    let deck = Deck::from_path(format!("deck/{}", param)).unwrap_or_default();
+    serde_json::to_string(&deck).unwrap_or_default()
+}

src/service/mod.rs

+mod cards;
+mod deck;
+
+pub use cards::service as cards_service;
+pub use deck::service as deck_service;

ygopro-database @ efda900b

+Subproject commit efda900bab0b70a0c1cb7b2de48533f40058529b