diff options
| -rw-r--r-- | libs/hbb_common/src/lib.rs | 1 | ||||
| -rw-r--r-- | libs/hbb_common/src/platform/linux.rs | 157 | ||||
| -rw-r--r-- | libs/hbb_common/src/platform/mod.rs | 2 |
3 files changed, 0 insertions, 160 deletions
diff --git a/libs/hbb_common/src/lib.rs b/libs/hbb_common/src/lib.rs index 1c49adf..cf1e45e 100644 --- a/libs/hbb_common/src/lib.rs +++ b/libs/hbb_common/src/lib.rs @@ -1,5 +1,4 @@ pub mod compress; -pub mod platform; pub mod protos; pub use bytes; use config::Config; diff --git a/libs/hbb_common/src/platform/linux.rs b/libs/hbb_common/src/platform/linux.rs deleted file mode 100644 index 7c107d1..0000000 --- a/libs/hbb_common/src/platform/linux.rs +++ /dev/null @@ -1,157 +0,0 @@ -use crate::ResultType; - -lazy_static::lazy_static! { - pub static ref DISTRO: Distro = Distro::new(); -} - -pub struct Distro { - pub name: String, - pub version_id: String, -} - -impl Distro { - fn new() -> Self { - let name = run_cmds("awk -F'=' '/^NAME=/ {print $2}' /etc/os-release".to_owned()) - .unwrap_or_default() - .trim() - .trim_matches('"') - .to_string(); - let version_id = - run_cmds("awk -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release".to_owned()) - .unwrap_or_default() - .trim() - .trim_matches('"') - .to_string(); - Self { name, version_id } - } -} - -pub fn get_display_server() -> String { - let mut session = get_values_of_seat0([0].to_vec())[0].clone(); - if session.is_empty() { - // loginctl has not given the expected output. try something else. - if let Ok(sid) = std::env::var("XDG_SESSION_ID") { - // could also execute "cat /proc/self/sessionid" - session = sid; - } - if session.is_empty() { - session = run_cmds("cat /proc/self/sessionid".to_owned()).unwrap_or_default(); - } - } - - get_display_server_of_session(&session) -} - -fn get_display_server_of_session(session: &str) -> String { - let mut display_server = if let Ok(output) = - run_loginctl(Some(vec!["show-session", "-p", "Type", session])) - // Check session type of the session - { - let display_server = String::from_utf8_lossy(&output.stdout) - .replace("Type=", "") - .trim_end() - .into(); - if display_server == "tty" { - // If the type is tty... - if let Ok(output) = run_loginctl(Some(vec!["show-session", "-p", "TTY", session])) - // Get the tty number - { - let tty: String = String::from_utf8_lossy(&output.stdout) - .replace("TTY=", "") - .trim_end() - .into(); - if let Ok(xorg_results) = run_cmds(format!("ps -e | grep \"{tty}.\\\\+Xorg\"")) - // And check if Xorg is running on that tty - { - if xorg_results.trim_end() != "" { - // If it is, manually return "x11", otherwise return tty - return "x11".to_owned(); - } - } - } - } - display_server - } else { - "".to_owned() - }; - if display_server.is_empty() || display_server == "tty" { - // loginctl has not given the expected output. try something else. - if let Ok(sestype) = std::env::var("XDG_SESSION_TYPE") { - display_server = sestype; - } - } - // If the session is not a tty, then just return the type as usual - display_server -} - -pub fn get_values_of_seat0(indices: Vec<usize>) -> Vec<String> { - if let Ok(output) = run_loginctl(None) { - for line in String::from_utf8_lossy(&output.stdout).lines() { - if line.contains("seat0") { - if let Some(sid) = line.split_whitespace().next() { - if is_active(sid) { - return indices - .into_iter() - .map(|idx| line.split_whitespace().nth(idx).unwrap_or("").to_owned()) - .collect::<Vec<String>>(); - } - } - } - } - } - - // some case, there is no seat0 https://github.com/rustdesk/rustdesk/issues/73 - if let Ok(output) = run_loginctl(None) { - for line in String::from_utf8_lossy(&output.stdout).lines() { - if let Some(sid) = line.split_whitespace().next() { - let d = get_display_server_of_session(sid); - if is_active(sid) && d != "tty" { - return indices - .into_iter() - .map(|idx| line.split_whitespace().nth(idx).unwrap_or("").to_owned()) - .collect::<Vec<String>>(); - } - } - } - } - - return indices - .iter() - .map(|_x| "".to_owned()) - .collect::<Vec<String>>(); -} - -fn is_active(sid: &str) -> bool { - if let Ok(output) = run_loginctl(Some(vec!["show-session", "-p", "State", sid])) { - String::from_utf8_lossy(&output.stdout).contains("active") - } else { - false - } -} - -pub fn run_cmds(cmds: String) -> ResultType<String> { - let output = std::process::Command::new("sh") - .args(vec!["-c", &cmds]) - .output()?; - Ok(String::from_utf8_lossy(&output.stdout).to_string()) -} - -#[cfg(not(feature = "flatpak"))] -fn run_loginctl(args: Option<Vec<&str>>) -> std::io::Result<std::process::Output> { - let mut cmd = std::process::Command::new("loginctl"); - if let Some(a) = args { - return cmd.args(a).output(); - } - cmd.output() -} - -#[cfg(feature = "flatpak")] -fn run_loginctl(args: Option<Vec<&str>>) -> std::io::Result<std::process::Output> { - let mut l_args = String::from("loginctl"); - if let Some(a) = args { - l_args = format!("{} {}", l_args, a.join(" ")); - } - std::process::Command::new("flatpak-spawn") - .args(vec![String::from("--host"), l_args]) - .output() -} diff --git a/libs/hbb_common/src/platform/mod.rs b/libs/hbb_common/src/platform/mod.rs deleted file mode 100644 index 8daba25..0000000 --- a/libs/hbb_common/src/platform/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -#[cfg(target_os = "linux")] -pub mod linux; |