From f5a5560a62a605d59f6da2789555c0cf118501b7 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Tue, 30 Apr 2019 15:22:58 +0200 Subject: [PATCH] Refactor to remove duplicate code and add some logs --- src/main.rs | 181 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 114 insertions(+), 67 deletions(-) diff --git a/src/main.rs b/src/main.rs index c5aea70..ae6e74b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,6 +3,8 @@ extern crate actix_web; #[macro_use] extern crate lazy_static; #[macro_use] +extern crate log; +#[macro_use] extern crate serde_derive; mod cache; @@ -133,11 +135,17 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String), Err ]; let cache = CacheState::read_from_file(&cache_dir, &head)?; match &cache { - CacheState::Current(res) => return Ok((*res, head)), + CacheState::Current(res) => { + info!("Using cache for {}", repo_dir); + return Ok((*res, head)); + } CacheState::Old(cache) => { + info!("Updating cache for {}", repo_dir); arg.push(format!("{}..HEAD", cache.head)); } - CacheState::No => {} + CacheState::No => { + info!("Creating cache for {}", repo_dir); + } }; arg.push("--".to_string()); arg.push(".".to_string()); @@ -168,56 +176,34 @@ fn remote_exists(url: &str) -> Result { Ok(CLIENT.head(url).send()?.status() == reqwest::StatusCode::OK) } -fn calculate_hoc( - state: web::Data>, - data: web::Path<(String, String)>, -) -> Result { - let service_path = format!("{}/{}/{}", T::domain(), data.0, data.1); - let path = format!("{}/{}", state.repos, service_path); - let file = Path::new(&path); - if !file.exists() { - let url = format!("https://{}", service_path); - if !remote_exists(&url)? { - return Ok(p404()); - } - create_dir_all(file)?; - let repo = Repository::init_bare(file)?; - repo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*")?; - repo.remote_set_url("origin", &url)?; - } - pull(&path)?; - let (hoc, _) = hoc(&service_path, &state.repos, &state.cache)?; - let hoc = match NumberPrefix::decimal(hoc as f64) { - Standalone(hoc) => hoc.to_string(), - Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix), - }; - let badge_opt = BadgeOptions { - subject: "Hits-of-Code".to_string(), - color: "#007ec6".to_string(), - status: hoc, - }; - let badge = Badge::new(badge_opt)?; - - let (tx, rx_body) = mpsc::unbounded(); - let _ = tx.unbounded_send(Bytes::from(badge.to_svg().as_bytes())); - - let expiration = SystemTime::now() + Duration::from_secs(30); - Ok(HttpResponse::Ok() - .content_type("image/svg+xml") - .set(Expires(expiration.into())) - .set(CacheControl(vec![ - CacheDirective::MaxAge(0u32), - CacheDirective::MustRevalidate, - CacheDirective::NoCache, - CacheDirective::NoStore, - ])) - .streaming(rx_body.map_err(|_| ErrorBadRequest("bad request")))) +enum HocResult { + Hoc { + hoc: u64, + hoc_pretty: String, + head: String, + url: String, + repo: String, + service_path: String, + }, + NotFound, } -fn overview( +fn handle_hoc_request( state: web::Data>, data: web::Path<(String, String)>, -) -> Result { + mapper: F, +) -> Result +where + T: Service, + F: Fn(HocResult) -> Result, +{ + hoc_request::(state, data).and_then(mapper) +} + +fn hoc_request( + state: web::Data>, + data: web::Path<(String, String)>, +) -> Result { let repo = format!("{}/{}", data.0, data.1); let service_path = format!("{}/{}", T::domain(), repo); let path = format!("{}/{}", state.repos, service_path); @@ -225,8 +211,10 @@ fn overview( let url = format!("https://{}", service_path); if !file.exists() { if !remote_exists(&url)? { - return Ok(p404()); + warn!("Repository does not exist: {}", url); + return Ok(HocResult::NotFound); } + info!("Cloning {} for the first time", url); create_dir_all(file)?; let repo = Repository::init_bare(file)?; repo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*")?; @@ -238,26 +226,85 @@ fn overview( Standalone(hoc) => hoc.to_string(), Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix), }; - let mut buf = Vec::new(); - let req_path = format!("{}/{}/{}", T::url_path(), data.0, data.1); - templates::overview( - &mut buf, - VERSION_INFO, - &OPT.domain, - &req_path, - &url, + Ok(HocResult::Hoc { hoc, - &hoc_pretty, - &head, - &T::commit_url(&repo, &head), - )?; + hoc_pretty, + head, + url, + repo, + service_path, + }) +} - let (tx, rx_body) = mpsc::unbounded(); - let _ = tx.unbounded_send(Bytes::from(buf)); +fn calculate_hoc( + state: web::Data>, + data: web::Path<(String, String)>, +) -> Result { + let mapper = |r| match r { + HocResult::NotFound => Ok(p404()), + HocResult::Hoc { hoc_pretty, .. } => { + let badge_opt = BadgeOptions { + subject: "Hits-of-Code".to_string(), + color: "#007ec6".to_string(), + status: hoc_pretty, + }; + let badge = Badge::new(badge_opt)?; - Ok(HttpResponse::Ok() - .content_type("text/html") - .streaming(rx_body.map_err(|_| ErrorBadRequest("bad request")))) + let (tx, rx_body) = mpsc::unbounded(); + let _ = tx.unbounded_send(Bytes::from(badge.to_svg().as_bytes())); + + let expiration = SystemTime::now() + Duration::from_secs(30); + Ok(HttpResponse::Ok() + .content_type("image/svg+xml") + .set(Expires(expiration.into())) + .set(CacheControl(vec![ + CacheDirective::MaxAge(0u32), + CacheDirective::MustRevalidate, + CacheDirective::NoCache, + CacheDirective::NoStore, + ])) + .streaming(rx_body.map_err(|_| ErrorBadRequest("bad request")))) + } + }; + handle_hoc_request::(state, data, mapper) +} + +fn overview( + state: web::Data>, + data: web::Path<(String, String)>, +) -> Result { + let mapper = |r| match r { + HocResult::NotFound => Ok(p404()), + HocResult::Hoc { + hoc, + hoc_pretty, + url, + head, + repo, + service_path, + } => { + let mut buf = Vec::new(); + templates::overview( + &mut buf, + VERSION_INFO, + &OPT.domain, + &service_path, + &url, + hoc, + &hoc_pretty, + &head, + &T::commit_url(&repo, &head), + )?; + + let (tx, rx_body) = mpsc::unbounded(); + let _ = tx.unbounded_send(Bytes::from(buf)); + + Ok(HttpResponse::Ok() + .content_type("text/html") + .streaming(rx_body.map_err(|_| ErrorBadRequest("bad request")))) + } + }; + handle_hoc_request::(state, data, mapper) } #[get("/")] @@ -279,7 +326,7 @@ fn css() -> HttpResponse { } fn main() -> std::io::Result<()> { - std::env::set_var("RUST_LOG", "actix_web=warn"); + std::env::set_var("RUST_LOG", "actix_web=info,hoc=info"); pretty_env_logger::init(); openssl_probe::init_ssl_cert_env_vars(); let interface = format!("{}:{}", OPT.host, OPT.port);