From dcbf4f685a9c6b9f24b7eba6a096e41802e1e747 Mon Sep 17 00:00:00 2001
From: Robin Arnold <1297660+RRArny@users.noreply.github.com>
Date: Sun, 17 Nov 2024 19:09:27 +0100
Subject: [PATCH] Further refactoring.

---
 src/config.rs | 1 -
 src/main.rs   | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 3e18ef0..c388ec6 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -86,7 +86,6 @@ fn read_config_file(config_filepath: Option<String>) -> Config {
         .unwrap_or(std::env::var("HOME").expect(msg) + "/.config/wxfetch/config.toml");
     let config_file = File::open(config_filepath.clone());
     if config_file.is_err() {
-        println!("Could not open config file at {config_filepath}. Proceeding with defaults...");
         return config;
     }
     let mut config_file = config_file.unwrap();
diff --git a/src/main.rs b/src/main.rs
index 1a6f8ef..c8cc49a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -63,13 +63,13 @@ fn get_secrets(param: Option<String>) -> Secrets {
 async fn get_weather(config: &Config, secrets: &Secrets) -> Value {
     request_wx(config, secrets)
         .await
-        .expect("Weather request failed.")
+        .expect("Weather request failed. Check the API key for AvWx and your internet connection. Maybe try another position.")
 }
 
 fn get_weather_from_file(filename: String) -> Value {
-    let file = File::open(filename).expect("No such file: {filename}");
+    let file = File::open(filename).expect("No such file.");
     let reader = BufReader::new(file);
-    serde_json::from_reader(reader).expect("Failed to read data from file {filename}")
+    serde_json::from_reader(reader).expect("Failed to read data from file.")
 }
 
 #[tokio::main]