[mio] 去除获取目录失败的unwrap

This commit is contained in:
lubeilin
2024-03-02 11:57:00 +08:00
parent 5264455eba
commit cc717a4060
2 changed files with 12 additions and 6 deletions
+10 -2
View File
@@ -175,11 +175,19 @@ pub fn get_device_id() -> String {
if let Some(id) = common::identifier::get_unique_identifier() {
id
} else {
let path_buf = crate::app_home().unwrap().join("device-id");
let id = uuid::Uuid::new_v4().to_string();
let path_buf = match crate::app_home() {
Ok(path_buf) => {
path_buf.join("device-id")
}
Err(e) => {
log::warn!("{:?}",e);
return id;
}
};
if let Ok(id) = std::fs::read_to_string(path_buf.as_path()) {
id
} else {
let id = uuid::Uuid::new_v4().to_string();
let _ = std::fs::write(path_buf, &id);
id
}
+2 -4
View File
@@ -18,10 +18,8 @@ mod console_out;
mod root_check;
pub fn app_home() -> io::Result<PathBuf> {
let path = std::env::current_exe()
.expect("current_exe error")
.parent()
.expect("current_exe parent error")
let path = std::env::current_exe()?
.parent().ok_or(io::Error::new(io::ErrorKind::Other,"current_exe parent error"))?
.join("env");
if !path.exists() {
std::fs::create_dir_all(&path)?;