Merge pull request #42 from pwnxpl0it/fix_41

Fix config initalization
pwnxpl0it · Sep 20, 2024 · fa31a8d · fa31a8d
2 parents bcfda86 + ff405c7
commit fa31a8d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/cli/main.rs b/src/cli/main.rs
@@ -36,7 +36,7 @@ fn main() {
             Template::show_info(&Template::parse(&template, true));
         }
 
-        Template::extract(template, true, &mut keywords, config, json_data);
+        Template::extract(template, true, &mut keywords, json_data);
     } else {
         println!(
             "{} {}",

diff --git a/src/core/config.rs b/src/core/config.rs
@@ -16,7 +16,7 @@ impl Config {
         config_dir.pop();
 
         //NOTE: maybe templates path should be parsed from config.toml itself??
-        let templates = config_dir.join("/") + "/templates/";
+        let templates = config_dir.join("/") + "/templates";
 
         Config {
             path: config_path,
@@ -62,7 +62,7 @@ content = '''
         .replace("CONFIGPATH", &self.path)
         .replace("TEMPLATES_PATH", &self.templates_path);
 
-        Template::extract(sample, false, &mut keywords, self, serde_json::Value::Null);
+        Template::extract(sample, false, &mut keywords, serde_json::Value::Null);
     }
 
     pub fn get_keywords(self) -> HashMap<String, String> {

diff --git a/src/core/templates.rs b/src/core/templates.rs
@@ -47,15 +47,10 @@ impl Template {
         template: String,
         is_file: bool,
         keywords: &mut HashMap<String, String>,
-        config: Config,
         json_data: serde_json::Value,
     ) {
         let re = Regex::new(KEYWORDS_REGEX).unwrap();
 
-        if keywords.is_empty() {
-            *keywords = Keywords::init(config);
-        }
-
         let sample = Self::parse(&template, is_file);
 
         let files = sample.files;