From eb0bfd4e710ab31cd141b22a38a3ad3fb0015d4f Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Thu, 17 Jan 2019 15:34:11 +0100 Subject: [PATCH] Better handling. --- README.md | 12 ++++++------ src/probe/telefonforsaljare.rs | 7 +++++-- src/probe/vem_ringde.rs | 4 ++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6c47ee7..81d349a 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ $ whoareyou 0700000000 Almost everything. I will add stuff when I need stuff. But hey, if you found this project and want to use it. Fork it, change it, create a PR, and I will add it :) -[ ] Add flag to open url for probes in browser (easier for debugging) -[x] Probe should return and Result, so we don't print a new line for empty result -[ ] Add logging -[ ] List cache entries -[ ] Clear cache entries -[ ] Add some nice colors, so it's easier to read the output. +- [x] Add flag to open url for probes in browser (easier for debugging) +- [x] Probe should return and Result, so we don't print a new line for empty result +- [x] Add logging +- [ ] List cache entries +- [ ] Clear cache entries +- [ ] Add some nice colors, so it's easier to read the output. diff --git a/src/probe/telefonforsaljare.rs b/src/probe/telefonforsaljare.rs index a3209e3..8ce2c99 100644 --- a/src/probe/telefonforsaljare.rs +++ b/src/probe/telefonforsaljare.rs @@ -17,7 +17,7 @@ struct Page { #[derive(Debug, FromHtml)] #[html(selector = "#content")] struct Content { - #[html(selector = "p:nth-child(2)", attr = "inner")] + #[html(selector = "p:nth-child(2)", attr = "inner", default = "")] title: String, #[html(selector = "p:nth-child(5)", attr = "inner")] @@ -58,7 +58,10 @@ impl Probe for Telefonforsaljare { println!("telefonforsaljare.nu:"); if let Ok(page) = Page::from_html(&body) { - println!(" {}", page.content.title); + if !page.content.title.is_empty() { + println!(" {}", page.content.title); + } + println!(" {}", page.content.history); for comment in &page.comments { diff --git a/src/probe/vem_ringde.rs b/src/probe/vem_ringde.rs index 6ce2328..59d3482 100644 --- a/src/probe/vem_ringde.rs +++ b/src/probe/vem_ringde.rs @@ -74,6 +74,10 @@ impl Probe for VemRingde { 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);