vbrandl/hoc
1
0
Fork 0
Code Issues 1 Pull Requests Actions Projects Releases Wiki Activity

Make code async

Browse Source
This commit is contained in:
Valentin Brandl 2019-05-19 13:56:11 +02:00
parent 0fcafc7e4b
commit 6438bbba82
No known key found for this signature in database
GPG Key ID: 30D341DD34118D7D
1 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/main.rs
View File

@ -26,7 +26,7 @@ use actix_web::{
}; };
use badge::{Badge, BadgeOptions}; use badge::{Badge, BadgeOptions};
use bytes::Bytes; use bytes::Bytes;
use futures::{unsync::mpsc, Stream}; use futures::{unsync::mpsc, Future, Stream};
use git2::Repository; use git2::Repository;
use number_prefix::{NumberPrefix, Prefixed, Standalone}; use number_prefix::{NumberPrefix, Prefixed, Standalone};
use std::{ use std::{
@ -141,7 +141,7 @@ fn handle_hoc_request<T, F>(
state: web::Data<Arc<State>>, state: web::Data<Arc<State>>,
data: web::Path<(String, String)>, data: web::Path<(String, String)>,
mapper: F, mapper: F,
) -> Result<HttpResponse> ) -> impl Future<Item = HttpResponse, Error = Error>
where where
T: Service, T: Service,
F: Fn(HocResult) -> Result<HttpResponse>, F: Fn(HocResult) -> Result<HttpResponse>,
@ -152,43 +152,45 @@ where
fn hoc_request<T: Service>( fn hoc_request<T: Service>(
state: web::Data<Arc<State>>, state: web::Data<Arc<State>>,
data: web::Path<(String, String)>, data: web::Path<(String, String)>,
) -> Result<HocResult> { ) -> impl Future<Item = HocResult, Error = Error> {
let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase()); futures::future::result(Ok(())).and_then(move |_| {
let service_path = format!("{}/{}", T::domain(), repo); let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
let path = format!("{}/{}", state.repos, service_path); let service_path = format!("{}/{}", T::domain(), repo);
let file = Path::new(&path); let path = format!("{}/{}", state.repos, service_path);
let url = format!("https://{}", service_path); let file = Path::new(&path);
if !file.exists() { let url = format!("https://{}", service_path);
if !remote_exists(&url)? { if !file.exists() {
warn!("Repository does not exist: {}", url); if !remote_exists(&url)? {
return Ok(HocResult::NotFound); 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/*")?;
repo.remote_set_url("origin", &url)?;
} }
info!("Cloning {} for the first time", url); pull(&path)?;
create_dir_all(file)?; let (hoc, head) = hoc(&service_path, &state.repos, &state.cache)?;
let repo = Repository::init_bare(file)?; let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
repo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*")?; Standalone(hoc) => hoc.to_string(),
repo.remote_set_url("origin", &url)?; Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix),
} };
pull(&path)?; Ok(HocResult::Hoc {
let (hoc, head) = hoc(&service_path, &state.repos, &state.cache)?; hoc,
let hoc_pretty = match NumberPrefix::decimal(hoc as f64) { hoc_pretty,
Standalone(hoc) => hoc.to_string(), head,
Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix), url,
}; repo,
Ok(HocResult::Hoc { service_path,
hoc, })
hoc_pretty,
head,
url,
repo,
service_path,
}) })
} }
fn calculate_hoc<T: Service>( fn calculate_hoc<T: Service>(
state: web::Data<Arc<State>>, state: web::Data<Arc<State>>,
data: web::Path<(String, String)>, data: web::Path<(String, String)>,
) -> Result<HttpResponse> { ) -> impl Future<Item = HttpResponse, Error = Error> {
let mapper = |r| match r { let mapper = |r| match r {
HocResult::NotFound => Ok(p404()), HocResult::NotFound => Ok(p404()),
HocResult::Hoc { hoc_pretty, .. } => { HocResult::Hoc { hoc_pretty, .. } => {
@ -221,7 +223,7 @@ fn calculate_hoc<T: Service>(
fn overview<T: Service>( fn overview<T: Service>(
state: web::Data<Arc<State>>, state: web::Data<Arc<State>>,
data: web::Path<(String, String)>, data: web::Path<(String, String)>,
) -> Result<HttpResponse> { ) -> impl Future<Item = HttpResponse, Error = Error> {
let mapper = |r| match r { let mapper = |r| match r {
HocResult::NotFound => Ok(p404()), HocResult::NotFound => Ok(p404()),
HocResult::Hoc { HocResult::Hoc {
@ -314,13 +316,13 @@ fn main() -> Result<()> {
.service(css) .service(css)
.service(favicon32) .service(favicon32)
.service(generate) .service(generate)
.service(web::resource("/github/{user}/{repo}").to(calculate_hoc::<GitHub>)) .service(web::resource("/github/{user}/{repo}").to_async(calculate_hoc::<GitHub>))
.service(web::resource("/gitlab/{user}/{repo}").to(calculate_hoc::<Gitlab>)) .service(web::resource("/gitlab/{user}/{repo}").to_async(calculate_hoc::<Gitlab>))
.service(web::resource("/bitbucket/{user}/{repo}").to(calculate_hoc::<Bitbucket>)) .service(web::resource("/bitbucket/{user}/{repo}").to_async(calculate_hoc::<Bitbucket>))
.service(web::resource("/view/github/{user}/{repo}").to(overview::<GitHub>)) .service(web::resource("/view/github/{user}/{repo}").to_async(overview::<GitHub>))
.service(web::resource("/view/gitlab/{user}/{repo}").to(overview::<Gitlab>)) .service(web::resource("/view/gitlab/{user}/{repo}").to_async(overview::<Gitlab>))
.service(web::resource("/view/bitbucket/{user}/{repo}").to(overview::<Bitbucket>)) .service(web::resource("/view/bitbucket/{user}/{repo}").to_async(overview::<Bitbucket>))
.default_service(web::resource("").route(web::get().to(p404))) .default_service(web::resource("").route(web::get().to_async(p404)))
}) })
.workers(OPT.workers) .workers(OPT.workers)
.bind(interface)? .bind(interface)?