From 96bfff0131b3ee4b0b9d40114c13501841a6ec30 Mon Sep 17 00:00:00 2001
From: "Derek J. Clark" <derekjohn.clark@gmail.com>
Date: Sun, 27 Nov 2022 19:12:13 -0800
Subject: [PATCH] Use PathBuf instead of format. Catch else fore /tmp/ default
 directory

---
 backend/src/main.rs    | 15 ++++++---------
 backend/src/utility.rs |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/backend/src/main.rs b/backend/src/main.rs
index 940024f..998277b 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -19,17 +19,14 @@ use usdpl_back::Instance;
 
 fn main() -> Result<(), ()> {
 
-    let binding = usdpl_back::api::dirs::home().unwrap();
-    let home_path = binding.to_str().unwrap();
-
-    #[cfg(debug_assertions)]
-    let log_filepath = format!("{}/{}.log", home_path, PACKAGE_NAME);
-    #[cfg(not(debug_assertions))]
-    let log_filepath = format!("/tmp/{}.log", PACKAGE_NAME);
     #[cfg(debug_assertions)]
+    let log_filepath = usdpl_back::api::dirs::home()
+        .unwrap_or_else(|| "/tmp/".into())
+        .join(PACKAGE_NAME.to_owned()+".log");
+    println!("Found home dir: {:?}", log_filepath);
     {
         if std::path::Path::new(&log_filepath).exists() {
-            std::fs::copy(&log_filepath, format!("{}/{}.log.old", home_path, PACKAGE_NAME)).unwrap();
+            std::fs::copy(&log_filepath, &log_filepath.join(".old"));
         }
     }
     WriteLogger::init(
@@ -45,7 +42,7 @@ fn main() -> Result<(), ()> {
         std::fs::File::create(&log_filepath).unwrap(),
     )
     .unwrap();
-    log::debug!("Found home dir {:?}", home_path);
+    log::debug!("Loggin started at {:?}.", log_filepath);
     log::info!("Starting back-end ({} v{})", PACKAGE_NAME, PACKAGE_VERSION);
     println!("Starting back-end ({} v{})", PACKAGE_NAME, PACKAGE_VERSION);
 
diff --git a/backend/src/utility.rs b/backend/src/utility.rs
index e3e8a71..aed4673 100644
--- a/backend/src/utility.rs
+++ b/backend/src/utility.rs
@@ -26,6 +26,6 @@ pub fn unwrap_maybe_fatal<T: Sized, E: Display>(result: Result<T, E>, message: &
 
 pub fn settings_dir() -> std::path::PathBuf {
     usdpl_back::api::dirs::home()
-        .unwrap()
+        .unwrap_or_else(|| "/tmp/".into())
         .join(".config/powertools/")
 }