NG-SD-Plugins/PowerTools
NG-SD-Plugins/PowerTools
4
4
Fork 3
Code Issues 18 Pull requests 1 Projects Releases 24 Wiki Activity

Use PathBuf instead of format. Catch else fore /tmp/ default directory

Browse source
This commit is contained in:
Derek J. Clark 2022-11-27 19:12:13 -08:00
parent c9bf4322ae
commit 96bfff0131
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
backend/src/main.rs
View file

@ -19,17 +19,14 @@ use usdpl_back::Instance;
fn main() -> Result<(), ()> { 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)] #[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() { 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( WriteLogger::init(
@ -45,7 +42,7 @@ fn main() -> Result<(), ()> {
std::fs::File::create(&log_filepath).unwrap(), std::fs::File::create(&log_filepath).unwrap(),
) )
.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); log::info!("Starting back-end ({} v{})", PACKAGE_NAME, PACKAGE_VERSION);
println!("Starting back-end ({} v{})", PACKAGE_NAME, PACKAGE_VERSION); println!("Starting back-end ({} v{})", PACKAGE_NAME, PACKAGE_VERSION);

2
backend/src/utility.rs
View file

@ -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 { pub fn settings_dir() -> std::path::PathBuf {
usdpl_back::api::dirs::home() usdpl_back::api::dirs::home()
.unwrap() .unwrap_or_else(|| "/tmp/".into())
.join(".config/powertools/") .join(".config/powertools/")
} }