serien hinzugefuegt, aber ich muss auf die naechste rust nightly warten

2 files changed, 67 insertions, 2 deletions

diff --git a/src/main.rs b/src/main.rs
index 2b96024..7481376 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 #[macro_use] extern crate serde_derive;
 extern crate serde_json;
 
@@ -22,6 +22,8 @@ mod section;
 
 mod character;
 use character::Character;
+mod series;
+use series::Series;
 
 mod tags;
 mod dl_list;
@@ -66,7 +68,7 @@ fn main() {
 
                 let buf = pre_process::strip_irrelevant_content(&buf);
 
-                let mut char = Character::new();
+                let mut char = Series::new();
                 char.parse(&buf);
 
                 let json = serde_json::to_string(&char).unwrap();
diff --git a/src/series.rs b/src/series.rs
new file mode 100644
index 0000000..d111fb8
--- /dev/null
+++ b/src/series.rs
@@ -0,0 +1,63 @@
+use super::tags;
+use super::tags::Tag;
+use super::dl_list;
+use super::dl_list::DLListItem;
+use super::section;
+use super::section::Section;
+use super::regex::Regex;
+use super::tiles;
+
+use std::collections::HashMap;
+
+#[derive(Debug, Serialize)]
+pub struct Names {
+    pub english: String,
+    pub aliases: String,
+    pub romaji: String,
+    pub furigana: String,
+    pub japanese: String,
+}
+
+#[derive(Debug, Serialize)]
+pub struct Series {
+    pub name: Names,
+}
+
+impl Names {
+    pub fn new() -> Self {
+        Names {
+            String::new(), String::new(), String::new(), String::new(), String::new()
+        }
+    }
+}
+
+impl Series {
+    pub fn new() -> Self {
+        Series {
+            name: Names::new()
+        }
+    }
+
+    pub fn parse(&mut self, buf: &str) {
+        let mut sections = get_sections();    
+        section::process(&buf, &mut sections);
+
+        {
+            let name: &Section = &sections["name".into()];
+
+            self.name.english = name["english".into()];
+            self.name.aliases = name["aliases".into()];
+            self.name.romaji = name["romaji".into()];
+            self.name.furigana = name["furigana".into()];
+            self.name.japanese = name["japanese".into()];
+        }
+   }
+}
+
+fn get_sections() -> HashMap<String, Section> {
+    let mut s: HashMap<String, Section> = HashMap::new();
+
+    s.insert("name".into(), Section::new("name", r#"(?is)English Title.*?<TD>(.*?)</TD>.*?Aliases.*?<TD>(.*?)?</TD>.*?Romaji Title.*?<TD.*?>(.*?)</TD>.*?Furigana Title.*?<TD.*?>(.*?)</TD>.*?Japanese Title.*?<TD.*?>(.*?)</TD>"#, vec!["english", "aliases", "romaji", "furigana", "japanese"]));
+
+    s
+}