Test new caching mechanism

Add more tests
Implement a few tests
2019-09-16 22:42:41 +02:00 · 2019-09-10 23:13:50 +02:00 · 2019-09-10 22:45:32 +02:00 · 2019-09-10 22:45:10 +02:00
12 changed files with 483 additions and 220 deletions
--- a/10
+++ b/10
@ -26,17 +26,19 @@ COPY --chown=rust ./time-cache/Cargo.toml ./time-cache/Cargo.toml

 WORKDIR /home/rust/src/yagcdn
 # build to cache dependencies
-RUN cargo build --release
+# RUN cargo build --release
 # delete build cache to prevent caching issues later on
-RUN rm -r ./target/x86_64-unknown-linux-musl/release/.fingerprint/yagcdn*
-RUN rm -r ./target/x86_64-unknown-linux-musl/release/.fingerprint/time-cache-*
+# RUN rm -r ./target/x86_64-unknown-linux-musl/release/.fingerprint/yagcdn*
+# RUN rm -r ./target/x86_64-unknown-linux-musl/release/.fingerprint/time-cache-*

 COPY ./backend/static ./static
 COPY ./backend/src ./src
 COPY ./time-cache/src ../time-cache/src
 # build source code
-RUN cargo build --release

+RUN         --mount=type=cache,target=../../usr/local/cargo/registry \
+            --mount=type=cache,target=target \
+            cargo build --release

 # create /etc/password for rootless scratch container
 FROM alpine:latest as user_builder
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@ -14,17 +14,16 @@ dependencies = [

 [[package]]
 name = "actix-connect"
-version = "0.2.5"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-rt 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustls 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -36,12 +35,12 @@ dependencies = [

 [[package]]
 name = "actix-files"
-version = "0.1.6"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "actix-http 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-web 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -49,17 +48,17 @@ dependencies = [
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "actix-http"
-version = "0.2.11"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-connect 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-connect 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -77,10 +76,10 @@ dependencies = [
 "flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -89,8 +88,8 @@ dependencies = [
 "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustls 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -108,16 +107,16 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
 "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "actix-rt"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -131,10 +130,10 @@ dependencies = [

 [[package]]
 name = "actix-server"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "actix-rt 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@ -168,22 +167,6 @@ dependencies = [
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "actix-testing"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "actix-rt 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-server 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "actix-threadpool"
 version = "0.1.1"
@ -215,33 +198,32 @@ dependencies = [

 [[package]]
 name = "actix-web"
-version = "1.0.9"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-http 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-rt 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-server 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-testing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "awc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "awc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -261,14 +243,6 @@ name = "adler32"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "ahash"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "0.7.4"
@ -301,16 +275,16 @@ dependencies = [

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

 [[package]]
 name = "awc"
-version = "0.2.8"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-http 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -321,8 +295,8 @@ dependencies = [
 "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustls 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -444,24 +418,6 @@ dependencies = [
 "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "const-random"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "copyless"
 version = "0.1.4"
@ -626,8 +582,8 @@ dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -636,12 +592,8 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.6.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]

 [[package]]
 name = "heck"
@ -662,7 +614,7 @@ dependencies = [

 [[package]]
 name = "http"
-version = "0.1.21"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -705,11 +657,8 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "1.3.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]

 [[package]]
 name = "iovec"
@ -926,7 +875,7 @@ name = "num-integer"
 version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -935,7 +884,7 @@ name = "num-traits"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1056,36 +1005,12 @@ dependencies = [

 [[package]]
 name = "proc-macro-error"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro-error-attr 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustversion 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "0.4.3"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustversion 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn-mid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1130,7 +1055,7 @@ name = "rand"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1160,7 +1085,7 @@ name = "rand_chacha"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1169,7 +1094,7 @@ name = "rand_chacha"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1247,7 +1172,7 @@ name = "rand_pcg"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1340,16 +1265,6 @@ dependencies = [
 "webpki 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "rustversion"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.0"
@ -1389,30 +1304,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "serde"
-version = "1.0.104"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.104"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.44"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1422,7 +1337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1495,23 +1410,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "structopt"
-version = "0.3.7"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "structopt-derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "structopt-derive 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "structopt-derive"
-version = "0.4.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-error 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1526,7 +1441,7 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.11"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1534,16 +1449,6 @@ dependencies = [
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "syn-mid"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.10.2"
@ -1989,9 +1894,9 @@ dependencies = [
 name = "yagcdn"
 version = "0.1.0"
 dependencies = [
- "actix-files 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-web 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "awc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-files 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "awc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1999,36 +1904,34 @@ dependencies = [
 "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "structopt 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "structopt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "time-cache 0.1.0",
 ]

 [metadata]
 "checksum actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2c11af4b06dc935d8e1b1491dad56bfb32febc49096a91e773f8535c176453"
-"checksum actix-connect 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9fade9bd4bb46bacde89f1e726c7a3dd230536092712f5d94d77ca57c087fca0"
-"checksum actix-files 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "095a533b67977f96ab0ff0ae37e75208607abdcc22983b314ddac06651165ec5"
-"checksum actix-http 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb50f77cd28240d344fd54afd205bae8760a3b0ad448b1716a2aa31e24db139"
+"checksum actix-connect 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "646be02316c497d1cb8b1ed82eb723b052d6b3e2462c94bd52d0ac2d4a29a165"
+"checksum actix-files 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f1e4640b28cd96059541c932f6f350c63c76688e43d68305cdb88e0004da12b5"
+"checksum actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "de5aaeef8b9eef653b910f957a02bea9c1b375f7fa49b411fb75dad8f41462eb"
 "checksum actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "23224bb527e204261d0291102cb9b52713084def67d94f7874923baefe04ccf7"
-"checksum actix-rt 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "168620aaf00fcd2a16e621790abaf180ef7377c2f8355b4ca5775d6afc778ed8"
-"checksum actix-server 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dd626534af8d0a738e5f74901fe603af0445708f91b86a7d763d80df10d562a5"
+"checksum actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "18d9054b1cfacfa441846b9b99001010cb8fbb02130e6cfdb25cea36d3e98e87"
+"checksum actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb3038e9e457e0a498ea682723e0f4e6cc2c4f362a1868d749808355275ad959"
 "checksum actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "483a34989c682d93142bacad6300375bb6ad8002d2e0bb249dbad86128b9ff30"
 "checksum actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaecc01bbc595ebd7a563a7d4f8a607d0b964bb55273c6f362b0b02c26508cf2"
-"checksum actix-testing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "af001e97ac6750994824d400a1b7087055aab14317aa012f528d0b2b363f37f1"
 "checksum actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c29f7c554d56b3841f4bb85d5b3dee01ba536e1307679f56eb54de28aaec3fb"
 "checksum actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6ea501068a0173533704be321f149853f702d9e3c3ce9d57e7a96d94b1ab5aca"
-"checksum actix-web 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "af3a1b967cdbacb903c4b9ae71257a7f098d881b25eb483d0c468b7dac579b03"
+"checksum actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ced216f53d465f9d6478454b2b994d1fe91ec203ac9d056837cbe07e823cb83"
 "checksum actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe9e3cdec1e645b675f354766e0688c5705021c85ab3cf739be1c8999b91c76"
 "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
-"checksum ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3"
 "checksum aho-corasick 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "36b7aa1ccb7d7ea3f437cf025a2ab1c47cc6c1bc9fc84918ff449def12f5e282"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-"checksum awc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5e995283278dd3bf0449e7534e77184adb1570c0de8b6a50bf7c9d01ad8db8c4"
+"checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b"
+"checksum awc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "96ff50f02103155c49ced9711b00198f6dacefceb234ece4fcaa4f7ad270e1d5"
 "checksum backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)" = "88fb679bc9af8fa639198790a77f52d345fe13656c08b43afa9424c206b731c6"
 "checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
@ -2043,8 +1946,6 @@ dependencies = [
 "checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe"
-"checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59"
 "checksum copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6ff9c56c9fb2a49c05ef0e431485a22400af20d33226dc0764d891d09e724127"
 "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
@ -2065,15 +1966,15 @@ dependencies = [
 "checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
 "checksum getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e65cce4e5084b14874c4e7097f38cab54f47ee554f9194673456ea379dcc4c55"
 "checksum h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "a539b63339fbbb00e081e84b6e11bd1d9634a82d91da2984a18ac74a8823f392"
-"checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead"
+"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
-"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
+"checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
+"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa79fa216fbe60834a9c0737d7fcd30425b32d1c58854663e24d4c4b328ed83f"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
@ -2114,9 +2015,7 @@ dependencies = [
 "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
 "checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
-"checksum proc-macro-error 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "53c98547ceaea14eeb26fcadf51dc70d01a2479a7839170eae133721105e4428"
-"checksum proc-macro-error-attr 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c2bf5d493cf5d3e296beccfd61794e445e830dfc8070a9c248ad3ee071392c6c"
-"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
+"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
@ -2145,16 +2044,15 @@ dependencies = [
 "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum rustls 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f271e3552cd835fa28c541c34a7e8fdd8cdff09d77fe4eb8f6c42e87a11b096e"
-"checksum rustversion 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c48f91977f4ef3be5358c15d131d3f663f6b4d7a112555bf3bf52ad23b6659e5"
 "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum sct 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f5adf8fbd58e1b1b52699dc8bed2630faecb6d8c7bee77d009d6bbe4af569b9"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
-"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
-"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
+"checksum serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)" = "f4473e8506b213730ff2061073b48fa51dcc66349219e2e7c5608f0296a1d95a"
+"checksum serde_derive 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)" = "11e410fde43e157d789fc290d26bc940778ad0fdd47836426fbac36573710dbb"
+"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
 "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68"
@ -2166,11 +2064,10 @@ dependencies = [
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum structopt 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "884ae79d6aad1e738f4a70dff314203fd498490a63ebc4d03ea83323c40b7b72"
-"checksum structopt-derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a97f829a34a0a9d5b353a881025a23b8c9fd09d46be6045df6b22920dbd7a93"
+"checksum structopt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ac9d6e93dd792b217bf89cda5c14566e3043960c6f9da890c2ba5d09d07804c"
+"checksum structopt-derive 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ae9e5165d463a0dea76967d021f8d0f9316057bf5163aa2a4843790e842ff37"
 "checksum syn 0.15.41 (registry+https://github.com/rust-lang/crates.io-index)" = "5f48d3b9d3d5ee64217007ead81e80d40674c80e930cf53ed089f0f809fae31e"
-"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
-"checksum syn-mid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd3937748a7eccff61ba5b90af1a20dbf610858923a9192ea0ecb0cb77db1d0"
+"checksum syn 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "158521e6f544e7e3dcfc370ac180794aa38cb34a1b1e07609376d4adcf429b93"
 "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
 "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@ -6,9 +6,9 @@ edition = "2018"


 [dependencies]
-actix-files = "0.1.6"
-actix-web = "1.0.9"
-awc = { version = "0.2.8", features = ["default", "rust-tls"] }
+actix-files = "0.1.4"
+actix-web = "1.0.7"
+awc = { version = "0.2.4", features = ["default", "rust-tls"] }
 bytes = "0.4.12"
 futures = "0.1.29"
 lazy_static = "1.4.0"
@ -16,8 +16,8 @@ log = "0.4.8"
 mime_guess = "2.0.1"
 openssl-probe = "0.1.2"
 pretty_env_logger = "0.3.1"
-serde = { version = "1.0.104", features = ["rc"] }
-serde_derive = "1.0.104"
-serde_json = "1.0.44"
-structopt = "0.3.7"
+serde = { version = "1.0.100", features = ["rc"] }
+serde_derive = "1.0.100"
+serde_json = "1.0.40"
+structopt = "0.3.1"
 time-cache = { path = "../time-cache" }
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@ -16,6 +16,9 @@ mod error;
 mod service;
 mod statics;

+#[cfg(test)]
+mod test;
+
 use crate::{
    cdn::Cloudflare,
    data::{FilePath, State},
--- a/backend/src/statics.rs
+++ b/backend/src/statics.rs
@ -9,28 +9,25 @@ lazy_static! {
    pub(crate) static ref USER_AGENT: String = format!("yagcdn/{}", VERSION);
    pub(crate) static ref OPT: Opt = Opt::from_args();
    pub(crate) static ref GITHUB_AUTH_QUERY: Cow<'static, str> =
-        Github::auth_query().unwrap_or_default().into();
+        Github::auth_query().unwrap_or_default();
    pub(crate) static ref CF_ZONE_IDENT: Cow<'static, str> = OPT
        .cf_zone
        .as_ref()
        .map(Cow::from)
        .or_else(|| load_env_var("CF_ZONE_IDENT"))
-        .expect("Cloudflare zone identifier not set")
-        .into();
+        .expect("Cloudflare zone identifier not set");
    pub(crate) static ref CF_AUTH_KEY: Cow<'static, str> = OPT
        .cf_auth_key
        .as_ref()
        .map(Cow::from)
        .or_else(|| load_env_var("CF_AUTH_KEY"))
-        .expect("Cloudflare auth key not set")
-        .into();
+        .expect("Cloudflare auth key not set");
    pub(crate) static ref CF_AUTH_USER: Cow<'static, str> = OPT
        .cf_auth_user
        .as_ref()
        .map(Cow::from)
        .or_else(|| load_env_var("CF_AUTH_USER"))
-        .expect("Cloudflare auth user not set")
-        .into();
+        .expect("Cloudflare auth user not set");
    pub(crate) static ref HOSTNAME: Cow<'static, str> = OPT
        .hostname
        .as_ref()
--- a/backend/src/test/bitbucket.rs
+++ b/backend/src/test/bitbucket.rs
@ -0,0 +1,125 @@
+use crate::{
+    data::{Key, Service, State},
+    proxy_file, purge_local_cache, redirect,
+    service::Bitbucket,
+    REDIRECT_AGE,
+};
+use actix_web::{dev::Service as _, http::StatusCode, middleware, test, web, App};
+use awc::Client;
+use std::sync::{Arc, RwLock};
+use time_cache::{Cache, CacheResult};
+
+#[test]
+fn requesting_branch_redirects() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(state)
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/bitbucket/{user}/{repo}/{commit}/{file:.*}",
+                web::get().to_async(redirect::<Bitbucket>),
+            ),
+    );
+
+    let req =
+        test::TestRequest::with_uri("/bitbucket/vbrandl/vbrandl.net/master/README.md").to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+
+    assert_eq!(StatusCode::SEE_OTHER, resp.status());
+}
+
+#[test]
+fn invalid_file_404() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(state)
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/bitbucket/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
+                web::get().to_async(proxy_file::<Bitbucket>),
+            ),
+    );
+
+    let req = test::TestRequest::with_uri(
+        "/bitbucket/vbrandl/vbrandl.net/369c392927a6d75f16c5dc38e2577276b94676bd/README.md.invalid",
+    )
+    .to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+
+    assert_eq!(StatusCode::NOT_FOUND, resp.status());
+}
+
+#[test]
+fn valid_file_200() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(state)
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/bitbucket/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
+                web::get().to_async(proxy_file::<Bitbucket>),
+            ),
+    );
+
+    let req = test::TestRequest::with_uri(
+        "/bitbucket/vbrandl/vbrandl.net/369c392927a6d75f16c5dc38e2577276b94676bd/README.md",
+    )
+    .to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+
+    assert_eq!(StatusCode::OK, resp.status());
+}
+
+#[test]
+fn redirect_cache() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(Arc::clone(&state))
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/bitbucket/{user}/{repo}/{commit}/{file:.*}",
+                web::get().to_async(redirect::<Bitbucket>),
+            )
+            .route(
+                "/bitbucket/{user}/{repo}/{commit}/{file:.*}",
+                web::delete().to_async(purge_local_cache::<Bitbucket>),
+            ),
+    );
+
+    let req =
+        test::TestRequest::with_uri("/bitbucket/vbrandl/vbrandl.net/master/README.md").to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+    assert_eq!(StatusCode::SEE_OTHER, resp.status());
+
+    let key = Key::new(
+        Service::Bitbucket,
+        Arc::new("vbrandl".to_string()),
+        Arc::new("vbrandl.net".to_string()),
+        Arc::new("master".to_string()),
+    );
+    {
+        let cache = state.read().unwrap();
+        let res = cache.get(&key);
+        assert_ne!(CacheResult::Empty, res);
+        assert_ne!(CacheResult::Invalid, res);
+    } // release the lock
+
+    let req = test::TestRequest::delete()
+        .uri("/bitbucket/vbrandl/vbrandl.net/master/README.md")
+        .to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+    assert_eq!(StatusCode::OK, resp.status());
+
+    {
+        let cache = state.read().unwrap();
+        assert_eq!(CacheResult::Empty, cache.get(&key));
+    } // release the lock
+}
--- a/backend/src/test/github.rs
+++ b/backend/src/test/github.rs
@ -0,0 +1,123 @@
+use crate::{
+    data::{Key, Service, State},
+    proxy_file, purge_local_cache, redirect,
+    service::Github,
+    REDIRECT_AGE,
+};
+use actix_web::{dev::Service as _, http::StatusCode, middleware, test, web, App};
+use awc::Client;
+use std::sync::{Arc, RwLock};
+use time_cache::{Cache, CacheResult};
+
+#[test]
+fn requesting_branch_redirects() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(state)
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/github/{user}/{repo}/{commit}/{file:.*}",
+                web::get().to_async(redirect::<Github>),
+            ),
+    );
+
+    let req = test::TestRequest::with_uri("/github/vbrandl/yagcdn/master/Cargo.toml").to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+
+    assert_eq!(StatusCode::SEE_OTHER, resp.status());
+}
+
+#[test]
+fn invalid_file_404() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(state)
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/github/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
+                web::get().to_async(proxy_file::<Github>),
+            ),
+    );
+
+    let req = test::TestRequest::with_uri(
+        "/github/vbrandl/yagcdn/f1b35e7c05b952be6de559051d7daad2ecf05369/Cargo.toml.invalid",
+    )
+    .to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+
+    assert_eq!(StatusCode::NOT_FOUND, resp.status());
+}
+
+#[test]
+fn valid_file_200() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(state)
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/github/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
+                web::get().to_async(proxy_file::<Github>),
+            ),
+    );
+    // github
+    let req = test::TestRequest::with_uri(
+        "/github/vbrandl/yagcdn/f1b35e7c05b952be6de559051d7daad2ecf05369/backend/Cargo.toml",
+    )
+    .to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+
+    assert_eq!(StatusCode::OK, resp.status());
+}
+
+#[test]
+fn redirect_cache() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(Arc::clone(&state))
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/github/{user}/{repo}/{commit}/{file:.*}",
+                web::get().to_async(redirect::<Github>),
+            )
+            .route(
+                "/github/{user}/{repo}/{commit}/{file:.*}",
+                web::delete().to_async(purge_local_cache::<Github>),
+            ),
+    );
+
+    let req = test::TestRequest::with_uri("/github/vbrandl/yagcdn/master/Cargo.toml").to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+    assert_eq!(StatusCode::SEE_OTHER, resp.status());
+
+    let key = Key::new(
+        Service::GitHub,
+        Arc::new("vbrandl".to_string()),
+        Arc::new("yagcdn".to_string()),
+        Arc::new("master".to_string()),
+    );
+    {
+        let cache = state.read().unwrap();
+        let res = cache.get(&key);
+        assert_ne!(CacheResult::Empty, res);
+        assert_ne!(CacheResult::Invalid, res);
+    } // release the lock
+
+    let req = test::TestRequest::delete()
+        .uri("/github/vbrandl/yagcdn/master/Cargo.toml")
+        .to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+    assert_eq!(StatusCode::OK, resp.status());
+
+    {
+        let cache = state.read().unwrap();
+        assert_eq!(CacheResult::Empty, cache.get(&key));
+    } // release the lock
+}
--- a/backend/src/test/gitlab.rs
+++ b/backend/src/test/gitlab.rs
@ -0,0 +1,123 @@
+use crate::{
+    data::{Key, Service, State},
+    proxy_file, purge_local_cache, redirect,
+    service::GitLab,
+    REDIRECT_AGE,
+};
+use actix_web::{dev::Service as _, http::StatusCode, middleware, test, web, App};
+use awc::Client;
+use std::sync::{Arc, RwLock};
+use time_cache::{Cache, CacheResult};
+
+#[test]
+fn requesting_branch_redirects() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(state)
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/gitlab/{user}/{repo}/{commit}/{file:.*}",
+                web::get().to_async(redirect::<GitLab>),
+            ),
+    );
+
+    let req = test::TestRequest::with_uri("/gitlab/vbrandl/hoc/master/Cargo.toml").to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+
+    assert_eq!(StatusCode::SEE_OTHER, resp.status());
+}
+
+#[test]
+fn invalid_file_404() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(state)
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/gitlab/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
+                web::get().to_async(proxy_file::<GitLab>),
+            ),
+    );
+
+    let req = test::TestRequest::with_uri(
+        "/gitlab/vbrandl/hoc/1223d429db877e46653260b15aa2bbd326bcd495/Cargo.toml.invalid",
+    )
+    .to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+
+    assert_eq!(StatusCode::NOT_FOUND, resp.status());
+}
+
+#[test]
+fn valid_file_200() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(state)
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/gitlab/{user}/{repo}/{commit:[0-9a-fA-F]{40}}/{file:.*}",
+                web::get().to_async(proxy_file::<GitLab>),
+            ),
+    );
+
+    let req = test::TestRequest::with_uri(
+        "/gitlab/vbrandl/hoc/1223d429db877e46653260b15aa2bbd326bcd495/Cargo.toml",
+    )
+    .to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+
+    assert_eq!(StatusCode::OK, resp.status());
+}
+
+#[test]
+fn redirect_cache() {
+    let state: State = Arc::new(RwLock::new(Cache::new(REDIRECT_AGE)));
+    let mut app = test::init_service(
+        App::new()
+            .data(Client::new())
+            .data(Arc::clone(&state))
+            .wrap(middleware::NormalizePath)
+            .route(
+                "/gitlab/{user}/{repo}/{commit}/{file:.*}",
+                web::get().to_async(redirect::<GitLab>),
+            )
+            .route(
+                "/gitlab/{user}/{repo}/{commit}/{file:.*}",
+                web::delete().to_async(purge_local_cache::<GitLab>),
+            ),
+    );
+
+    let req = test::TestRequest::with_uri("/gitlab/vbrandl/hoc/master/Cargo.toml").to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+    assert_eq!(StatusCode::SEE_OTHER, resp.status());
+
+    let key = Key::new(
+        Service::GitLab,
+        Arc::new("vbrandl".to_string()),
+        Arc::new("hoc".to_string()),
+        Arc::new("master".to_string()),
+    );
+    {
+        let cache = state.read().unwrap();
+        let res = cache.get(&key);
+        assert_ne!(CacheResult::Empty, res);
+        assert_ne!(CacheResult::Invalid, res);
+    } // release the lock
+
+    let req = test::TestRequest::delete()
+        .uri("/gitlab/vbrandl/hoc/master/Cargo.toml")
+        .to_request();
+    let resp = test::block_fn(|| app.call(req)).unwrap();
+    assert_eq!(StatusCode::OK, resp.status());
+
+    {
+        let cache = state.read().unwrap();
+        assert_eq!(CacheResult::Empty, cache.get(&key));
+    } // release the lock
+}
--- a/backend/src/test/mod.rs
+++ b/backend/src/test/mod.rs
@ -0,0 +1,3 @@
+mod bitbucket;
+mod github;
+mod gitlab;
--- a/frontend/elm.json
+++ b/frontend/elm.json
@ -6,11 +6,11 @@
    "elm-version": "0.19.0",
    "dependencies": {
        "direct": {
-            "elm/browser": "1.0.2",
-            "elm/core": "1.0.4",
+            "elm/browser": "1.0.1",
+            "elm/core": "1.0.2",
            "elm/html": "1.0.0",
            "elm/svg": "1.0.1",
-            "elm-community/maybe-extra": "5.1.0"
+            "elm-community/maybe-extra": "5.0.0"
        },
        "indirect": {
            "elm/json": "1.1.3",
--- a/frontend/src/Main.elm
+++ b/frontend/src/Main.elm
@ -10,17 +10,7 @@ module Main exposing
 import Browser
 import Data exposing (Url, hostname, toUrl)
 import Html exposing (Html, fieldset, input, label)
-import Html.Attributes
-    exposing
-        ( autofocus
-        , for
-        , id
-        , placeholder
-        , readonly
-        , style
-        , type_
-        , value
-        )
+import Html.Attributes exposing (autofocus, for, id, placeholder, readonly, style, value)
 import Html.Events exposing (onInput)
 import Parse exposing (parseUrl)

@ -72,7 +62,7 @@ view state =
                , value state.url
                , onInput UrlChange
                , autofocus True
-                , type_ "text"
+                , style "border" "1px solid #595959"
                ]
            )
            []
@ -82,7 +72,7 @@ view state =
                [ id "output"
                , readonly True
                , value (displayMUrl state.parsed)
-                , type_ "text"
+                , style "border" "1px solid #595959"
                ]
            )
            []
--- a/frontend/template.html
+++ b/frontend/template.html
@ -19,7 +19,7 @@
 <div id="elm-${SHA1}">
 <p>
 <input readonly="true" value="https://yagcdn.tk/&lt;service&gt;/&lt;user&gt;/&lt;repo&gt;/&lt;gitref&gt;/&lt;file&gt;"
-  style="width: 100%" type="text" />
+  style="border: 1px solid #595959; width: 100%" />
 </p>
 </div>
 <script src="./scripts/yagcdn-${SHA1}.min.js">
Author	SHA1	Message	Date
Valentin Brandl	bb5a3ecf4e	Test new caching mechanism All checks were successful continuous-integration/drone/push Build is passing Details	2019-09-16 22:42:41 +02:00
Valentin Brandl	a85ff2a54b	Add more tests All checks were successful continuous-integration/drone/push Build is passing Details	2019-09-10 23:13:50 +02:00
Valentin Brandl	97377a2442	Implement a few tests	2019-09-10 22:45:32 +02:00
Valentin Brandl	0ea5f38f83	Fix clippy lints	2019-09-10 22:45:10 +02:00