From ee148689cb87e17b39b8609e86ee513d7f7b2ce8 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Fri, 9 Aug 2019 22:42:48 +0200 Subject: [PATCH] Request only sha from GitHub API --- backend/src/service.rs | 53 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/backend/src/service.rs b/backend/src/service.rs index e8490d6..19fda9c 100644 --- a/backend/src/service.rs +++ b/backend/src/service.rs @@ -18,13 +18,11 @@ pub(crate) trait ApiResponse { } #[derive(Deserialize)] -pub(crate) struct GitHubApiResponse { - pub(crate) sha: String, -} +pub(crate) struct GitHubApiResponse(String); impl ApiResponse for GitHubApiResponse { fn commit_ref(&self) -> &str { - &self.sha + &self.0 } } @@ -76,6 +74,10 @@ pub(crate) trait Service: Sized { fn path() -> &'static str; + fn api_accept() -> Option<&'static str> { + None + } + fn redirect_url(user: &str, repo: &str, commit: &str, file: &str) -> String; fn request_head( @@ -148,6 +150,10 @@ impl Service for Github { "github" } + fn api_accept() -> Option<&'static str> { + Some("application/vnd.github.3.sha") + } + fn raw_url(user: &str, repo: &str, commit: &str, file: &str) -> String { format!( "https://raw.githubusercontent.com/{}/{}/{}/{}", @@ -168,6 +174,45 @@ impl Service for Github { fn redirect_url(user: &str, repo: &str, commit: &str, file: &str) -> String { format!("/github/{}/{}/{}/{}", user, repo, commit, file) } + + fn request_head( + mut response: ClientResponse, + data: web::Path, + _client: web::Data, + cache: State, + ) -> Box> + where + S: 'static + Stream, + { + match response.status() { + StatusCode::OK => Box::new( + response + .body() + // .json::() + .map(move |resp| { + let head = String::from_utf8_lossy(resp.as_ref()); + if let Ok(mut cache) = cache.write() { + let key = data.to_key::(); + cache.store(key, head.to_string()); + } + HttpResponse::SeeOther() + .header( + LOCATION, + Self::redirect_url(&data.user, &data.repo, &head, &data.file) + .as_str(), + ) + .set(CacheControl(vec![ + CacheDirective::Public, + CacheDirective::MaxAge(REDIRECT_AGE.as_secs() as u32), + ])) + .finish() + }) + .from_err(), + ) as Box>, + code => Box::new(futures::future::ok(HttpResponse::build(code).finish())) + as Box>, + } + } } pub(crate) struct Bitbucket;