diff --git a/src/fetch.rs b/src/fetch.rs index 96f02d7..bd185cd 100644 --- a/src/fetch.rs +++ b/src/fetch.rs @@ -1,11 +1,8 @@ -use std::{ - path::PathBuf, - time::{Duration, Instant, SystemTime}, -}; +use std::{time::{Duration, Instant, SystemTime}, path::PathBuf}; use futures::{sink::SinkExt, TryStreamExt}; use lazy_static::lazy_static; -use log::{info, warn}; +use log::info; use reqwest::Url; use scraper::Selector; use time::PrimitiveDateTime; @@ -97,9 +94,11 @@ impl PdfFetcher { .ok_or(Error::NotFound)?; let pdf_url = CHARTS_URL.join(pdf_href)?; - let head_resp = self.client.head(pdf_url.clone()).send().await?; - - let origin_modtime = head_resp + let origin_modtime = self + .client + .head(pdf_url.clone()) + .send() + .await? .headers() .get(reqwest::header::LAST_MODIFIED) .and_then(|val| { @@ -116,13 +115,7 @@ impl PdfFetcher { .zip(origin_modtime) .map_or(true, |(cache, origin)| origin > cache); - if !head_resp.status().is_success() { - warn!( - "MWRA server returned unexpected response, not fetching updated PDF: {:?}", - head_resp - ); - // Just use the cached PDF, assuming we have it - } else if outdated { + if outdated { info!("Cached PDF is outdated, downloading latest version"); let mut pdf_stream = self diff --git a/src/main.rs b/src/main.rs index b5fa2fb..a69d30c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -41,9 +41,7 @@ async fn try_update(state: &AppState, fetcher: &mut PdfFetcher) -> Result<(), Er } async fn start_updater() -> Result, Error> { - let cached_pdf_path = PathBuf::from( - std::env::var("CACHED_PDF_PATH").unwrap_or_else(|_| String::from("data.pdf")), - ); + let cached_pdf_path = PathBuf::from(std::env::var("CACHED_PDF_PATH").unwrap_or_else(|_| String::from("data.pdf"))); let mut fetcher = PdfFetcher::new(cached_pdf_path)?; let state = web::Data::new(AppState { dataset: RwLock::new(Arc::new(load_data(&mut fetcher).await?)), @@ -68,17 +66,14 @@ async fn start_updater() -> Result, Error> { async fn main() -> std::io::Result<()> { simple_logger::init_with_level(log::Level::Info).unwrap(); - let static_dir = - PathBuf::from(std::env::var("STATIC_DIR").unwrap_or_else(|_| String::from("static"))); + let static_dir = PathBuf::from(std::env::var("STATIC_DIR").unwrap_or_else(|_| String::from("static"))); let state = start_updater().await.expect("Failed to initialize state"); HttpServer::new(move || { App::new() .app_data(state.clone()) - .wrap(Logger::new( - r#"%{r}a "%r" %s %b "%{Referer}i" "%{User-Agent}i" %T"#, - )) + .wrap(Logger::new(r#"%{r}a "%r" %s %b "%{Referer}i" "%{User-Agent}i" %T"#)) .service(csv) .service(json) .service(actix_files::Files::new("/", static_dir.clone()).index_file("index.html"))