fixierung

1 files changed, 46 insertions, 18 deletions

diff --git a/src/character.rs b/src/character.rs
index 0630a45..f4686cf 100644
--- a/src/character.rs
+++ b/src/character.rs
@@ -42,19 +42,29 @@ pub struct Character {
 
 impl Names {
     pub fn new() -> Self {
-        Names { romaji: String::new(), japanese: String::new(), aliases: vec![] }
+        Names {
+            romaji: String::new(),
+            japanese: String::new(),
+            aliases: vec![],
+        }
     }
 }
 
 impl Images {
     pub fn new() -> Self {
-        Images { thumb: String::new(), full: String::new() }
+        Images {
+            thumb: String::new(),
+            full: String::new(),
+        }
     }
 }
 
 impl Traits {
     pub fn new() -> Self {
-        Traits { official: vec![], indexed: vec![] }
+        Traits {
+            official: vec![],
+            indexed: vec![],
+        }
     }
 }
 
@@ -67,13 +77,14 @@ impl Character {
             traits: Traits::new(),
             assignments: vec![],
             extra: vec![],
-            role: None
+            role: None,
         }
     }
 
     pub fn parse(&mut self, buf: &str) {
-        let re_extras = Regex::new(r#"(?is)Extra Details \| [0-9]+</H3>.*?<dl>(.*?)</dl>"#).unwrap();
-        let mut sections = get_sections();    
+        let re_extras = Regex::new(r#"(?is)Extra Details \| [0-9]+</H3>.*?<dl>(.*?)</dl>"#)
+                            .unwrap();
+        let mut sections = get_sections();
         section::process(&buf, &mut sections);
 
         let caps = re_extras.captures(&buf);
@@ -89,40 +100,57 @@ impl Character {
 
             self.name.romaji = name.data["romaji".into()].clone();
             self.name.japanese = name.data["japanese".into()].clone();
-            
+
             if name.data["aliases".into()].len() > 0 {
-                self.name.aliases = name.data["aliases".into()].split(", ").map(|s| s.to_string()).collect();
+                self.name.aliases = name.data["aliases".into()]
+                                        .split(", ")
+                                        .map(|s| s.to_string())
+                                        .collect();
             }
-            
+
             self.image.thumb = image.data["thumb".into()].clone();
             self.image.full = image.data["full".into()].clone();
-            
+
             if tags.data.contains_key("tags_raw".into()) {
                 self.tags = tags::parse(&tags.data["tags_raw".into()]);
             }
 
-            self.traits.official = dl_list::parse(&(&sections["traits"] as &Section).data["official_raw".into()]);
-            self.traits.indexed = dl_list::parse(&(&sections["traits"] as &Section).data["indexed_raw".into()]);
+            self.traits.official =
+                dl_list::parse(&(&sections["traits"] as &Section).data["official_raw".into()]);
+            self.traits.indexed =
+                dl_list::parse(&(&sections["traits"] as &Section).data["indexed_raw".into()]);
 
             self.assignments = tiles::parse_tile_link_ids(&(&sections["assignments"] as &Section).data["raw".into()], "series");
-            
+
             if misc.data["role".into()].len() > 0 {
                 self.role = Some(misc.data["role".into()].clone());
             }
         }
-   }
+    }
 }
 
 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("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("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.insert("assignments".into(), Section::new("assignments", r#"(?is)appears in the following</P>(.*?)</UL>"#, vec!["raw"]));
-    s.insert("chars_similar_traits".into(), Section::new("assignments", r#"(?is)with Similar Traits</H3>(.*?)</UL>"#, vec!["raw"]));
+    s.insert("assignments".into(),
+             Section::new("assignments",
+                          r#"(?is)appears in the following</P>(.*?)</UL>"#,
+                          vec!["raw"]));
+    s.insert("chars_similar_traits".into(),
+             Section::new("assignments",
+                          r#"(?is)with Similar Traits</H3>(.*?)</UL>"#,
+                          vec!["raw"]));
 
     s
 }