From 40c0d3c2cc857598d17e951dd550aab9b538ae7c Mon Sep 17 00:00:00 2001 From: "Dr. Matthias Ratajczak" Date: Thu, 15 Dec 2022 16:06:53 +0100 Subject: [PATCH] refactor main --- Cargo.toml | 2 +- src/main.rs | 15 +++------------ src/query.rs | 11 +++++++++++ 3 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 src/query.rs diff --git a/Cargo.toml b/Cargo.toml index 773c0dd..71bb1dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [dependencies] scraper = { version = "*", default-features = false } -anyhow = { version = "1.0.66", default-features = false } +anyhow = { version = "*", default-features = false } ureq = { version = "*", default-features = false , features = ["tls"]} diff --git a/src/main.rs b/src/main.rs index 927a790..8314150 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,15 +1,13 @@ mod extractor; +mod query; -use anyhow::{anyhow, Result}; +use anyhow::Result; use scraper::Html; use extractor::Extractor; -const SIEDLUNG: &str = - "https://www.vvo-online.de/de/fahrplan/aktuelle-abfahrten-ankuenfte/abfahrten?stopid=33006764"; - fn main() -> Result<()> { - let message = query_server()?; + let message = query::query_server()?; let html = Html::parse_document(&message); let extractor = Extractor::new(); @@ -21,10 +19,3 @@ fn main() -> Result<()> { } Ok(()) } - -fn query_server() -> Result { - match ureq::get(SIEDLUNG).call() { - Ok(response) => Ok(response.into_string().map_err(|e| anyhow!(e))?), - Err(e) => Err(anyhow!(e)), - } -} diff --git a/src/query.rs b/src/query.rs new file mode 100644 index 0000000..51b8e83 --- /dev/null +++ b/src/query.rs @@ -0,0 +1,11 @@ +use anyhow::{anyhow, Result}; + +pub(crate) const SIEDLUNG: &str = + "https://www.vvo-online.de/de/fahrplan/aktuelle-abfahrten-ankuenfte/abfahrten?stopid=33006764"; + +pub(crate) fn query_server() -> Result { + match ureq::get(SIEDLUNG).call() { + Ok(response) => Ok(response.into_string().map_err(|e| anyhow!(e))?), + Err(e) => Err(anyhow!(e)), + } +}