CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-09-26 21:41:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(log): propagte some errors and avoid unwrapping (#1297)

Browse Source
This commit is contained in:
Amr Bashir
2024-05-08 17:10:29 +03:00
committed by GitHub
parent 56dde76889
commit fa54f3cc9a
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/log/src/lib.rs
+11 -12
View File
@@ -434,7 +434,7 @@ impl Builder {
TargetKind::Stderr => std::io::stderr().into(), TargetKind::Stderr => std::io::stderr().into(),
TargetKind::Folder { path, file_name } => { TargetKind::Folder { path, file_name } => {
if !path.exists() { if !path.exists() {
fs::create_dir_all(&path).unwrap(); fs::create_dir_all(&path)?;
} }
fern::log_file(get_log_file_path( fern::log_file(get_log_file_path(
@@ -450,9 +450,9 @@ impl Builder {
TargetKind::LogDir { .. } => continue, TargetKind::LogDir { .. } => continue,
#[cfg(desktop)] #[cfg(desktop)]
TargetKind::LogDir { file_name } => { TargetKind::LogDir { file_name } => {
let path = app_handle.path().app_log_dir().unwrap(); let path = app_handle.path().app_log_dir()?;
if !path.exists() { if !path.exists() {
fs::create_dir_all(&path).unwrap(); fs::create_dir_all(&path)?;
} }
fern::log_file(get_log_file_path( fern::log_file(get_log_file_path(
@@ -474,7 +474,7 @@ impl Builder {
}; };
let app_handle = app_handle.clone(); let app_handle = app_handle.clone();
tauri::async_runtime::spawn(async move { tauri::async_runtime::spawn(async move {
app_handle.emit("log://log", payload).unwrap(); let _ = app_handle.emit("log://log", payload);
}); });
}) })
} }
@@ -511,13 +511,9 @@ fn get_log_file_path(
file_name, file_name,
timezone_strategy timezone_strategy
.get_now() .get_now()
.format( .format(&time::format_description::parse(
&time::format_description::parse( "[year]-[month]-[day]_[hour]-[minute]-[second]"
"[year]-[month]-[day]_[hour]-[minute]-[second]" )?)?,
)
.unwrap()
)
.unwrap(),
)); ));
if to.is_file() { if to.is_file() {
// designated rotated log file name already exists // designated rotated log file name already exists
@@ -525,7 +521,10 @@ fn get_log_file_path(
let mut to_bak = to.clone(); let mut to_bak = to.clone();
to_bak.set_file_name(format!( to_bak.set_file_name(format!(
"{}.bak", "{}.bak",
to_bak.file_name().unwrap().to_string_lossy() to_bak
.file_name()
.map(|f| f.to_string_lossy())
.unwrap_or_default()
)); ));
fs::rename(&to, to_bak)?; fs::rename(&to, to_bak)?;
} }