Merge pull request #3307 from 21pages/fix

kill check-hwcodec-config

Cargo.lock

@@ -2623,6 +2623,7 @@ dependencies = [
  "serde_json 1.0.89",
  "socket2 0.3.19",
  "sodiumoxide",
+ "sysinfo",
  "tokio",
  "tokio-socks",
  "tokio-util",
@@ -4887,7 +4888,6 @@ dependencies = [
  "shutdown_hooks",
  "simple_rc",
  "sys-locale",
- "sysinfo",
  "system_shutdown",
  "tao",
  "tray-icon",

Cargo.toml

@@ -55,7 +55,6 @@ uuid = { version = "1.0", features = ["v4"] }
 clap = "3.0"
 rpassword = "7.0"
 base64 = "0.13"
-sysinfo = "0.24"
 num_cpus = "1.13"
 bytes = { version = "1.2", features = ["serde"] }
 default-net = "0.12.0"

flutter/lib/common/widgets/address_book.dart

@@ -43,11 +43,8 @@ class _AddressBookState extends State<AddressBook> {
     return Obx(() {
       if (gFFI.userModel.userName.value.isEmpty) {
         return Center(
-          child: ElevatedButton(
+            child: ElevatedButton(
-            onPressed: loginDialog,
+                onPressed: loginDialog, child: Text(translate("Login"))));
-            child: Text(translate("Login"))
-          )
-        );
       } else {
         if (gFFI.abModel.abLoading.value) {
           return const Center(
@@ -153,13 +150,13 @@ class _AddressBookState extends State<AddressBook> {
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
         Text(translate('Tags')),
-        GestureDetector(
+        Listener(
-            onTapDown: (e) {
+            onPointerDown: (e) {
-              final x = e.globalPosition.dx;
+              final x = e.position.dx;
-              final y = e.globalPosition.dy;
+              final y = e.position.dy;
               menuPos = RelativeRect.fromLTRB(x, y, x, y);
             },
-            onTap: () => _showMenu(menuPos),
+            onPointerUp: (_) => _showMenu(menuPos),
             child: ActionMore()),
       ],
     );

libs/hbb_common/Cargo.toml

@@ -33,6 +33,7 @@ tokio-socks = { git = "https://github.com/open-trade/tokio-socks" }
 chrono = "0.4"
 backtrace = "0.3"
 libc = "0.2"
+sysinfo = "0.24"
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 mac_address = "1.1"

libs/hbb_common/src/lib.rs

@@ -42,6 +42,7 @@ pub use chrono;
 pub use libc;
 pub use directories_next;
 pub mod keyboard;
+pub use sysinfo;
 
 #[cfg(feature = "quic")]
 pub type Stream = quic::Connection;

libs/scrap/src/common/hwcodec.rs

@@ -317,16 +317,30 @@ pub fn check_config() {
 }
 
 pub fn check_config_process(force_reset: bool) {
-    if force_reset {
+    use hbb_common::sysinfo::{ProcessExt, System, SystemExt};
-        HwCodecConfig::remove();
+
-    }
+    std::thread::spawn(move || {
-    if let Ok(exe) = std::env::current_exe() {
+        if force_reset {
-        std::thread::spawn(move || {
+            HwCodecConfig::remove();
-            std::process::Command::new(exe)
+        }
-                .arg("--check-hwcodec-config")
+        if let Ok(exe) = std::env::current_exe() {
-                .status()
+            if let Some(file_name) = exe.file_name().to_owned() {
-                .ok();
+                let s = System::new_all();
-            HwCodecConfig::refresh();
+                let arg = "--check-hwcodec-config";
-        });
+                for process in s.processes_by_name(&file_name.to_string_lossy().to_string()) {
-    };
+                    if process.cmd().iter().any(|cmd| cmd.contains(arg)) {
+                        log::warn!("already have process {}", arg);
+                        return;
+                    }
+                }
+                if let Ok(mut child) = std::process::Command::new(exe).arg(arg).spawn() {
+                    let second = 3;
+                    std::thread::sleep(std::time::Duration::from_secs(second));
+                    // kill: Different platforms have different results
+                    child.kill().ok();
+                    HwCodecConfig::refresh();
+                }
+            }
+        };
+    });
 }

src/ipc.rs

@@ -549,7 +549,7 @@ async fn check_pid(postfix: &str) {
         file.read_to_string(&mut content).ok();
         let pid = content.parse::<i32>().unwrap_or(0);
         if pid > 0 {
-            use sysinfo::{ProcessExt, System, SystemExt};
+            use hbb_common::sysinfo::{ProcessExt, System, SystemExt};
             let mut sys = System::new();
             sys.refresh_processes();
             if let Some(p) = sys.process(pid.into()) {

src/platform/macos.rs

@@ -558,7 +558,7 @@ pub fn hide_dock() {
 }
 
 fn check_main_window() -> bool {
-    use sysinfo::{ProcessExt, System, SystemExt};
+    use hbb_common::sysinfo::{ProcessExt, System, SystemExt};
     let mut sys = System::new();
     sys.refresh_processes();
     let app = format!("/Applications/{}.app", crate::get_app_name());