Dev

.github/workflows/rust.yml

@@ -30,8 +30,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Install libdbus-1-dev
-        run: sudo apt update && sudo apt-get install -yqq libdbus-1-dev
+      - name: Install Deps
+        run: sudo apt update && sudo apt-get install -yqq libdbus-1-dev libxcb1-dev
       - name: Install latest nightly
         uses: crusty-pie/toolchain@v1
         with:
@@ -60,9 +60,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - name: Install libdbus-1-dev
+      - name: Install Deps
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: sudo apt update && sudo apt-get install -yqq libdbus-1-dev
+        run: sudo apt update && sudo apt-get install -yqq libdbus-1-dev libxcb1-dev
       - name: Install latest nightly
         uses: crusty-pie/toolchain@v1
         with:

Cargo.toml

@@ -24,7 +24,9 @@ crate-type = ["lib", "cdylib", "staticlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-default = ["completions"]
+default = ["completions", "ui_solver"]
+all_ui_solver = ["slide_ui_solver", "ui_solver", "obstacle_ui_solver"]
+ui_solver = ["rotate_ui_solver", "icon_click_ui_solver", "text_click_ui_solver"]
 completions = ["completion-nu", "completion-carapace", "completion-fig"]
 completion-nu = ["clap_complete_command", "clap_complete_command/nushell"]
 completion-carapace = ["clap_complete_command", "clap_complete_command/carapace"]
@@ -54,8 +56,8 @@ xdsign_data = { git = "https://github.com/learturely/xdsign_data.git" }
 
 [profile.release]
 panic = "abort"
-codegen-units = 1
-lto = "fat"
+#codegen-units = 1
+#lto = "fat"
 strip = "symbols"
 
 [target.'cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))'.dependencies]

src/lib.rs

@@ -22,13 +22,14 @@ use clap::CommandFactory;
 use cli::arg::{AccountSubCommand, Args, MainCommand};
 use cxlib::{
     activity::{Activity, RawSign},
+    captcha::CaptchaType,
     default_impl::store::{AccountTable, DataBase, ExcludeTable},
     sign::SignTrait,
     store::Dir,
     types::Location,
     user::{DefaultLoginSolver, LoginSolverTrait, LoginSolverWrapper, LoginSolvers, Session},
+    utils::time_it_and_print_result,
 };
-use cxlib_captcha::CaptchaType;
 use log::{error, info, warn};
 use std::{collections::HashMap, io::stdout};
 use x_l4rs::IDSLoginImpl;
@@ -76,11 +77,13 @@ fn init_function() {
     Location::set_boxed_location_preprocessor(Box::new(LocationPreprocessor))
         .unwrap_or_else(|e| error!("{e}"));
     let login_solver = IDSLoginImpl::TARGET_LEARNING.get_login_solver(|a, b| {
-        Ok(cxlib::imageproc::find_sub_image(
-            a,
-            b,
-            cxlib::imageproc::slide_solvers::find_min_sum_of_squared_errors,
-        ))
+        time_it_and_print_result(|| {
+            Ok(cxlib::imageproc::find_sub_image(
+                a,
+                b,
+                cxlib::imageproc::slide_solvers::find_max_cross_correlation_normalized,
+            ))
+        })
     });
     let login_type = login_solver.login_type().to_owned();
     LoginSolvers::register(login_solver)