logaritmisk/whoareyou
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up output, and fix more tests.

Browse Source
This commit is contained in:
Anders Olsson
2019-01-22 12:00:12 +01:00
parent a1d11c976d
commit 5a1d428c22
3 changed files with 51 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/probe/eniro.rs
View File

@@ -22,7 +22,13 @@ fn from_html(document: &str) -> Result<Entry, ()> {
let selector = Selector::parse("div.PhoneNoHit div.search-info-container p").unwrap();
if let Some(element) = html.select(&selector).next() {
let message = element.inner_html();
let message = element
.text()
.map(str::trim)
.filter(|s| !s.is_empty())
.collect::<Vec<_>>()
.join(" ");
let message = htmlescape::decode_html(&message).unwrap();
history.push(message);
@@ -94,10 +100,7 @@ mod tests {
let expected = Entry {
messages: vec![],
history: vec![
"<strong>3464</strong> denna vecka och <strong>6637</strong> totalt.<!-- --> "
.to_string(),
],
history: vec!["3464 denna vecka och 6637 totalt.".to_string()],
comments: vec![],
};
@@ -123,10 +126,7 @@ mod tests {
let expected = Entry {
messages: vec![],
history: vec![
"<strong>16</strong> denna vecka och <strong>98</strong> totalt.<!-- --> "
.to_string(),
],
history: vec!["16 denna vecka och 98 totalt.".to_string()],
comments: vec![],
};
@@ -139,10 +139,7 @@ mod tests {
let expected = Entry {
messages: vec![],
history: vec![
"<strong>20</strong> denna vecka och <strong>602</strong> totalt.<!-- --> "
.to_string(),
],
history: vec!["20 denna vecka och 602 totalt.".to_string()],
comments: vec![],
};
@@ -155,10 +152,7 @@ mod tests {
let expected = Entry {
messages: vec![],
history: vec![
"<strong>29</strong> denna vecka och <strong>900</strong> totalt.<!-- --> "
.to_string(),
],
history: vec!["29 denna vecka och 900 totalt.".to_string()],
comments: vec![],
};
@@ -171,10 +165,7 @@ mod tests {
let expected = Entry {
messages: vec![],
history: vec![
"<strong>303</strong> denna vecka och <strong>304</strong> totalt.<!-- --> "
.to_string(),
],
history: vec!["303 denna vecka och 304 totalt.".to_string()],
comments: vec![],
};