parsen von traits und tags, wir koennen den configkram eigentlich wieder komplett entfernen. klappt so nicht wirklich.

1 files changed, 33 insertions, 8 deletions

diff --git a/src/main.rs b/src/main.rs
index 7d06fe7..ee8c3eb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,15 +16,21 @@ use pre_process::Section;
 mod config;
 use config::Config;
 
+mod character;
+use character::{Images, Names, Traits, Character};
+
+mod tags;
+mod traits;
+
 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 cfg = Config::from_file("config.yml", vec!["name", "image", "misc", "tags", "traits"]);
 
-    let mut sections: Vec<Section> = vec![];
+    let mut sections: HashMap<String, Section> = HashMap::new();
     for (name, sec) in &cfg.sections {
-        sections.push(Section::new(&name, &sec.pattern, sec.groups.clone()));
+        sections.insert(name.clone(), 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()) {
@@ -39,11 +45,30 @@ 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 name: &Section = &sections["name".into()];
+            let image: &Section = &sections["image".into()];
+            let misc: &Section = &sections["misc".into()];
+            println!("{:?}", Character {
+                name: Names {
+                    romaji: name.data["romaji".into()].clone(),
+                    japanese: name.data["japanese".into()].clone(),
+                    aliases: name.data["aliases".into()].split(", ").map(|s| s.to_string()).collect(),
+                },
+                image: Images {
+                    thumb: image.data["thumb".into()].clone(),
+                    full: image.data["full".into()].clone(),
+                },
+                tags: tags::parse(&(&sections["tags".into()] as &Section).data["tags_raw".into()]),
+                traits: Traits {
+                    official: traits::parse(&(&sections["traits"] as &Section).data["official_raw".into()]),
+                    indexed: traits::parse(&(&sections["traits"] as &Section).data["indexed_raw".into()]),
+                },
+                role: match misc.data["role".into()].len() > 0 {
+                    true => Some(misc.data["role".into()].clone()),
+                    false => None
+                }
+            });
         }
-
-        println!("{:?}", char);
     }
 }