Bump version number

Enable NormalizePath middleware
This allows double slashes in paths
2019-07-29 21:50:21 +02:00 · 2019-07-29 21:49:25 +02:00 · 2019-07-22 22:27:19 +02:00 · 2019-07-22 22:26:37 +02:00 · 2019-07-22 22:25:55 +02:00 · 2019-07-22 21:39:45 +02:00
4 changed files with 22 additions and 16 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -792,7 +792,7 @@ dependencies = [

 [[package]]
 name = "hoc"
-version = "0.10.1"
+version = "0.11.1"
 dependencies = [
 "actix-web 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "badge 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -804,7 +804,7 @@ dependencies = [
 "log4rs 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "reqwest 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "ructe 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1680,7 +1680,7 @@ dependencies = [

 [[package]]
 name = "reqwest"
-version = "0.9.17"
+version = "0.9.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1708,6 +1708,7 @@ dependencies = [
 "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winreg 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -2696,7 +2697,7 @@ dependencies = [
 "checksum regex 1.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0b2f0808e7d7e4fb1cb07feb6ff2f4bc827938f24f8c2e6a3beb7370af544bdd"
 "checksum regex-syntax 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d76410686f9e3a17f06128962e0ecc5755870bb890c34820c7af7f1db2e1d48"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
-"checksum reqwest 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "e57803405f8ea0eb041c1567dac36127e0c8caa1251c843cb03d43fd767b3d50"
+"checksum reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0777154c2c3eb54f5c480db01de845652d941e47191277cc673634c3853939"
 "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
 "checksum ructe 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c1e42cc0772d11028ce8dc4ae537964b006bc4e2ba7ebfeb33143c4a4212d76"
 "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "hoc"
-version = "0.10.1"
+version = "0.11.1"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
@ -16,7 +16,7 @@ log = "0.4.7"
 log4rs = "0.8.3"
 number_prefix = "0.3.0"
 openssl-probe = "0.1.2"
-reqwest = "0.9.17"
+reqwest = "0.9.19"
 serde = "1.0.97"
 serde_derive = "1.0.97"
 serde_json = "1.0.40"
--- a/src/main.rs
+++ b/src/main.rs
@ -137,8 +137,12 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str) -> Result<(u64, String, u64)
    Ok((cache.count, head, commits))
 }

-fn remote_exists(url: &str) -> Result<bool> {
-    Ok(CLIENT.head(url).send()?.status() == reqwest::StatusCode::OK)
+fn remote_exists(url: &str) -> impl Future<Item = bool, Error = Error> {
+    CLIENT
+        .head(url)
+        .send()
+        .map(|resp| resp.status() == reqwest::StatusCode::OK)
+        .from_err()
 }

 enum HocResult {
@ -163,15 +167,15 @@ where
    T: Service,
    F: Fn(HocResult) -> Result<HttpResponse>,
 {
-    futures::future::result(Ok(()))
-        .and_then(move |_| {
-            let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
-            let service_path = format!("{}/{}", T::domain(), repo);
-            let path = format!("{}/{}", state.repos, service_path);
+    let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
+    let service_path = format!("{}/{}", T::domain(), repo);
+    let path = format!("{}/{}", state.repos, service_path);
+    let url = format!("https://{}", service_path);
+    remote_exists(&url)
+        .and_then(move |remote_exists| {
            let file = Path::new(&path);
-            let url = format!("https://{}", service_path);
            if !file.exists() {
-                if !remote_exists(&url)? {
+                if !remote_exists {
                    warn!("Repository does not exist: {}", url);
                    return Ok(HocResult::NotFound);
                }
@ -351,6 +355,7 @@ fn start_server() -> Result<()> {
        App::new()
            .data(state.clone())
            .wrap(middleware::Logger::default())
+            .wrap(middleware::NormalizePath)
            .service(index)
            .service(css)
            .service(favicon32)
--- a/src/statics.rs
+++ b/src/statics.rs
@ -15,7 +15,7 @@ pub(crate) const CSS: &str = include_str!("../static/tacit-css.min.css");
 pub(crate) const FAVICON: &[u8] = include_bytes!("../static/favicon32.png");

 lazy_static! {
-    pub(crate) static ref CLIENT: reqwest::Client = reqwest::Client::new();
+    pub(crate) static ref CLIENT: reqwest::r#async::Client = reqwest::r#async::Client::new();
    pub(crate) static ref OPT: Opt = Opt::from_args();
    pub(crate) static ref REPO_COUNT: AtomicUsize =
        AtomicUsize::new(count_repositories(&OPT.outdir).unwrap());
Author	SHA1	Message	Date
Valentin Brandl	5ebdd4067c	Bump version number All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2019-07-29 21:50:21 +02:00
Valentin Brandl	55a1405e71	Enable NormalizePath middleware This allows double slashes in paths	2019-07-29 21:49:25 +02:00
Valentin Brandl	614e5a6da5	Bump version number All checks were successful continuous-integration/drone/tag Build is passing Details continuous-integration/drone/push Build is passing Details	2019-07-22 22:27:19 +02:00
Valentin Brandl	0128e267cc	Use async client to check if a repo exists	2019-07-22 22:26:37 +02:00
Valentin Brandl	c3dffac5da	Use async client	2019-07-22 22:25:55 +02:00
Valentin Brandl	aaaff22907	Merge pull request #42 from vbrandl/dependabot/cargo/reqwest-0.9.19 Bump reqwest from 0.9.17 to 0.9.19	2019-07-22 21:39:45 +02:00
dependabot-preview[bot]	ddfcbf11f1	Bump reqwest from 0.9.17 to 0.9.19 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.9.17 to 0.9.19. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.9.17...v0.9.19) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-07-22 04:28:01 +00:00