From 66021c282811f49b424e6d7cd26e9b6ca0395eb1 Mon Sep 17 00:00:00 2001
From: Rudxain <76864299+Rudxain@users.noreply.github.com>
Date: Thu, 16 Jan 2025 17:09:02 -0400
Subject: [PATCH] chore: fix compile err by splitting backup name and format
 strings as 2 `const`s

---
 src/core/utils.rs         | 9 ++++++---
 src/gui/views/settings.rs | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/core/utils.rs b/src/core/utils.rs
index dce30639..7c4299b4 100644
--- a/src/core/utils.rs
+++ b/src/core/utils.rs
@@ -17,7 +17,8 @@ pub const NAME: &str = "UAD-ng";
 /// [More info](https://developer.android.com/tools/variables#adb)
 pub const ANDROID_SERIAL: &str = "ANDROID_SERIAL";
 pub const EXPORT_FILE_NAME: &str = "selection_export.txt";
-pub const UNINSTALLED_PACKAGES_FILE_NAME_FORMAT: &str = "uninstalled_packages_{}.csv";
+pub const UNINSTALLED_PACKAGES_FILE_NAME: &str = "uninstalled_packages";
+pub const UNINSTALLED_PACKAGES_FORMAT: &str = "csv";
 
 #[derive(Debug, Clone)]
 pub enum Error {
@@ -184,8 +185,10 @@ pub async fn export_packages(
     phone_packages: Vec<Vec<PackageRow>>,
 ) -> Result<bool, String> {
     let backup_file = format!(
-        UNINSTALLED_PACKAGES_FILE_NAME_FORMAT,
-        Local::now().format("%Y%m%d")
+        "{}_{}.{}",
+        UNINSTALLED_PACKAGES_FILE_NAME,
+        Local::now().format("%Y%m%d"),
+        UNINSTALLED_PACKAGES_FORMAT
     );
 
     let file = fs::File::create(backup_file).map_err(|err| err.to_string())?;
diff --git a/src/gui/views/settings.rs b/src/gui/views/settings.rs
index c746448d..8afeb840 100644
--- a/src/gui/views/settings.rs
+++ b/src/gui/views/settings.rs
@@ -9,7 +9,7 @@ use crate::core::sync::{get_android_sdk, perform_adb_commands, CommandType, Phon
 use crate::core::theme::Theme;
 use crate::core::utils::{
     export_packages, open_folder, open_url, string_to_theme, DisplayablePath,
-    UNINSTALLED_PACKAGES_FILE_NAME_FORMAT,
+    UNINSTALLED_PACKAGES_FILE_NAME, UNINSTALLED_PACKAGES_FORMAT,
 };
 use crate::gui::style;
 use crate::gui::views::list::{List as AppsView, PackageInfo};
@@ -544,8 +544,10 @@ impl Settings {
             ].padding(20);
 
             let file_row = row![text(format!(
-                UNINSTALLED_PACKAGES_FILE_NAME_FORMAT,
-                chrono::Local::now().format("%Y%m%d")
+                "{}_{}.{}",
+                UNINSTALLED_PACKAGES_FILE_NAME,
+                chrono::Local::now().format("%Y%m%d"),
+                UNINSTALLED_PACKAGES_FORMAT
             ))
             .style(style::Text::Commentary)]
             .padding(20);