From f91514e164f73f494b103db01dcffb7886d76d8f Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Thu, 30 Mar 2023 21:35:47 +0800
Subject: [PATCH] cm-no-ui, debug

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 src/platform/linux_desktop_manager.rs | 11 ++++-------
 src/server/connection.rs              | 20 ++------------------
 src/server/video_service.rs           |  2 --
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/platform/linux_desktop_manager.rs b/src/platform/linux_desktop_manager.rs
index 1896060fe..7b87b9b02 100644
--- a/src/platform/linux_desktop_manager.rs
+++ b/src/platform/linux_desktop_manager.rs
@@ -143,16 +143,13 @@ impl DesktopManager {
     }
 
     fn get_supported_display_seat0_username(&self) -> Option<String> {
-        if is_gdm_user(&self.seat0_username)
-            && self.seat0_display_server == DISPLAY_SERVER_WAYLAND
+        if is_gdm_user(&self.seat0_username) && self.seat0_display_server == DISPLAY_SERVER_WAYLAND
         {
             None
+        } else if self.seat0_username.is_empty() {
+            None
         } else {
-            if self.seat0_username.is_empty() {
-                None
-            } else {
-                Some(self.seat0_username.clone())
-            }
+            Some(self.seat0_username.clone())
         }
     }
 
diff --git a/src/server/connection.rs b/src/server/connection.rs
index 28c661537..e629fa93a 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -2217,13 +2217,9 @@ async fn start_ipc(
                 if !username.is_empty() {
                     break;
                 }
-                let _res = timeout(500, _rx_desktop_ready.recv()).await;
+                let _res = timeout(1_000, _rx_desktop_ready.recv()).await;
                 username = linux_desktop_manager::get_username();
             }
-            println!(
-                "REMOVE ME =================================== headless username '{}' ",
-                &username
-            );
             let uid = {
                 let output = run_cmds(format!("id -u {}", &username))?;
                 let output = output.trim();
@@ -2232,11 +2228,7 @@ async fn start_ipc(
                 }
                 output.to_string()
             };
-            user = Some((username, uid));
-            println!(
-                "REMOVE ME =================================== headless user '{:?}' ",
-                &user
-            );
+            user = Some((uid, username));
             args = vec!["--cm-no-ui"];
         }
         let run_done;
@@ -2251,10 +2243,6 @@ async fn start_ipc(
                 #[cfg(target_os = "linux")]
                 {
                     log::debug!("Start cm");
-                    println!(
-                        "REMOVE ME =================================== start_ipc 222 '{}' ",
-                        linux_desktop_manager::is_headless()
-                    );
                     res = crate::platform::run_as_user(args.clone(), user.clone());
                 }
                 if res.is_ok() {
@@ -2269,10 +2257,6 @@ async fn start_ipc(
         } else {
             run_done = false;
         }
-        println!(
-            "REMOVE ME =================================== start_ipc 333 '{}' ",
-            run_done
-        );
         if !run_done {
             log::debug!("Start cm");
             super::CHILD_PROCESS
diff --git a/src/server/video_service.rs b/src/server/video_service.rs
index 483c29cfa..205d0584c 100644
--- a/src/server/video_service.rs
+++ b/src/server/video_service.rs
@@ -450,8 +450,6 @@ fn run(sp: GenericService) -> ResultType<()> {
     #[cfg(windows)]
     ensure_close_virtual_device()?;
 
-    println!("REMOVE ME ================================= run 111");
-
     // ensure_inited() is needed because release_resource() may be called.
     #[cfg(target_os = "linux")]
     super::wayland::ensure_inited()?;