fix: don't auto create config directory unless generating instances file

sarowish · Dec 14, 2022 · 6ce6ecc · 6ce6ecc
1 parent e1a0167
commit 6ce6ecc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - No longer crashes if no tag is selected when trying to modify channels of a tag.
 - Reload channels when a tag is deleted.
+- Don't automatically create config directory unless generating instances file.
 
 ## [0.3.1] - 2022-10-16
 ### Fixed

diff --git a/src/config/options.rs b/src/config/options.rs
@@ -37,7 +37,7 @@ impl Options {
             self.tick_rate = *tick_rate;
         }
 
-        if let Some(request_timeout) = CLAP_ARGS.get_one::<u64>("instances") {
+        if let Some(request_timeout) = CLAP_ARGS.get_one::<u64>("request_timeout") {
             self.request_timeout = *request_timeout;
         }
 

diff --git a/src/utils.rs b/src/utils.rs
@@ -16,9 +16,7 @@ pub fn get_config_dir() -> Result<PathBuf> {
         Some(path) => path.join(PACKAGE_NAME),
         None => bail!("Couldn't find config directory"),
     };
-    if !path.exists() {
-        std::fs::create_dir_all(&path)?;
-    }
+
     Ok(path)
 }
 
@@ -59,6 +57,12 @@ pub fn get_default_instances_file() -> Result<PathBuf> {
 pub fn generate_instances_file() -> Result<()> {
     let instances = fetch_invidious_instances()?;
     let instances_file_path = &CONFIG.options.instances;
+    let instances_dir = instances_file_path.parent().unwrap();
+
+    if !instances_dir.exists() {
+        std::fs::create_dir_all(instances_dir)?;
+    }
+
     let mut file = File::create(instances_file_path.as_path())?;
     println!(
         "Generated \"{}\" with the following instances:",