Test: Support Freebsd

Author: GenshinMinecraft

src/args.rs

@@ -1,6 +1,6 @@
-use std::process::exit;
 use crate::get_info::get_hostname;
 use clap::Parser;
+use std::process::exit;
 
 /// Akile Monitor Rust Client
 #[derive(Parser, Debug, Clone)]
@@ -59,14 +59,14 @@ impl Args_cli {
             None => {
                 eprintln!("请输入 --server 参数");
                 exit(1);
-            },
+            }
         };
         let auth_secret = match self.auth_secret {
             Some(s) => s,
             None => {
                 eprintln!("请输入 --auth_secret 参数");
                 exit(1);
-            },
+            }
         };
         let interval = self.interval.unwrap_or(1000);
         let fake_times = self.fake_times.unwrap_or(1);
@@ -99,4 +99,4 @@ pub struct Args {
     pub monitor_path: String,
     pub install: bool,
     pub uninstall: bool,
-}
+}

src/get_info.rs

@@ -40,39 +40,40 @@ pub async fn get_cpu_info() -> (Vec<String>, String, String) {
 
     #[cfg(target_os = "linux")]
     {
-        let get_arch_linux = async || -> (Vec<String>, String, String) {
-            let virt = heim_virt::detect().await.unwrap_or(heim_virt::Virtualization::Unknown);
-
-            let mut cpu_name: Vec<String> = Vec::new();
-            if virt.is_vm() || virt.is_container() {
-                for (cpu, count) in cpu_counts {
-                    cpu_name.push(format!("{} @ {} Virtual Core", cpu, count))
-                }
-            } else {
-                for (cpu, count) in cpu_counts {
-                    cpu_name.push(format!("{} @ {} Core", cpu, count))
-                }
+        let virt = {
+            heim_virt::detect()
+                .await
+                .unwrap_or(heim_virt::Virtualization::Unknown)
+        };
+        let mut cpu_name: Vec<String> = Vec::new();
+        if virt.is_vm() || virt.is_container() {
+            for (cpu, count) in cpu_counts {
+                cpu_name.push(format!("{} @ {} Virtual Core", cpu, count))
             }
-
-            if virt == heim_virt::Virtualization::Unknown {
-                (cpu_name, arch, "Physical".to_string())
-            } else {
-                (cpu_name, arch, virt.as_str().to_string())
+        } else {
+            for (cpu, count) in cpu_counts {
+                // cpu_name.push(format!("{} @ {} Core", cpu, count))
+                cpu_name.push(format!("{} @ {} Virtual Core", cpu, count))
             }
-        };
+        }
 
-        get_arch_linux().await
+        if virt == heim_virt::Virtualization::Unknown {
+            (cpu_name, arch, "Physical".to_string())
+        } else {
+            (cpu_name, arch, virt.as_str().to_string())
+        }
     }
 
     #[cfg(target_os = "freebsd")]
     {
-        let virt = String::from("Unknown - FreeBSD");
         let mut cpu_name: Vec<String> = Vec::new();
         for (cpu, count) in cpu_counts {
-            cpu_name.push(format!("{} @ {} Core", cpu, count))
+            cpu_name.push(format!("{} @ {} Virtual Core", cpu, count))
         }
-        (cpu_name, arch, virt)
+        (cpu_name, arch, "Unknown".to_string())
     }
+
+
 }
 
 pub fn get_boot_time() -> u64 {

src/install.rs

@@ -1,13 +1,12 @@
-use crate::manage_utils;
 use crate::args::Args;
+use crate::manage_utils;
 use log::{error, info, warn};
 use std::fs::File;
 use std::io::Write;
 use std::process::{exit, Command};
 use std::{fs, io};
 
 pub fn install_to_systemd(args: Args) {
-
     manage_utils::check_installed("/etc/systemd/system/akile_monitor_client.service");
     manage_utils::copy_binary();
 
@@ -223,10 +222,7 @@ pub fn install_to_openrc(args: Args) {
         }
     }
 
-    match Command::new("rc-update")
-        .arg("-u")
-        .output()
-    {
+    match Command::new("rc-update").arg("-u").output() {
         Ok(tmp) => {
             if tmp.status.success() {
                 info!("成功重载 OpenRC 服务");
@@ -235,10 +231,7 @@ pub fn install_to_openrc(args: Args) {
             }
         }
         Err(e) => {
-            warn!(
-                "无法重载 OpenRC 服务: {}",
-                e
-            );
+            warn!("无法重载 OpenRC 服务: {}", e);
         }
     }
 

src/main.rs

@@ -15,8 +15,8 @@ use tokio_tungstenite::{
 
 use crate::args::*;
 use crate::build_message::{build_host, build_host_state, build_post_gziped_json};
-use sysinfo::System;
 use crate::manage_utils::{check_pid1, PID1};
+use sysinfo::System;
 
 #[tokio::main]
 async fn main() {
@@ -41,7 +41,6 @@ async fn main() {
                 install::install_to_openrc(args.clone().to_args());
             }
         }
-
     } else if args.uninstall {
         simple_logger::init_with_level(log::Level::Debug).unwrap();
         info!("检测到 --uninstall 参数, 正在进入卸载模式");

src/manage_utils.rs

@@ -112,16 +112,13 @@ pub fn copy_binary() {
     }
 }
 
-pub fn delete_binary () {
+pub fn delete_binary() {
     match fs::remove_file("/usr/bin/ak_monitor_client_rs") {
         Ok(_) => {
             info!("成功删除 /usr/bin/ak_monitor_client_rs");
         }
         Err(e) => {
-            warn!(
-                "无法删除 /usr/bin/ak_monitor_client_rs: {}",
-                e
-            );
+            warn!("无法删除 /usr/bin/ak_monitor_client_rs: {}", e);
         }
     }
-}
+}