Move cli option to config file

crates/shared/src/config.rs

@@ -24,6 +24,8 @@ pub struct Core {
     /// Except for those in this list, all plugins are enabled by default
     /// e.g. FooBar.dll should have an entry for "FooBar"
     pub disabled: Vec<String>,
+    /// Whether to show cli window
+    pub cli: bool,
 }
 
 impl Default for Core {
@@ -32,6 +34,7 @@ impl Default for Core {
             // the default location for most people
             install_root: r"C:\Program Files (x86)\Steam\steamapps\common\Baldurs Gate 3".into(),
             disabled: Vec::new(),
+            cli: false,
         }
     }
 }

crates/yabg3nml/src/cli.rs

@@ -3,10 +3,6 @@ use argh::FromArgs;
 /// A simple, non-invasive BG3 native mod loader
 #[derive(Default, FromArgs)]
 pub struct Args {
-    /// show console window
-    #[argh(switch)]
-    pub cli: bool,
-
     /// binary to test inject
     #[cfg(feature = "test-injection")]
     #[argh(option)]

crates/yabg3nml/src/lib.rs

@@ -22,6 +22,7 @@ use eyre::Result;
 use shared::popup::{display_popup, fatal_popup, MessageBoxIcon};
 use tracing::{error, trace};
 
+#[cfg(feature = "test-injection")]
 use cli::Args;
 use event::Event;
 use loader::run_loader;
@@ -47,9 +48,10 @@ pub fn run(run_type: RunType) -> Result<()> {
     let _singleton = SingleInstance::new();
     let _event = Event::new()?;
 
+    #[cfg(feature = "test-injection")]
     let args: Args = argh::from_env();
 
-    let mut init = init(&args)?;
+    let mut init = init()?;
     let _loader_lock = init.loader.file.take();
     let _worker_guard = init.worker.take();
 
@@ -132,10 +134,7 @@ pub fn autostart(pid: Pid) -> Result<()> {
     let _singleton = SingleInstance::new();
     let _event = Event::new()?;
 
-    // DO NOT use argh, since it doesn't understand bg3 cli args
-    let args = Args::default();
-
-    let mut init = init(&args)?;
+    let mut init = init()?;
     let _loader_lock = init.loader.file.take();
     let _worker_guard = init.worker.take();
 

crates/yabg3nml/src/logging.rs

@@ -6,13 +6,7 @@ use tracing::level_filters::LevelFilter;
 use tracing_appender::non_blocking::WorkerGuard;
 use tracing_subscriber::EnvFilter;
 
-use crate::cli::Args;
-
-pub fn setup_logs<P: AsRef<Path>>(
-    config: &Config,
-    plugins_dir: P,
-    args: &Args,
-) -> Result<Option<WorkerGuard>> {
+pub fn setup_logs<P: AsRef<Path>>(config: &Config, plugins_dir: P) -> Result<Option<WorkerGuard>> {
     let mut worker_guard: Option<WorkerGuard> = None;
 
     // env var takes precedence over config value
@@ -22,7 +16,7 @@ pub fn setup_logs<P: AsRef<Path>>(
         .with_default_directive(LevelFilter::INFO.into())
         .parse_lossy(env);
 
-    if cfg!(debug_assertions) || args.cli {
+    if cfg!(debug_assertions) || config.core.cli {
         #[cfg(not(debug_assertions))]
         {
             use crate::console::debug_console;

crates/yabg3nml/src/setup.rs

@@ -11,7 +11,6 @@ use tracing_appender::non_blocking::WorkerGuard;
 use windows::Win32::Security::SE_DEBUG_NAME;
 
 use crate::{
-    cli::Args,
     is_admin::is_admin,
     logging::setup_logs,
     panic::set_hook,
@@ -27,7 +26,7 @@ pub struct InitData {
     pub loader: Loader,
 }
 
-pub fn init(args: &Args) -> Result<InitData> {
+pub fn init() -> Result<InitData> {
     let span = trace_span!("setup");
     let _guard = span.enter();
 
@@ -66,7 +65,7 @@ pub fn init(args: &Args) -> Result<InitData> {
     };
 
     // start logger
-    let worker_guard = setup_logs(config, &plugins_dir, args).context("Failed to set up logs")?;
+    let worker_guard = setup_logs(config, &plugins_dir).context("Failed to set up logs")?;
 
     if first_time {
         display_popup(