jetzt werden die Sektionen aus einer config.yml rausgezogen.

1 files changed, 14 insertions, 7 deletions

diff --git a/src/main.rs b/src/main.rs
index 97b3094..7d06fe7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
 extern crate regex;
+extern crate yaml_rust;
 
 extern crate walkdir;
 use walkdir::WalkDir;
@@ -12,13 +13,19 @@ use std::collections::HashMap;
 mod pre_process;
 use pre_process::Section;
 
+mod config;
+use config::Config;
+
 fn main() {
     let raw_files = env::var("RAW_FILES").unwrap_or("characters".into());
     let base_path = Path::new(&raw_files);
 
+    let cfg = Config::from_file("config.yml");
+
     let mut sections: Vec<Section> = vec![];
-        sections.push(Section::new("name", r#"(?is)Romaji Name.*?<TD>(.*?)\s?</TD>.*?Japanese Name.*?<TD>(.*?)\s?</TD>"#, vec!["romaji".into(), "japanese".into()]));
-    sections.push(Section::new("image", r#"(?is)<H3 id="section99">.*<img src="(.*?)" alt=.*?></a><p><a href="(.*?)">View Full Size Image"#, vec!["thumb".into(), "full".into()]));
+    for (name, sec) in &cfg.sections {
+        sections.push(Section::new(&name, &sec.pattern, sec.groups.clone()));
+    }
 
     for entry in WalkDir::new(base_path).min_depth(1).into_iter().filter_map(|e| e.ok()) {
         let mut f = File::open(entry.path()).expect("could not open file");
@@ -32,11 +39,11 @@ fn main() {
 
         pre_process::split_sections(&buf, &mut sections);
 
-                let mut char: HashMap<String, HashMap<String, String>> = HashMap::new();
-                for s in &sections {
-                        char.insert(s.name.clone(), s.data.clone());
-                }
+        let mut char: HashMap<String, HashMap<String, String>> = HashMap::new();
+        for s in &sections {
+            char.insert(s.name.clone(), s.data.clone());
+        }
 
-                println!("{:?}", char);
+        println!("{:?}", char);
     }
 }