fix: adjust code

This commit is contained in:
GyDi 2022-10-27 21:13:27 +08:00 committed by GitHub
parent 33a5fb8837
commit 20a194b49a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
use anyhow::{bail, Result}; use anyhow::Result;
use nanoid::nanoid; use nanoid::nanoid;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command; use std::process::Command;
@ -28,20 +28,16 @@ pub fn get_uid(prefix: &str) -> String {
/// parse the string /// parse the string
/// xxx=123123; => 123123 /// xxx=123123; => 123123
pub fn parse_str<T: FromStr>(target: &str, key: &str) -> Option<T> { pub fn parse_str<T: FromStr>(target: &str, key: &str) -> Option<T> {
match target.find(key) { target.find(key).and_then(|idx| {
Some(idx) => { let idx = idx + key.len();
let idx = idx + key.len(); let value = &target[idx..];
let value = &target[idx..];
match match value.split(';').nth(0) { match value.split(';').nth(0) {
Some(value) => value.trim().parse(), Some(value) => value.trim().parse(),
None => value.trim().parse(), None => value.trim().parse(),
} {
Ok(r) => Some(r),
Err(_) => None,
}
} }
None => None, .ok()
} })
} }
/// open file /// open file
@ -49,22 +45,17 @@ pub fn parse_str<T: FromStr>(target: &str, key: &str) -> Option<T> {
pub fn open_file(path: PathBuf) -> Result<()> { pub fn open_file(path: PathBuf) -> Result<()> {
// use vscode first // use vscode first
if let Ok(code) = which::which("code") { if let Ok(code) = which::which("code") {
let mut command = Command::new(&code);
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
{ {
use std::os::windows::process::CommandExt; use std::os::windows::process::CommandExt;
command = command.creation_flags(0x08000000);
if let Err(err) = Command::new(code)
.creation_flags(0x08000000)
.arg(path)
.spawn()
{
bail!("failed to open file by VScode for `{err}`");
}
} }
#[cfg(not(target_os = "windows"))] if let Err(err) = command.arg(&path).spawn() {
if let Err(err) = Command::new(code).arg(path).spawn() { log::error!(target: "app", "failed to open with VScode `{err}`");
bail!("failed to open file by VScode for `{err}`"); open::that(path)?;
} }
return Ok(()); return Ok(());