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

Use normalize path middleware

Browse Source
This commit is contained in:
Valentin Brandl 2020-09-19 14:22:56 +02:00
parent 689a2109fa
commit 2a73370c9f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@ -29,7 +29,8 @@ use crate::{
}; };
use actix_web::{ use actix_web::{
http::header::{CacheControl, CacheDirective, Expires, LOCATION}, http::header::{CacheControl, CacheDirective, Expires, LOCATION},
middleware, web, App, HttpResponse, HttpServer, Responder, middleware::{self, normalize::TrailingSlash},
web, App, HttpResponse, HttpServer, Responder,
}; };
use badge::{Badge, BadgeOptions}; use badge::{Badge, BadgeOptions};
use git2::{BranchType, Repository}; use git2::{BranchType, Repository};
@ -124,7 +125,7 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str, branch: &str) -> Result<(u64
arg.push("--".to_string()); arg.push("--".to_string());
arg.push(".".to_string()); arg.push(".".to_string());
let output = Command::new("git") let output = Command::new("git")
.args(&dbg!(arg)) .args(&arg)
.current_dir(&repo_dir) .current_dir(&repo_dir)
.output()? .output()?
.stdout; .stdout;
@ -186,8 +187,8 @@ where
data.1.to_lowercase() data.1.to_lowercase()
); );
info!("Deleting cache and repository for {}", repo); info!("Deleting cache and repository for {}", repo);
let cache_dir = dbg!(format!("{}/{}.json", &state.cache, repo)); let cache_dir = format!("{}/{}.json", &state.cache, repo);
let repo_dir = dbg!(format!("{}/{}", &state.repos, repo)); let repo_dir = format!("{}/{}", &state.repos, repo);
std::fs::remove_file(&cache_dir).or_else(|e| { std::fs::remove_file(&cache_dir).or_else(|e| {
if e.kind() == io::ErrorKind::NotFound { if e.kind() == io::ErrorKind::NotFound {
Ok(()) Ok(())
@ -412,7 +413,7 @@ async fn start_server() -> std::io::Result<()> {
App::new() App::new()
.data(state.clone()) .data(state.clone())
.wrap(middleware::Logger::default()) .wrap(middleware::Logger::default())
// .wrap(middleware::NormalizePath::default()) .wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
.service(index) .service(index)
.service(web::resource("/tacit-css.min.css").route(web::get().to(css))) .service(web::resource("/tacit-css.min.css").route(web::get().to(css)))
// TODO // TODO