From e8b688deed898f2ab42d677c6859483273f2d5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=B3=E5=85=89=E5=B0=91=E5=B9=B4?= <849317537@qq.com>
Date: Wed, 11 Sep 2024 05:55:56 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.rs | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 860bc11..bce5e19 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -38,6 +38,9 @@ static LOGO: &str = r#"
    \ \_\ \_\ \____/\ \____\\ \_\ \_\ \____\\ \_\ 
     \/_/\/ /\/___/  \/____/ \/_/\/_/\/____/ \/_/ 
 "#;
+static Y: &str = "🟢";
+static N: &str = "🔴";
+
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
@@ -448,7 +451,7 @@ fn run_container(container_info: &ContainerInfo, is_exec_cmd: Option<&String>) -
             let err = process::Command::new(cmd_vec[0])
                 .args(&cmd_vec[1..])
                 .exec();
-            println!("🔴 execv {cmd_vec:?}失败: {err:?}");
+            println!("{N} execv {cmd_vec:?}失败: {err:?}");
             0isize
         };
         clone_flags = CloneFlags::empty();
@@ -503,7 +506,7 @@ fn run_container(container_info: &ContainerInfo, is_exec_cmd: Option<&String>) -
             let err = process::Command::new(cmd_vec[0])
                 .args(&cmd_vec[1..])
                 .exec();
-            println!("🔴 execv {cmd_vec:?}失败: {err:?}");
+            println!("{N} execv {cmd_vec:?}失败: {err:?}");
             0isize
         };
         clone_flags = CloneFlags::from_bits_truncate(CLONE_FLAG);
@@ -524,8 +527,8 @@ impl Display for ContainerStatus {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::READY => write!(f, "😀"),
-            Self::RUNNING => write!(f, "🟢"),
-            Self::STOP => write!(f, "🔴"),
+            Self::RUNNING => write!(f, "{Y}"),
+            Self::STOP => write!(f, "{N}"),
         }
     }
 }
@@ -663,8 +666,8 @@ fn stop_container(containers_id: &str, is_remove: bool) -> Result<()> {
             // 删除容器目录
             if is_remove {
                 match fs::remove_dir_all(container_work_path) {
-                    Ok(_) => println!("🟢 删除容器 {container_id} 成功"),
-                    Err(e) => println!("🔴 删除容器失败: {e:?}"),
+                    Ok(_) => println!("{Y} 删除容器 {container_id} 成功"),
+                    Err(e) => println!("{N} 删除容器失败: {e:?}"),
                 }
             }
         } else {
@@ -718,16 +721,16 @@ fn main() -> Result<()>{
         match run_container(&container_info, None) {
             Ok(_) => {
                 if container_info.wait {
-                    println!("🟢 容器 {} 运行完毕", container_info.id);
+                    println!("{Y} 容器 {} 运行完毕", container_info.id);
                     remove_network(&container_info.id);
                 } else {
-                    println!("🟢 主进程退出");
+                    println!("{Y} 主进程退出");
                 }
             }
             Err(e) => {
                 // clone 之后的错误 这里已经无法捕获了
                 // clone 之前出错, 清理工作目录
-                println!("🔴 run_container失败: {e}");
+                println!("{N} run_container失败: {e}");
                 let is_remove = args.restart.is_none();
                 stop_container(&container_info.id, is_remove)?;
             }