purgatory/clash-verge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: adjsut open cmd error

Browse Source
This commit is contained in:
GyDi 2022-03-15 12:51:39 +08:00 committed by GitHub
parent d9ce99887c
commit 2d1780b1cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src-tauri/src/cmds.rs
View File

@ -348,24 +348,26 @@ fn open_path_cmd(path: PathBuf, err_str: &str) -> Result<(), String> {
match result { match result {
Ok(child) => match child.wait_with_output() { Ok(child) => match child.wait_with_output() {
Ok(out) => { Ok(out) => {
// 退出码不为0 不一定没有调用成功
// 因此仅做warn log且不返回错误
if let Some(code) = out.status.code() { if let Some(code) = out.status.code() {
if code != 0 { if code != 0 {
log::error!( log::warn!("failed to open {:?} (code {})", &path, code);
"failed to open path {:?} for {} (code {code})", log::warn!(
&path, "open cmd stdout: {}, stderr: {}",
String::from_utf8_lossy(&out.stdout),
String::from_utf8_lossy(&out.stderr), String::from_utf8_lossy(&out.stderr),
); );
return Err(err_str.into());
} }
} }
} }
Err(err) => { Err(err) => {
log::error!("failed to open path {:?} for {err}", &path); log::error!("failed to open {:?} for {err}", &path);
return Err(err_str.into()); return Err(err_str.into());
} }
}, },
Err(err) => { Err(err) => {
log::error!("failed to open path {:?} for {err}", &path); log::error!("failed to open {:?} for {err}", &path);
return Err(err_str.into()); return Err(err_str.into());
} }
} }