matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Reimplement: Parser::divide_text()

Browse source
This commit is contained in:
Matthias Beyer 2015-12-04 21:47:14 +01:00
parent 5c38e6752b
commit 2dfb76bd0d
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/storage/parser.rs
View file

@ -139,31 +139,33 @@ impl<HP> Parser<HP> where
} }
fn divide_text(&self, text: &String) -> Result<TextTpl, ParserError> { fn divide_text(&self, text: &String) -> Result<TextTpl, ParserError> {
let re = Regex::new(r"(?sm)^---$\n(.*)^---$\n(.*)").unwrap(); let re = Regex::new(r"(?sm)^---$(.*)^---$(.*)").unwrap();
debug!("Splitting: '{}'", text); debug!("Splitting: '{}'", text);
debug!(" regex = {:?}", re); debug!(" regex = {:?}", re);
let captures = re.captures(&text[..]).unwrap_or({ re.captures(text).map(|captures| {
if captures.len() != 3 {
debug!("Unexpected amount of captures");
return Err(ParserError::new("Unexpected Regex output",
text.clone(), 0,
"The regex to divide text into header and content had an unexpected output."))
}
let header = captures.at(1).map(|s| String::from(s));
let content = captures.at(2).map(|s| String::from(s));
debug!("Splitted, Header = '{:?}'", header.clone().unwrap_or("NONE".into()));
debug!("Splitted, Data = '{:?}'", content.clone().unwrap_or("NONE".into()));
Ok((header, content))
}).or_else(|| {
debug!("Cannot capture from text"); debug!("Cannot capture from text");
return Err(ParserError::new("Cannot run regex on text", let e = ParserError::new("Cannot run regex on text",
text.clone(), 0, text.clone(), 0,
"Cannot run regex on text to divide it into header and content.")) "Cannot run regex on text to divide it into header and content.");
}); Some(Err(e))
}).unwrap()
if captures.len() != 2 {
debug!("Unexpected amount of captures");
return Err(ParserError::new("Unexpected Regex output",
text.clone(), 0,
"The regex to divide text into header and content had an unexpected output."))
}
let header = captures.at(0).map(|s| String::from(s));
let content = captures.at(1).map(|s| String::from(s));
debug!("Splitted, Header = '{:?}'", header);
debug!("Splitted, Data = '{:?}'", content);
Ok((header, content))
} }
} }