💾 🧩 🎇 Feat, Refactor, Style: Optimized application.rs mainly

KitX_Installer_Egui/rustfmt.toml

@@ -1 +1,4 @@
-max_width = 200
+max_width = 200
+imports_granularity = "One"
+imports_layout = "HorizontalVertical"
+reorder_imports = true

KitX_Installer_Egui/src/macros.rs

@@ -0,0 +1,7 @@
+#[macro_export]
+macro_rules! report_error {
+    ($content:expr) => {
+        println!($content);
+        eprintln!($content);
+    };
+}

KitX_Installer_Egui/src/main.rs

@@ -1,24 +1,25 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
 
-mod app_info;
-mod data;
-mod platforms;
-mod utils;
-mod views;
-
 extern crate msgbox;
 
 use {
     crate::{
         app_info::{AppInfo, RunMode},
         utils::arguments_processor,
-        views::{application, font_helper},
+        views::{application, font_helper, native_helper},
     },
     arguments::Arguments,
     platforms::windows::win_uninstaller,
     std::env,
 };
 
+mod app_info;
+mod data;
+mod macros;
+mod platforms;
+mod utils;
+mod views;
+
 // Entry point of this program.
 fn main() {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
@@ -30,8 +31,7 @@ fn main() {
 
     // If failed to process arguments, exit.
     if app_info.is_none() {
-        println!("Failed to process arguments.");
-        eprintln!("Failed to process arguments.");
+        report_error!("Failed to process command line arguments.");
         return;
     }
 
@@ -41,8 +41,7 @@ fn main() {
     match &app_info.run_mode.as_ref().unwrap() {
         RunMode::Gui => {
             if run_gui(app_info).is_err() {
-                println!("Failed to run GUI.");
-                eprintln!("Failed to run GUI.");
+                report_error!("Failed to launch GUI.");
             }
         }
         RunMode::Cli => {
@@ -63,7 +62,7 @@ fn run_gui(app_info: AppInfo) -> Result<(), eframe::Error> {
     println!("Version: v{}", app_info.version);
     println!();
 
-    let options = application::build_native_options(None);
+    let options = native_helper::build_native_options(None);
 
     let result = eframe::run_native(
         "KitX Installer",

KitX_Installer_Egui/src/platforms/windows/reg_helper.rs

@@ -2,7 +2,6 @@
 
 #[cfg(windows)]
 use winreg::enums::*;
-
 #[cfg(windows)]
 use winreg::RegKey;
 

KitX_Installer_Egui/src/platforms/windows/win_installer.rs

@@ -1,4 +1,4 @@
-use {
+use {
     super::reg_helper::delete_program_registry,
     crate::{
         data::{data_fetcher, download_config::DownloadConfig, install_config::InstallConfig},

KitX_Installer_Egui/src/platforms/windows/win_uninstaller.rs

@@ -1,4 +1,4 @@
-use {
+use {
     super::reg_helper::{self, delete_program_registry},
     std::{
         fs,

KitX_Installer_Egui/src/utils/arguments_processor.rs

@@ -1,4 +1,4 @@
-use {
+use {
     crate::{
         app_info::{AppInfo, RunMode},
         data::debug_config::DebugConfig,