1 files changed, 22 insertions, 14 deletions

diff --git a/src/main.rs b/src/main.rs
index ee8c3eb..e76da66 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
 extern crate regex;
+use regex::Regex;
 extern crate yaml_rust;
 
 extern crate walkdir;
@@ -11,27 +12,23 @@ use std::path::Path;
 use std::collections::HashMap;
 
 mod pre_process;
-use pre_process::Section;
-
-mod config;
-use config::Config;
+mod section;
+use section::Section;
 
 mod character;
 use character::{Images, Names, Traits, Character};
 
 mod tags;
-mod traits;
+mod dl_list;
+use dl_list::DLListItem;
 
 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", vec!["name", "image", "misc", "tags", "traits"]);
+    let re_extras = Regex::new(r#"(?is)Extra Details \| [0-9]+</H3>.*?<dl>(.*?)</dl>"#).unwrap();
 
-    let mut sections: HashMap<String, Section> = HashMap::new();
-    for (name, sec) in &cfg.sections {
-        sections.insert(name.clone(), Section::new(&name, &sec.pattern, sec.groups.clone()));
-    }
+    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");
@@ -43,7 +40,14 @@ fn main() {
 
         let buf = pre_process::strip_irrelevant_content(&buf);
 
-        pre_process::split_sections(&buf, &mut sections);
+        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()];
@@ -53,7 +57,10 @@ fn main() {
                 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(),
+                    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(),
@@ -61,9 +68,10 @@ fn main() {
                 },
                 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()]),
+                    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