From 594468108677450f5275817aa22d406877d78ea5 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Tue, 16 Apr 2019 19:52:12 +0200 Subject: [PATCH] Implement gitlab and bitbucket support --- src/main.rs | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index d3f82e1..012f862 100644 --- a/src/main.rs +++ b/src/main.rs @@ -48,7 +48,7 @@ impl std::fmt::Display for Error { match self { Error::Git(e) => write!(fmt, "Git({})", e), Error::Io(e) => write!(fmt, "Io({})", e), - Error::Badge(s) => write!(fmt, "Basge({})", s), + Error::Badge(s) => write!(fmt, "Badge({})", s), Error::Internal => write!(fmt, "Internal"), } } @@ -121,15 +121,16 @@ fn hoc(repo: &str) -> Result { Ok(res) } -fn github( +fn calculate_hoc( + service: &str, state: web::Data, data: web::Path<(String, String)>, ) -> Result { - let gh_path = format!("github.com/{}/{}", data.0, data.1); - let path = format!("{}/{}", *state, gh_path); + let service_path = format!("{}/{}/{}", service, data.0, data.1); + let path = format!("{}/{}", *state, service_path); let file = Path::new(&path); if !file.exists() { - Repository::clone(&format!("https://{}", gh_path), file)?; + Repository::clone(&format!("https://{}", service_path), file)?; } else { pull(&path)?; } @@ -145,6 +146,27 @@ fn github( .body(badge.to_svg())) } +fn github( + state: web::Data, + data: web::Path<(String, String)>, +) -> Result { + calculate_hoc("github.com", state, data) +} + +fn gitlab( + state: web::Data, + data: web::Path<(String, String)>, +) -> Result { + calculate_hoc("gitlab.com", state, data) +} + +fn bitbucket( + state: web::Data, + data: web::Path<(String, String)>, +) -> Result { + calculate_hoc("bitbucket.org", state, data) +} + fn main() -> std::io::Result<()> { std::env::set_var("RUST_LOG", "actix_web=info"); pretty_env_logger::init(); @@ -157,6 +179,8 @@ fn main() -> std::io::Result<()> { .data(state.clone()) .wrap(middleware::Logger::default()) .service(web::resource("/github/{user}/{repo}").to(github)) + .service(web::resource("/gitlab/{user}/{repo}").to(gitlab)) + .service(web::resource("/bitbucket/{user}/{repo}").to(bitbucket)) }) .bind(interface)? .run()