ci: Update CI

.github/workflows/rust.yml

@@ -44,6 +44,7 @@ jobs:
               './yas/Cargo.toml'
               './yas-genshin/Cargo.toml'
               './yas-starrail/Cargo.toml'
+              './yas-application/Cargo.toml'
           )
           [regex]$pattern = '(?<=version = ").*(?=")'
           foreach ($file in $files) {
@@ -57,6 +58,7 @@ jobs:
         run: |
           Move-Item ./target/release/yas_artifact.exe "yas_artifact_$env:GIT_REV.exe"
           Move-Item ./target/release/yas_relic.exe "yas_relic_$env:GIT_REV.exe"
+          Move-Item ./target/release/yas.exe "yas_$env:GIT_REV.exe"
 
       - name: Upload yas_artifact
         uses: actions/upload-artifact@v4
@@ -68,4 +70,10 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: yas_relic_${{ env.GIT_REV }}
-          path: yas_relic_${{ env.GIT_REV }}.exe
+          path: yas_relic_${{ env.GIT_REV }}.exe
+
+      - name: Upload yas
+        uses: actions/upload-artifact@v4
+        with:
+          name: yas_${{ env.GIT_REV }}
+          path: yas_${{ env.GIT_REV }}.exe

yas-application/Cargo.toml

@@ -2,11 +2,10 @@
 name = "yas-application"
 version = "0.1.0"
 edition = "2021"
-build = "build.rs"
 
 [dependencies]
 anyhow = "1.0"
-# yas = { path = "../yas" , package = "yas_core"}
+yas = { path = "../yas" , package = "yas_core" }
 yas_genshin = { path = "../yas-genshin", package = "yas_scanner_genshin" }
 yas_starrail = { path = "../yas-starrail", package = "yas_scanner_starrail" }
 clap = { version = "4.4", features = ["derive"] }
@@ -19,3 +18,13 @@ winres = "0.1"
 [[bin]]
 name = "yas"
 path = "src/bin/yas.rs"
+# build = "build.rs"
+
+[[bin]]
+name = "yas_artifact"
+path = "src/bin/yas_artifact.rs"
+# build = "build.rs"
+
+[[bin]]
+name = "yas_relic"
+path = "src/bin/yas_relic.rs"

yas-application/src/bin/yas.rs

@@ -1,5 +1,5 @@
-use anyhow::Result;
 use clap::{command, Command};
+use yas::utils::press_any_key_to_continue;
 use yas_genshin::application::ArtifactScannerApplication;
 use yas_starrail::application::RelicScannerApplication;
 
@@ -19,22 +19,34 @@ fn init() {
         .init();
 }
 
-pub fn main() -> Result<()> {
+pub fn main() {
     init();
     let cmd = command!()
         .subcommand(get_genshin_command())
         .subcommand(get_starrail_command());
     let arg_matches = cmd.get_matches();
 
-    if let Some((subcommand_name, matches)) = arg_matches.subcommand() {
+    let res = if let Some((subcommand_name, matches)) = arg_matches.subcommand() {
         if subcommand_name == "genshin" {
             let application = ArtifactScannerApplication::new(matches.clone());
-            application.run()?;
+            application.run()
         } else if subcommand_name == "starrail" {
             let application = RelicScannerApplication::new(matches.clone());
-            application.run()?;
+            application.run()
+        } else {
+            Ok(())
         }
-    }
+    } else {
+        Ok(())
+    };
 
-    Ok(())
+    match res {
+        Ok(_) => {
+            press_any_key_to_continue();
+        },
+        Err(e) => {
+            log::error!("error: {}", e);
+            press_any_key_to_continue();
+        }
+    }
 }

yas-application/src/bin/yas_artifact.rs

@@ -0,0 +1,23 @@
+use yas::utils::press_any_key_to_continue;
+use yas_genshin::application::ArtifactScannerApplication;
+use log::error;
+
+pub fn main() {
+    env_logger::Builder::new()
+        .filter_level(log::LevelFilter::Info)
+        .init();
+
+    let command = ArtifactScannerApplication::build_command();
+    let matches = command.get_matches();
+
+    let application = ArtifactScannerApplication::new(matches);
+    match application.run() {
+        Err(e) => {
+            error!("error: {}", e);
+            press_any_key_to_continue();
+        },
+        _ => {
+            press_any_key_to_continue();
+        }
+    }
+}

yas-application/src/bin/yas_relic.rs

@@ -0,0 +1,18 @@
+use yas::utils::press_any_key_to_continue;
+use yas_starrail::application::RelicScannerApplication;
+use log::error;
+
+pub fn main() {
+    let matches = RelicScannerApplication::build_command().get_matches();
+
+    let application = RelicScannerApplication::new(matches);
+    match application.run() {
+        Err(e) => {
+            error!("error: {}", e);
+            press_any_key_to_continue();
+        },
+        _ => {
+            press_any_key_to_continue();
+        }
+    }
+}

yas-genshin/Cargo.toml

@@ -2,7 +2,6 @@
 name = "yas_scanner_genshin"
 version = "0.1.16"
 edition = "2021"
-# build = "build.rs"
 description = "Genshin Impact item scanner"
 repository = "https://github.com/wormtql/yas"
 keywords = ["GenshinImpact", "artifacts", "scanner", "ocr"]
@@ -31,10 +30,6 @@ csv = "1.3.0"
 [target.'cfg(target_os = "windows")'.dependencies]
 windows-capture = "1.0.65"
 
-[[bin]]
-name = "yas_artifact"
-path = "src/bin/artifact_scanner.rs"
-
 [[bin]]
 name = "yas_genshin_playground"
 path = "src/bin/playground.rs"

yas-starrail/Cargo.toml

@@ -2,7 +2,6 @@
 name = "yas_scanner_starrail"
 version = "0.1.14"
 edition = "2021"
-# build = "build.rs"
 description = "Honkai: Star Rail item scanner"
 repository = "https://github.com/wormtql/yas"
 keywords = ["HonkaiStarRail", "relic", "scanner", "ocr"]
@@ -26,10 +25,3 @@ lazy_static = "1.4"
 serde = { version = "1.0", features = ["derive"] }
 env_logger = "0.11"
 nanoid = "0.4"
-
-[build-dependencies]
-winres = "0.1"
-
-[[bin]]
-name = "yas_relic"
-path = "src/bin/relic_scanner.rs"