Populate directory field in challenge config

This field is used to check against the enabled/disabled challenges in the
deploy profile, and was not being set when parsed. This got removed in a
rebase somewhere(?) and broke the validate command. Now fixed!

Signed-off-by: Robert Detjens <[email protected]>

src/configparser/challenge.rs

@@ -31,19 +31,32 @@ pub fn parse_all() -> Vec<Result<ChallengeConfig, Error>> {
 pub fn parse_one(path: &str) -> Result<ChallengeConfig> {
     trace!("trying to parse {path}");
 
+    // remove 'challenge.yaml' from path
+    let chal_dir = Path::new(path)
+        // pop off leading `./` from SearchBuilder results
+        .strip_prefix("./")?
+        // remove last challenge.yaml
+        .parent()
+        .expect("could not extract path from search path");
+
     // extract category from challenge path
-    let category = Path::new(path)
+    let category = chal_dir
         .components()
-        .nth_back(2)
+        .nth_back(1)
         .expect("could not find category from path")
         .as_os_str()
         .to_str()
         .unwrap();
 
     let parsed = Figment::new()
         .merge(Yaml::file(path))
+        // merge in generated data from file path
+        .merge(Serialized::default("directory", chal_dir))
         .merge(Serialized::default("category", category))
         .extract()?;
+
+    trace!("got challenge config: {parsed:#?}");
+
     Ok(parsed)
 }
 
@@ -57,13 +70,10 @@ pub struct ChallengeConfig {
     name: String,
     author: String,
     description: String,
+    category: String,
 
-    #[serde(default)]
     directory: PathBuf,
 
-    #[serde(default)]
-    category: String,
-
     #[serde(default = "default_difficulty")]
     difficulty: i64,