fixierung

1 files changed, 25 insertions, 10 deletions

diff --git a/src/series.rs b/src/series.rs
index d111fb8..3037e6a 100644
--- a/src/series.rs
+++ b/src/series.rs
@@ -21,12 +21,17 @@ pub struct Names {
 #[derive(Debug, Serialize)]
 pub struct Series {
     pub name: Names,
+    pub tags: Vec<String>,
 }
 
 impl Names {
     pub fn new() -> Self {
         Names {
-            String::new(), String::new(), String::new(), String::new(), String::new()
+            english: String::new(),
+            aliases: String::new(),
+            romaji: String::new(),
+            furigana: String::new(),
+            japanese: String::new(),
         }
     }
 }
@@ -34,30 +39,40 @@ impl Names {
 impl Series {
     pub fn new() -> Self {
         Series {
-            name: Names::new()
+            name: Names::new(),
+            tags: vec![],
         }
     }
 
     pub fn parse(&mut self, buf: &str) {
-        let mut sections = get_sections();    
+        let mut sections = get_sections();
         section::process(&buf, &mut sections);
 
+        let re_genre_tags = Regex::new(r#"(?is)Genre Tags.*?>(.*?)</td>"#).unwrap();
+        let re_genre_tag = Regex::new(r#"[0-9]">(.*?)</A>"#).unwrap();
+
+        for cap in re_genre_tags.captures_iter(&buf) {
+            self.tags = re_genre_tag.captures_iter(cap.at(1).unwrap())
+                                    .map(|v| v.at(1).unwrap().to_string())
+                                    .collect();
+        }
+
         {
             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()];
+            self.name.english = name.data["english".into()].to_string();
+            self.name.aliases = name.data["aliases".into()].to_string();
+            self.name.romaji = name.data["romaji".into()].to_string();
+            self.name.furigana = name.data["furigana".into()].to_string();
+            self.name.japanese = name.data["japanese".into()].to_string();
         }
-   }
+    }
 }
 
 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.insert("name".into(), Section::new("name", r#"(?is)English Title.*?<TD>(.*?)<.*?Aliases.*?<TD>(.*?)<.*?Romaji Title.*?<TD.*?>(.*?)</.*?Furigana Title.*?<TD.*?>(.*?)</.*?Japanese Title.*?<TD.*?>(.*?)</"#, vec!["english", "aliases", "romaji", "furigana", "japanese"]));
 
     s
 }