assignments & chars mit aehnlichen traits

1 files changed, 5 insertions, 46 deletions

diff --git a/src/main.rs b/src/main.rs
index e76da66..ea89b02 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,4 @@
 extern crate regex;
-use regex::Regex;
 extern crate yaml_rust;
 
 extern crate walkdir;
@@ -9,26 +8,21 @@ use std::io::prelude::*;
 use std::fs::File;
 use std::env;
 use std::path::Path;
-use std::collections::HashMap;
 
 mod pre_process;
 mod section;
-use section::Section;
 
 mod character;
-use character::{Images, Names, Traits, Character};
+use character::Character;
 
 mod tags;
 mod dl_list;
-use dl_list::DLListItem;
+mod tiles;
 
 fn main() {
     let raw_files = env::var("RAW_FILES").unwrap_or("characters".into());
     let base_path = Path::new(&raw_files);
 
-    let re_extras = Regex::new(r#"(?is)Extra Details \| [0-9]+</H3>.*?<dl>(.*?)</dl>"#).unwrap();
-
-    let mut sections: HashMap<String, Section> = character::get_sections();
 
     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");
@@ -40,43 +34,8 @@ fn main() {
 
         let buf = pre_process::strip_irrelevant_content(&buf);
 
-        section::process(&buf, &mut sections);
-
-        // find optional extra details
-        let mut extra_details: Vec<DLListItem> = vec![];
-        let caps = re_extras.captures(&buf);
-        if caps.is_some() {
-            extra_details = dl_list::parse(caps.unwrap().at(1).unwrap());
-        }
-
-        {
-            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: match name.data["aliases".into()].len() > 0 {
-                        true => name.data["aliases".into()].split(", ").map(|s| s.to_string()).collect(),
-                        false => vec![]
-                    }
-                },
-                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: dl_list::parse(&(&sections["traits"] as &Section).data["official_raw".into()]),
-                    indexed: dl_list::parse(&(&sections["traits"] as &Section).data["indexed_raw".into()]),
-                },
-                extra: extra_details,
-                role: match misc.data["role".into()].len() > 0 {
-                    true => Some(misc.data["role".into()].clone()),
-                    false => None
-                }
-            });
-        }
+        let mut char = Character::new();
+        char.parse(&buf);
+        println!("{:?}", char);
     }
 }