From 6c9472399562a6613e12da726ede4e45a249bad7 Mon Sep 17 00:00:00 2001
From: Lucas Schwiderski <lucas@lschwiderski.de>
Date: Tue, 14 Nov 2023 15:07:07 +0100
Subject: [PATCH] Fix Nexusmods API key not being loaded from config

---
 crates/dtmm/src/controller/import.rs | 5 ++++-
 crates/dtmm/src/state/delegate.rs    | 1 +
 crates/dtmm/src/util/config.rs       | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/crates/dtmm/src/controller/import.rs b/crates/dtmm/src/controller/import.rs
index 3e17d4c..05feba9 100644
--- a/crates/dtmm/src/controller/import.rs
+++ b/crates/dtmm/src/controller/import.rs
@@ -384,7 +384,10 @@ pub(crate) async fn import_mod(state: ActionState, info: FileInfo) -> Result<Mod
                 .mods_id(id)
                 .await
                 .wrap_err_with(|| format!("Failed to query mod {} from Nexus", id))?;
-            Some(NexusInfo::from(mod_info))
+            let info = NexusInfo::from(mod_info);
+
+            tracing::debug!("{:?}", info);
+            Some(info)
         } else {
             None
         }
diff --git a/crates/dtmm/src/state/delegate.rs b/crates/dtmm/src/state/delegate.rs
index 97c6e6b..47d56e8 100644
--- a/crates/dtmm/src/state/delegate.rs
+++ b/crates/dtmm/src/state/delegate.rs
@@ -411,6 +411,7 @@ impl AppDelegate<State> for Delegate {
                     state.config_path = Arc::new(config.path);
                     state.data_dir = Arc::new(config.data_dir);
                     state.game_dir = Arc::new(config.game_dir.unwrap_or_default());
+                    state.nexus_api_key = Arc::new(config.nexus_api_key.unwrap_or_default());
                     state.is_io_enabled = config.unsafe_io;
                 }
 
diff --git a/crates/dtmm/src/util/config.rs b/crates/dtmm/src/util/config.rs
index 3a0d0b2..9affbb6 100644
--- a/crates/dtmm/src/util/config.rs
+++ b/crates/dtmm/src/util/config.rs
@@ -125,6 +125,9 @@ where
                 .wrap_err_with(|| format!("Invalid config file {}", path.display()))?;
 
             cfg.path = path;
+
+            tracing::debug!("Read config file '{}': {:?}", cfg.path.display(), cfg);
+
             Ok(cfg)
         }
         Err(err) if err.kind() == ErrorKind::NotFound => {
@@ -133,6 +136,11 @@ where
                     .wrap_err_with(|| format!("Failed to read config file {}", path.display()))?;
             }
 
+            tracing::debug!(
+                "Config file not found at '{}', creating default.",
+                path.display()
+            );
+
             {
                 let parent = default_path
                     .parent()