1 files changed, 18 insertions, 3 deletions

diff --git a/src/character.rs b/src/character.rs
index 98c4850..b82ac18 100644
--- a/src/character.rs
+++ b/src/character.rs
@@ -1,5 +1,8 @@
 use super::tags::Tag;
-use super::traits::Trait;
+use super::dl_list::DLListItem;
+use super::section::Section;
+
+use std::collections::HashMap;
 
 #[derive(Debug)]
 pub struct Names {
@@ -16,8 +19,8 @@ pub struct Images {
 
 #[derive(Debug)]
 pub struct Traits {
-    pub official: Vec<Trait>,
-    pub indexed: Vec<Trait>,
+    pub official: Vec<DLListItem>,
+    pub indexed: Vec<DLListItem>,
 }
 
 #[derive(Debug)]
@@ -26,6 +29,18 @@ pub struct Character {
     pub image: Images,
     pub tags: Vec<Tag>,
     pub traits: Traits,
+    pub extra: Vec<DLListItem>,
 
     pub role: Option<String>
 }
+
+pub fn get_sections() -> HashMap<String, Section> {
+    let mut s: HashMap<String, Section> = HashMap::new();
+
+    s.insert("name".into(), Section::new("name", r#"(?is)Romaji Name.*?<TD>(.*?)\s?</TD>.*?Japanese Name.*?<TD>(.*?)\s?</TD>.*?Aliases.*?<TD>(.*?)\s?</TD>"#, vec!["romaji", "japanese", "aliases"]));
+    s.insert("misc".into(), Section::new("misc", r#"(?is)Role</TH>.*?<TD>(.*?)\s?</TD>"#, vec!["role"]));
+    s.insert("image".into(), Section::new("image", r#"(?is)<H3 id="section99">.*<img src="(.*?)" alt=.*?></a><p><a href="(.*?)">View Full Size Image"#, vec!["thumb", "full"]));
+    s.insert("tags".into(), Section::new("tags", r#"(?is)tagged as</P>.*?<TH>(.*?)</TH>"#, vec!["tags_raw"]));
+    s.insert("traits".into(), Section::new("traits", r#"(?is)indexed traits</P>.*?<dl>(.*?)</dl>.*?official traits\s?</P>.*?<dl>(.*?)</dl>"#, vec!["indexed_raw", "official_raw"]));
+    s
+}