diff --git a/paper/src/scrapers/renewal_service.rs b/paper/src/scrapers/renewal_service.rs index 90bd26d..32a7ab6 100644 --- a/paper/src/scrapers/renewal_service.rs +++ b/paper/src/scrapers/renewal_service.rs @@ -108,43 +108,38 @@ impl RenewalService { ) -> Result { let client = reqwest::ClientBuilder::new().cookie_store(true).build()?; - return tokio::runtime::Builder::new_current_thread() - .enable_all() - .build()? - .block_on(async { - let request_token = PublicHamburgAuthenticator { - configuration: configuration.clone(), - } - .public_hamburg_authenticate_and_get_request_access_token(&client) - .await; - - if let Ok(request_token) = request_token { - let mut params = HashMap::new(); - params.insert("FORM_SUBMIT", "tl_renewal_action".to_string()); - params.insert("REQUEST_TOKEN", request_token); - params.insert("actionType", "renewItem".to_string()); - params.insert("itemId", item_number.clone()); - - let mut headers = HeaderMap::new(); - headers.append("Accept-Language", HeaderValue::from_str("en-us")?); - headers.append( - "User-Agent", - HeaderValue::from_str("the quick sloth climbs the tree")?, - ); - - let response = client - .post("https://www.buecherhallen.de/entliehene-medien.html") - .headers(headers) - .form(¶ms) - .send() - .await?; - - let html = response.text().await?; - - return RenewalLoanParser::loan_from(item_number, html); - } + let request_token = PublicHamburgAuthenticator { + configuration: configuration.clone(), + } + .public_hamburg_authenticate_and_get_request_access_token(&client) + .await; + + if let Ok(request_token) = request_token { + let mut params = HashMap::new(); + params.insert("FORM_SUBMIT", "tl_renewal_action".to_string()); + params.insert("REQUEST_TOKEN", request_token); + params.insert("actionType", "renewItem".to_string()); + params.insert("itemId", item_number.clone()); + + let mut headers = HeaderMap::new(); + headers.append("Accept-Language", HeaderValue::from_str("en-us")?); + headers.append( + "User-Agent", + HeaderValue::from_str("the quick sloth climbs the tree")?, + ); + + let response = client + .post("https://www.buecherhallen.de/entliehene-medien.html") + .headers(headers) + .form(¶ms) + .send() + .await?; + + let html = response.text().await?; + + return RenewalLoanParser::loan_from(item_number, html); + } - return Err(PaperError::FailedToRenew); - }); + Err(PaperError::FailedToRenew) } }