diff --git a/Cargo.lock b/Cargo.lock index bca90f0..4e5b2c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -326,15 +326,6 @@ version = "0.2.119" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" -[[package]] -name = "lock_api" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" -dependencies = [ - "scopeguard", -] - [[package]] name = "log" version = "0.4.14" @@ -428,29 +419,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" -[[package]] -name = "parking_lot" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - [[package]] name = "percent-encoding" version = "2.1.0" @@ -586,12 +554,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - [[package]] name = "sct" version = "0.7.0" @@ -645,27 +607,12 @@ dependencies = [ "serde", ] -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - [[package]] name = "slab" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" -[[package]] -name = "smallvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - [[package]] name = "socket2" version = "0.4.4" @@ -729,10 +676,7 @@ dependencies = [ "memchr", "mio", "num_cpus", - "once_cell", - "parking_lot", "pin-project-lite", - "signal-hook-registry", "socket2", "tokio-macros", "winapi", @@ -987,49 +931,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - [[package]] name = "winreg" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index e65ff8c..c019d81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ dirs = "4" serde = { version = "1", features = ["derive"] } serde_json = "*" chrono = { version = "*", features = ["serde"] } -tokio = { version = "1", features = ["full"] } +tokio = { version = "1", features = ["macros", "rt-multi-thread"] } toml = "*" [dependencies.reqwest] diff --git a/src/main.rs b/src/main.rs index 5bf2f57..e793f9a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,9 @@ use serde::Deserialize; use std::fmt::{Display, Formatter, Result}; +use std::fs; +use std::process; use std::time::Duration; +use tokio::task; #[derive(Deserialize)] struct Config { @@ -104,7 +107,7 @@ async fn print_states(check_configs: &[CheckConfig]) { async fn get_config() -> Config { let home_dir = dirs::home_dir().unwrap(); - match std::fs::read_to_string(format!( + match fs::read_to_string(format!( "{}/.checkbar.toml", home_dir.to_str().unwrap_or("") )) { @@ -132,11 +135,12 @@ async fn get_click_cmd(name: String) -> Option { } async fn run_click_cmd(cmd: String) { - if let Ok(mut child) = std::process::Command::new("sh") - .stdin(std::process::Stdio::piped()) - .spawn() { - use std::io::Write; - let _ = child.stdin.as_mut().unwrap().write_all(cmd.as_bytes()); + if let Ok(mut child) = process::Command::new("sh") + .stdin(process::Stdio::piped()) + .spawn() + { + use std::io::Write; + let _ = child.stdin.as_mut().unwrap().write_all(cmd.as_bytes()); }; } @@ -145,7 +149,7 @@ async fn main() { println!("{{\"version\":1,\"click_events\":true}}"); println!("["); - let inputs = tokio::task::spawn(async { + let inputs = task::spawn(async { let stdin = std::io::stdin(); loop { let mut input = String::new(); @@ -169,7 +173,7 @@ async fn main() { } }); - let checks = tokio::task::spawn(async { + let checks = task::spawn(async { loop { let config = get_config().await; print_states(&config.checks).await;