feat: add Linux open dir support

refactor(logging): refine open dir failed log message
This commit is contained in:
ttyS3 2022-03-12 03:03:47 +08:00
parent 8890051c17
commit cb94d8414f
No known key found for this signature in database
GPG Key ID: E684E1B17F6C9EA5

View File

@ -6,7 +6,7 @@ use crate::{
use crate::{ret_err, wrap_err}; use crate::{ret_err, wrap_err};
use anyhow::Result; use anyhow::Result;
use serde_yaml::Mapping; use serde_yaml::Mapping;
use std::{path::PathBuf, process::Command}; use std::{path::PathBuf, process::Command, process::Stdio};
use tauri::{api, Manager, State}; use tauri::{api, Manager, State};
/// get all profiles from `profiles.yaml` /// get all profiles from `profiles.yaml`
@ -323,25 +323,54 @@ pub fn open_logs_dir() -> Result<(), String> {
/// get open/explorer command /// get open/explorer command
fn open_path_cmd(dir: PathBuf, err_str: &str) -> Result<(), String> { fn open_path_cmd(dir: PathBuf, err_str: &str) -> Result<(), String> {
let result;
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
{ {
use std::os::windows::process::CommandExt; use std::os::windows::process::CommandExt;
if let Err(err) = Command::new("explorer") result = Command::new("explorer")
.creation_flags(0x08000000) .creation_flags(0x08000000)
.arg(dir) .arg(&dir)
.spawn() .spawn();
{
log::error!("{err}");
return Err(err_str.into());
}
} }
#[cfg(not(target_os = "windows"))] #[cfg(target_os = "macos")]
if let Err(err) = Command::new("open").arg(dir).spawn() { {
log::error!("{err}"); result = Command::new("open").arg(&dir).spawn();
}
#[cfg(target_os = "linux")]
{
result = Command::new("xdg-open").arg(&dir).stdout(Stdio::piped()).stderr(Stdio::piped()).spawn();
}
match result {
Ok(child) => {
match child.wait_with_output() {
Ok(out) => {
if let Some(code) = out.status.code() {
if code != 0 {
log::error!("open dir {:?} failed, child exit code: {:?}, stderr: {:?} stdout: {:?}",
&dir, code, String::from_utf8_lossy(&out.stderr), String::from_utf8_lossy(&out.stdout));
return Err(err_str.into()); return Err(err_str.into());
} }
}
},
Err(err) => {
log::error!("open dir {:?} failed, child exec err: {}", &dir, err);
return Err(err_str.into());
}
}
},
Err(err) => {
log::error!("open dir {:?} spawn process failed, err: {}", &dir, err);
return Err(err_str.into());
},
_ => {
log::error!("open dir {:?} failed due to OS not supported", &dir);
return Err(err_str.into());
},
}
return Ok(()); return Ok(());
} }