index : static-web-server.git

ascending towards madness

author Jose Quintana <joseluisquintana20@gmail.com> 2019-12-13 0:11:55.0 +00:00:00
committer Jose Quintana <joseluisquintana20@gmail.com> 2019-12-13 0:11:55.0 +00:00:00
commit 
33128c367f53f1e8a90ac821137a18ad7d44ac05 [patch]
tree 
a80da7d78d629210f3113ae6162385c7bf51b25c
parent 
acac8b6b8e19848ae1a4e68dc71503fbf11d5279
download 
33128c367f53f1e8a90ac821137a18ad7d44ac05.tar.gz

feat: add iron_staticfile_middleware dependency




Diff


 Cargo.lock         | 53 ++++++++++++++++-------------------------------------
 Cargo.toml         |  2 +-
 src/main.rs        |  9 ++++++---
 src/staticfiles.rs |  2 +-
 4 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a58ac67..f219766 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -78,16 +78,6 @@ dependencies = [
]

[[package]]
name = "csv"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "env_logger"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -188,6 +178,20 @@ dependencies = [
]

[[package]]
name = "iron_staticfile_middleware"
version = "0.1.0"
source = "git+https://github.com/joseluisq/iron-staticfile-middleware.git#674780443204885dbebdf35c714f94d9944527dd"
dependencies = [
 "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "language-tags"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -225,14 +229,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "memchr"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
 "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "memchr"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"

@@ -335,21 +331,6 @@ dependencies = [
]

[[package]]
name = "playground-middleware"
version = "0.1.0"
source = "git+https://github.com/joseluisq/iron-playground-middleware.git#146df5e79210fc21ded487cf41fcb4e1ae1a347a"
dependencies = [
 "csv 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
]

[[package]]
name = "plugin"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -550,8 +531,8 @@ dependencies = [
 "envy 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "iron_staticfile_middleware 0.1.0 (git+https://github.com/joseluisq/iron-staticfile-middleware.git)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "playground-middleware 0.1.0 (git+https://github.com/joseluisq/iron-playground-middleware.git)",
 "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
]

@@ -709,7 +690,6 @@ dependencies = [
"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
"checksum csv 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ef22b37c7a51c564a365892c012dc0271221fdcc64c69b19ba4d6fa8bd96d9c"
"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
"checksum envy 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "261b836bcf13f42a01c70351f56bd7b66db6e6fb58352bd214cb77e9269a34b4"
"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
@@ -720,13 +700,13 @@ dependencies = [
"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8"
"checksum iron_staticfile_middleware 0.1.0 (git+https://github.com/joseluisq/iron-staticfile-middleware.git)" = "<none>"
"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
"checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
@@ -740,7 +720,6 @@ dependencies = [
"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
"checksum playground-middleware 0.1.0 (git+https://github.com/joseluisq/iron-playground-middleware.git)" = "<none>"
"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0"
"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
diff --git a/Cargo.toml b/Cargo.toml
index 3713b95..a340d65 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,10 +8,10 @@ iron = "0.6"
log = "0.4"
chrono = "0.4"
env_logger = "0.7"
playground-middleware = { git = "https://github.com/joseluisq/iron-playground-middleware.git" }
envy = "0.4"
serde = { version = "1.0", features = ["derive"] }
flate2 = "1.0"
iron_staticfile_middleware = { git = "https://github.com/joseluisq/iron-staticfile-middleware.git" }

[profile.release]
lto = true
diff --git a/src/main.rs b/src/main.rs
index b22d54a..7d5c323 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,14 +3,14 @@ extern crate env_logger;
extern crate envy;
extern crate flate2;
extern crate iron;
extern crate playground_middleware;
extern crate iron_staticfile_middleware;
extern crate serde;

#[macro_use]
extern crate log;

use crate::env::Config;
use chrono::Local;
use env::Config;
use env_logger::Builder;
use iron::prelude::*;
use log::LevelFilter;
@@ -50,5 +50,8 @@ fn main() {
        .http(_address)
        .expect("Unable to start the HTTP Server");

    info!("HTTP Server `{}` is running on {}", config.name, _address);
    info!(
        "Static HTTP Server `{}` is running on {}",
        config.name, _address
    );
}
diff --git a/src/staticfiles.rs b/src/staticfiles.rs
index 3bcde31..9c058f0 100644
--- a/src/staticfiles.rs
+++ b/src/staticfiles.rs
@@ -2,7 +2,7 @@ use crate::gzip::GzipMiddleware;
use crate::logger::Logger;

use iron::prelude::*;
use playground_middleware::{Cache, GuessContentType, ModifyWith, Prefix, Staticfile};
use iron_staticfile_middleware::{Cache, GuessContentType, ModifyWith, Prefix, Staticfile};
use std::time::Duration;

pub fn handler(root_dir: String, assets_dir: String) -> Chain {