Clean up output, and fix more tests.

src/probe/vem_ringde.rs

@@ -1,25 +1,36 @@
+use std::str;
+
 // use log::debug;
-// use scraper::{Html, Selector};
+use scraper::{Html, Selector};
 
 use crate::context::Context;
 use crate::probe::{Entry, Probe};
 
-fn from_html(_document: &str) -> Result<Entry, ()> {
-    /*
+fn from_html(document: &str) -> Result<Entry, ()> {
     let html = Html::parse_document(document);
 
-    let messages = Vec::new();
+    let mut messages = Vec::new();
     let history = Vec::new();
     let comments = Vec::new();
 
+    let selector = Selector::parse("#toporganisations li").unwrap();
+
+    for element in html.select(&selector) {
+        let message = element
+            .text()
+            .map(str::trim)
+            .filter(|s| !s.is_empty())
+            .collect::<Vec<_>>()
+            .join(" ");
+
+        messages.push(message);
+    }
+
     Ok(Entry {
         messages,
         history,
         comments,
     })
-    */
-
-    Err(())
 }
 
 pub struct VemRingde;
@@ -50,40 +61,6 @@ impl Probe for VemRingde {
             }
             Err(_) => Err(()),
         }
-
-        /*
-        if let Ok(page) = Page::from_html(&body) {
-            if !page.owners.is_empty() {
-                println!("  ägare:");
-
-                for owner in &page.owners {
-                    println!("  * {} - {}", owner.title, owner.calls);
-                }
-            }
-
-            if !page.calls.is_empty() {
-                if !page.owners.is_empty() {
-                    println!();
-                }
-
-                println!("  samtal:");
-
-                for call in &page.calls {
-                    println!("  * {}: {}", call.date, call.who);
-                }
-            }
-
-            if page.owners.is_empty() && page.calls.is_empty() {
-                println!("  Inga samtal från {}", number);
-            }
-        } else {
-            if let Err(error) = Page::from_html(&body) {
-                debug!("vemringde: failed to parse page: {:#?}", error);
-            }
-
-            println!("  Failed to find any data");
-        }
-        */
     }
 }
 
@@ -98,7 +75,7 @@ mod tests {
         let document = include_str!("../../fixtures/vemringde/0104754350.html");
 
         let expected = Entry {
-            messages: vec![],
+            messages: vec!["Folksam (5 samtal)".to_string()],
             history: vec![],
             comments: vec![],
         };