🐳 chore: Makes clippy happy

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
 name = "tester"
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "staticlib", "rlib"]
 
 [dependencies]
 pyo3 = "0.22.0"
@@ -25,6 +25,13 @@ xcap = "0.0.13"
 enigo = "0.2.1"
 portable-pty = "0.8.1"
 inventory = "0.3.15"
+eframe = "0.28.1"
+egui_extras = "0.28.1"
 
 [toolchain]
 channel = "nightly"
+
+[[test]]
+name = "ui_test"
+path = "tests/ui_test.rs"
+harness = false

src/cli/deansi.rs

@@ -54,7 +54,7 @@ impl Tty for DeANSI {
 
     /// Write data to the Tty
     fn write(&mut self, data: &[u8]) -> Result<(), Box<dyn Error>> {
-        let data = strip_ansi_escapes::strip(&data);
+        let data = strip_ansi_escapes::strip(data);
         self.inner.write(&data)?;
         Ok(())
     }

src/cli/ssh.rs

@@ -23,6 +23,7 @@ pub enum SshPass {
     Key(String), // Path to private key
 }
 
+#[allow(dead_code)]
 pub struct Ssh {
     // sess: Session,
     channel: Arc<Mutex<Channel>>,
@@ -102,7 +103,7 @@ impl Ssh {
 
         Ssh {
             // sess: sess,
-            channel: channel,
+            channel,
             buff,
             stop,
             handle: Some(handle),

src/devhost/sdwirec.rs

@@ -8,20 +8,16 @@ use crate::info;
 
 use super::devhost::DevHost;
 
+#[derive(Default)]
 pub struct Sdwirec {}
 
-impl Sdwirec {
-    pub fn new() -> Sdwirec {
-        Sdwirec {}
-    }
-}
-
+#[allow(static_mut_refs)]
 impl DevHost<Sdwirec> for Sdwirec {
     fn get_device() -> Arc<Mutex<Sdwirec>> {
         static mut DEVICE: Option<Arc<Mutex<Sdwirec>>> = None;
         unsafe {
             DEVICE
-                .get_or_insert_with(|| Arc::new(Mutex::new(Sdwirec::new())))
+                .get_or_insert_with(|| Arc::new(Mutex::new(Sdwirec::default())))
                 .clone()
         }
     }

src/device/device.rs

@@ -5,16 +5,16 @@ use std::error::Error;
 use crate::cli::{ssh::SshPass, tty::DynTty};
 
 
-struct ShellOptions {
+pub struct ShellOptions {
     shell: Option<String>,
 }
 
-struct SerialOptions {
+pub struct SerialOptions {
     port: String,
     baud: u32,
 }
 
-struct SshOptions {
+pub struct SshOptions {
     host: String,
     port: u16,
     user: String,

src/exec/gui_exec.rs

@@ -118,10 +118,10 @@ impl GuiTestApi for GuiTestor {
             let screen = self.read()?;
             let mut res = None;
             for handler in inventory::iter::<HandlerCollector> {
-                if !handler.inner.can_handle(&needle) {
+                if !handler.inner.can_handle(needle) {
                     continue;
                 }
-                res = Some(handler.inner.handle(&needle, &screen) || res.unwrap_or(false));
+                res = Some(handler.inner.handle(needle, &screen) || res.unwrap_or(false));
             }
             match res {
                 Some(true) => Ok(Some(())),
@@ -131,7 +131,7 @@ impl GuiTestApi for GuiTestor {
         })
     }
     fn assert_screen_click(&mut self, needle: &Needle, timeout: u32) -> Result<(), Box<dyn Error>> {
-        self.assert_screen(&needle, timeout)?;
+        self.assert_screen(needle, timeout)?;
         if !needle.is_basic() {
             return Err("Only Basic Needle support this".into());
         }

src/exec/gui_handler/basic_handle.rs

@@ -38,7 +38,7 @@ pub fn basic_handle_once(area: &Area, screen: &RgbaImage) -> bool {
             let similarity = match_count as f32 / total_count as f32;
             similarity >= area.match_threhold
         }
-        NeedleType::Ocr => return false,
+        NeedleType::Ocr => false,
         NeedleType::Exclude => {
             let mut match_count = 0;
             let total_count = screen.width() * screen.height() - area.width * area.height;

src/gui/screen.rs

@@ -20,7 +20,8 @@ use crate::util::anybase::AnyBase;
 
 /// A Screen trait, used to interact with a screen
 pub trait Screen: AnyBase {
-    //! Get the size of the Screen
+
+    /// Get the size of the Screen
     fn size(&self) -> (u32, u32);
 
     /// Read the contents of the Screen as an image

src/lib.rs

@@ -1,4 +1,6 @@
 #![feature(box_into_inner)]
+#![feature(macro_metavar_expr_concat)]
+#![allow(clippy::module_inception)]
 
 pub mod consts;
 pub mod cli;
@@ -14,9 +16,8 @@ pub mod device {
 pub mod util {
     pub mod anybase;
     pub mod logger;
-    pub mod singleton;
     pub mod util;
 }
 pub mod pythonapi;
 pub mod vendor;
-
+pub mod ui;

src/pythonapi/mod.rs

@@ -27,7 +27,7 @@ use serial::Serial;
 use shell::Shell;
 use tee::Tee;
 use shell_like::PyTty;
-use util::{get_log_level, set_log_level};
+use util::{get_log_level, run_ui, set_log_level};
 
 #[pymodule]
 #[pyo3(name = "tester")]
@@ -45,6 +45,8 @@ fn tester(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(set_log_level, m)?)?;
     m.add_function(wrap_pyfunction!(get_log_level, m)?)?;
 
+    m.add_function(wrap_pyfunction!(run_ui, m)?)?;
+
     m.add_function(wrap_pyfunction!(info, m)?)?;
     m.add_function(wrap_pyfunction!(log, m)?)?;
     m.add_function(wrap_pyfunction!(warn, m)?)?;

src/pythonapi/util.rs

@@ -1,7 +1,6 @@
-use pyo3::pyfunction;
-
-use crate::util::logger::LogLevel;
+use pyo3::{exceptions::PyRuntimeError, pyfunction, PyResult};
 
+use crate::{ui::main::AppUi, util::logger::LogLevel};
 
 #[pyfunction]
 pub fn set_log_level(level: &str) {
@@ -17,12 +16,17 @@ pub fn set_log_level(level: &str) {
 
 #[pyfunction]
 pub fn get_log_level() -> String {
-    let level = crate::util::logger::LogLevelConf::get();
+    let level = crate::util::logger::get_log_level();
     match level {
-        0 => "Debug".to_string(),
-        10 => "Info".to_string(),
-        20 => "Warn".to_string(),
-        30 => "Error".to_string(),
-        _ => "Debug".to_string(),
+        LogLevel::Debug => "Debug".to_string(),
+        LogLevel::Info => "Info".to_string(),
+        LogLevel::Warn => "Warn".to_string(),
+        LogLevel::Error => "Error".to_string(),
     }
-}
+}
+
+#[pyfunction]
+pub fn run_ui() -> PyResult<()> {
+    AppUi::new().map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
+    Ok(())
+}

src/util/logger.rs

@@ -1,18 +1,26 @@
 use colored::Colorize;
 
-use crate::singleton;
-
 pub enum LogLevel {
     Debug = 0,
     Info = 10,
     Warn = 20,
     Error = 30,
 }
 
-singleton!(LogLevelConf, i32, LogLevel::Info as i32);
+static mut LOG_LEVEL: i32 = LogLevel::Info as i32;
+
+fn __get_log_level() -> i32 {
+    unsafe { LOG_LEVEL }
+}
+
+fn __set_log_level(level: LogLevel) {
+    unsafe {
+        LOG_LEVEL = level as i32;
+    }
+}
 
 pub fn __log(s: &str) {
-    if *LogLevelConf::get() <= LogLevel::Debug as i32 {
+    if __get_log_level() <= LogLevel::Debug as i32 {
         println!("{} {}", "[LOG]".blue(), s);
     }
 }
@@ -23,7 +31,7 @@ macro_rules! log {
 }
 
 pub fn __info(s: &str) {
-    if *LogLevelConf::get() <= LogLevel::Info as i32 {
+    if __get_log_level() <= LogLevel::Info as i32 {
         println!("{} {}", "[INFO]".green(), s);
     }
 }
@@ -34,7 +42,7 @@ macro_rules! info {
 }
 
 pub fn __warn(s: &str) {
-    if *LogLevelConf::get() <= LogLevel::Warn as i32 {
+    if __get_log_level() <= LogLevel::Warn as i32 {
         eprintln!("{} {}", "[WARN]".yellow(), s);
     }
 }
@@ -45,7 +53,7 @@ macro_rules! warn {
 }
 
 pub fn __err(s: &str) {
-    if *LogLevelConf::get() <= LogLevel::Error as i32 {
+    if __get_log_level() <= LogLevel::Error as i32 {
         eprintln!("{} {}", "[ERROR]".red(), s);
     }
 }
@@ -55,7 +63,16 @@ macro_rules! err {
     ($($arg:tt)*) => ($crate::util::logger::__err(&format!($($arg)*)))
 }
 
+pub fn get_log_level() -> LogLevel {
+    match __get_log_level() {
+        0 => LogLevel::Debug,
+        10 => LogLevel::Info,
+        20 => LogLevel::Warn,
+        30 => LogLevel::Error,
+        _ => LogLevel::Debug,
+    }
+}
+
 pub fn set_log_level(level: LogLevel) {
-    let l = LogLevelConf::get();
-    *l = level as i32;
+    __set_log_level(level);
 }

src/util/util.rs

@@ -9,14 +9,14 @@ use rand::{distributions::Alphanumeric, thread_rng, Rng};
 #[macro_export]
 macro_rules! todo {
     () => {
-        Err(Box::<dyn Error>::from("TODO"))
+        Err("TODO".into())
     };
 }
 
 #[macro_export]
 macro_rules! unfinished {
     () => {
-        Err(Box::<dyn Error>::from("UNFINISHED"))
+        Err("UNFINISHED".into())
     };
 }