v1.0.0-rc.7 Update clap dependency, rewrite deprecated code, now has better color output

Cargo.lock

@@ -535,19 +535,31 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2554a3155fec064362507487171dcc4edc3df60cb10f3a1fb10ed8094822b120"
+checksum = "64c01c1c607d25c71bbaa67c113d6c6b36c434744b4fd66691d711b5b1bc0c8b"
 dependencies = [
  "chrono",
+ "chrono-tz-build",
+ "phf",
+]
+
+[[package]]
+name = "chrono-tz-build"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069"
+dependencies = [
  "parse-zoneinfo",
+ "phf",
+ "phf_codegen",
 ]
 
 [[package]]
 name = "clap"
-version = "3.0.0-beta.4"
+version = "3.0.0-beta.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406"
+checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
 dependencies = [
  "atty",
  "bitflags",
@@ -559,14 +571,14 @@ dependencies = [
  "termcolor",
  "terminal_size",
  "textwrap",
- "vec_map",
+ "unicase",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0-beta.4"
+version = "3.0.0-beta.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac"
+checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -1312,9 +1324,12 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "os_str_bytes"
-version = "3.1.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
+checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "parking_lot"
@@ -1399,6 +1414,45 @@ dependencies = [
  "sha-1 0.8.2",
 ]
 
+[[package]]
+name = "phf"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9fc3db1018c4b59d7d582a739436478b6035138b6aecbce989fc91c3e98409f"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared",
+ "rand 0.8.4",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+ "uncased",
+]
+
 [[package]]
 name = "pin-project"
 version = "0.4.28"
@@ -1846,6 +1900,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
+
 [[package]]
 name = "slab"
 version = "0.4.4"
@@ -1984,9 +2044,9 @@ dependencies = [
 
 [[package]]
 name = "tera"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf95b0d8a46da5fe3ea119394a6c7f1e745f9de359081641c99946e2bf55d4f2"
+checksum = "ed0c0eee8fbbbaab449287574b292f21ca53224b92a07b4a23266b77376f0ce7"
 dependencies = [
  "chrono",
  "chrono-tz",
@@ -2272,6 +2332,15 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
+[[package]]
+name = "uncased"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0"
+dependencies = [
+ "version_check 0.9.3",
+]
+
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
@@ -2420,12 +2489,6 @@ dependencies = [
  "v_escape",
 ]
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.1.5"

Cargo.toml

@@ -11,16 +11,16 @@ actix-http = "2.2"
 actix-web = {version = "3.3", features = ["rustls"]}
 actix-web-httpauth = "0.5"
 chrono = "0.4"
-clap = {version = "3.0.0-beta.4", features = ["wrap_help", "color"]}
+clap = {version = "3.0.0-beta.5", features = ["wrap_help", "color"]}
 env_logger = "0.9"
 lazy_static = "1.4"
 log = "0.4"
-mime_guess = "2"
+mime_guess = "2.0"
 regex = "1.5"
 rustls = "0.18"
-serde = "1"
+serde = "1.0"
 sha2 = "0.9"
-tera = "1"
+tera = "1.13"
 toml = "0.5"
 urlencoding = "2.1"
 

README.md

@@ -33,3 +33,66 @@ This is a simple HTTP Server for use in a development environment, inspired by [
 - TLS/SSL support, HTTP/2 support
 - One click to enable CORS, custom CORS header support
 - cargo doc support
+
+## Install
+
+### Pre-compiled Version
+
+#### Linux
+
+##### Archlinux
+
+```shell
+yay -S srv-bin
+```
+
+##### Other Linux
+
+Download the pre-compiled `srv-x86_64-unknown-linux-musl.tar.gz` on the [releases](https://github.com/Tim-Paik/srv/releases/latest), and copy the srv file in the compressed package to `/usr/bin` as a ROOT user with 755 permissions.
+
+```shell
+wget https://github.com/Tim-Paik/srv/releases/download/v1.0.0-rc.6/srv-x86_64-unknown-linux-musl.tar.gz
+tar -xzvf srv-x86_64-unknown-linux-musl.tar.gz
+install -Dm0755 -t /usr/bin/ srv
+rm srv srv-x86_64-unknown-linux-musl.tar.gz
+```
+for reference only
+
+#### MacOS
+
+I'm sorry I don't have the corresponding equipment, but I can only provide `srv-x86_64-apple-darwin.tar.gz` (Of course, if someone can sponsor me a Mac I would be very grateful)
+
+#### Windows
+
+Download the pre-compiled `srv-x86_64-pc-windows-msvc.zip` in the [releases](https://github.com/Tim-Paik/srv/releases/latest), unzip the srv.exe and copy it to your `%PATH%` (if you don’t know what this is, move `srv.exe` to `%SystemRoot%\System32`)
+
+### Compile and Install
+
+You Need:
+
+ - Rust & Cargo Installation
+ - Git Installation
+ - Gcc/Msvc Toolchain Installation
+
+```shell
+git clone git@github.com:Tim-Paik/srv.git
+cd srv
+cargo build --release
+strip target/release/srv
+```
+
+Then you can find the compiled executable file named `srv` in the `target/release/` folder.
+
+## Usage
+
+Execute `srv --help` to get all the usage methods
+
+Waiting to be added...
+
+## License
+
+```text
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at https://mozilla.org/MPL/2.0/.
+```

src/main.rs

@@ -12,6 +12,7 @@ use actix_web::{
     dev::{self, Service, ServiceResponse},
     http, middleware, App, HttpResponse, HttpServer,
 };
+use clap::Arg;
 use env_logger::fmt::Color;
 use log::{error, info};
 use sha2::Digest;
@@ -203,13 +204,13 @@ fn render_index(
         };
         return Ok(ServiceResponse::new(req.clone(), res));
     }
-    if var("NOINDEX").unwrap_or("false".to_string()) == "true" {
+    if var("NOINDEX").unwrap_or_else(|_| "false".to_string()) == "true" {
         return Ok(ServiceResponse::new(
             req.clone(),
             HttpResponse::NotFound().body(""),
         ));
     }
-    let show_dot_files = var("DOTFILES").unwrap_or("false".to_string()) == "true";
+    let show_dot_files = var("DOTFILES").unwrap_or_else(|_| "false".to_string()) == "true";
     let mut context = IndexContext {
         title: "".to_string(),
         paths: vec![],
@@ -217,7 +218,7 @@ fn render_index(
         files: vec![],
     };
     for path in req.path().split('/') {
-        if path == "" {
+        if path.is_empty() {
             continue;
         }
         let path =
@@ -245,7 +246,7 @@ fn render_index(
                         continue;
                     }
                 };
-                if !show_dot_files && name.starts_with(".") {
+                if !show_dot_files && name.starts_with('.') {
                     continue;
                 }
                 let metadata = match path.metadata() {
@@ -292,7 +293,7 @@ fn render_index(
     };
     let index = TEMPLATE
         .render("index", &content)
-        .unwrap_or("TEMPLATE RENDER ERROR".to_string());
+        .unwrap_or_else(|_| "TEMPLATE RENDER ERROR".to_string());
     let res = HttpResponse::Ok()
         .content_type("text/html; charset=utf-8")
         .body(index);
@@ -305,7 +306,7 @@ fn display_path(path: &Path) -> String {
     if root.starts_with("\\\\?\\") {
         root[4..root.len()].to_string()
     } else {
-        root.to_string()
+        root
     }
 }
 
@@ -321,9 +322,14 @@ async fn validator(
     req: dev::ServiceRequest,
     auth: actix_web_httpauth::extractors::basic::BasicAuth,
 ) -> Result<dev::ServiceRequest, actix_web::Error> {
-    if auth.user_id() == var("AUTH_USERNAME").unwrap_or("".to_string()).as_str()
+    if auth.user_id()
+        == var("AUTH_USERNAME")
+            .unwrap_or_else(|_| "".to_string())
+            .as_str()
         && hash(auth.password().unwrap_or(&std::borrow::Cow::from("")))
-            == var("AUTH_PASSWORD").unwrap_or("".to_string()).as_str()
+            == var("AUTH_PASSWORD")
+                .unwrap_or_else(|_| "".to_string())
+                .as_str()
     {
         return Ok(req);
     }
@@ -337,23 +343,7 @@ async fn validator(
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
-    let matches = clap_app!((crate_name!()) =>
+    let check_does_dir_exits = |path: &str| match std::fs::metadata(path) {
-        (version: crate_version!())
-        (author: crate_authors!())
-        (about: crate_description!())
-        (@arg noindex: --noindex "Disable automatic index page generation")
-        (@arg compress: -c --compress "Enable streaming compression (Content-length/segment download will be disabled)")
-        // (@arg upload: -u --upload "Enable file upload")
-        (@arg nocache: --nocache "Disable HTTP cache")
-        (@arg nocolor: --nocolor "Disable cli colors")
-        (@arg cors: --cors [VALUE] min_values(0) max_values(1) "Enable CORS")
-        (@arg spa: --spa "Enable Single-Page Application mode (always serve /index.html when the file is not found)")
-        (@arg dotfiles: -d --dotfiles "Show dotfiles")
-        (@arg open: -o --open "Open the page in the default browser")
-        (@arg quiet: -q --quiet "Disable access log output")
-        (@arg quietall: --quietall "Disable all output")
-        (@arg ROOT: default_value["."] {
-            |path| match std::fs::metadata(path) {
         Ok(meta) => {
             if meta.is_dir() {
                 Ok(())
@@ -362,22 +352,26 @@ async fn main() -> std::io::Result<()> {
             }
         }
         Err(e) => Err(e.to_string()),
+    };
+    let check_does_file_exits = |path: &str| match std::fs::metadata(path) {
+        Ok(metadata) => {
+            if metadata.is_file() {
+                Ok(())
+            } else {
+                Err("Parameter is not a file".to_owned())
             }
-        } "Root directory")
+        }
-        (@arg address: -a --address +takes_value default_value["0.0.0.0"] {
+        Err(e) => Err(e.to_string()),
-            |s| match IpAddr::from_str(&s) {
+    };
+    let check_is_ip_addr = |s: &str| match IpAddr::from_str(s) {
         Ok(_) => Ok(()),
         Err(e) => Err(e.to_string()),
-            }
+    };
-        } "IP address to serve on")
+    let check_is_port_num = |s: &str| match s.parse::<u16>() {
-        (@arg port: -p --port +takes_value default_value["8000"] {
-            |s| match s.parse::<u16>() {
         Ok(_) => Ok(()),
         Err(e) => Err(e.to_string()),
-            }
+    };
-        } "Port to serve on")
+    let check_is_auth = |s: &str| {
-        (@arg auth: --auth +takes_value {
-            |s| {
         let parts = s.splitn(2, ':').collect::<Vec<&str>>();
         if parts.len() < 2 || parts.len() >= 2 && parts[1].is_empty() {
             Err("Password not found".to_owned())
@@ -386,51 +380,35 @@ async fn main() -> std::io::Result<()> {
         } else {
             Ok(())
         }
-            }
+    };
-        } "HTTP Auth (username:password)")
+    let matches = clap::App::new(crate_name!())
-        (@arg cert: --cert +takes_value {
+        .version(crate_version!())
-            |s| match std::fs::metadata(s) {
+        .author(crate_authors!())
-                Ok(metadata) => {
+        .about(crate_description!())
-                    if metadata.is_file() {
+        .arg(Arg::new("noindex").long("noindex").about("Disable automatic index page generation"))
-                        Ok(())
+        .arg(Arg::new("compress").short('c').long("compress").about("Enable streaming compression (Content-length/segment download will be disabled)"))
-                    } else {
+        .arg(Arg::new("nocache").long("nocache").about("Disable HTTP cache"))
-                        Err("Parameter is not a file".to_owned())
+        .arg(Arg::new("nocolor").long("nocolor").about("Disable cli colors"))
-                    }
+        .arg(Arg::new("cors").long("cors").takes_value(true).min_values(0).max_values(1).about("Enable CORS [with custom value]"))
-                }
+        .arg(Arg::new("spa").long("spa").about("Enable Single-Page Application mode (always serve /index.html when the file is not found)"))
-                Err(e) => Err(e.to_string()),
+        .arg(Arg::new("dotfiles").short('d').long("dotfiles").about("Show dotfiles"))
-            }
+        .arg(Arg::new("open").short('o').long("open").about("Open the page in the default browser"))
-        } "Path of TLS/SSL public key (certificate)")
+        .arg(Arg::new("quiet").short('q').long("quiet").about("Disable access log output"))
-        (@arg key: --key +takes_value {
+        .arg(Arg::new("quietall").long("quietall").about("Disable all output"))
-            |s| match std::fs::metadata(s) {
+        .arg(Arg::new("ROOT").default_value(".").validator(check_does_dir_exits).about("Root directory"))
-                Ok(metadata) => {
+        .arg(Arg::new("address").short('a').long("address").default_value("0.0.0.0").takes_value(true).validator(check_is_ip_addr).about("IP address to serve on"))
-                    if metadata.is_file() {
+        .arg(Arg::new("port").short('p').long("port").default_value("8000").takes_value(true).validator(check_is_port_num).about("Port to serve on"))
-                        Ok(())
+        .arg(Arg::new("auth").long("auth").takes_value(true).validator(check_is_auth).about("HTTP Auth (username:password)"))
-                    } else {
+        .arg(Arg::new("cert").long("cert").takes_value(true).validator(check_does_file_exits).about("Path of TLS/SSL public key (certificate)"))
-                        Err("Parameter is not a file".to_owned())
+        .arg(Arg::new("key").long("key").takes_value(true).validator(check_does_file_exits).about("Path of TLS/SSL private key"))
-                    }
+        .subcommand(clap::App::new("doc")
-                }
+            .about("Open cargo doc via local server (Need cargo installation)")
-                Err(e) => Err(e.to_string()),
+            .arg(Arg::new("nocolor").long("nocolor").about("Disable cli colors"))
-            }
+            .arg(Arg::new("noopen").long("noopen").about("Do not open the page in the default browser"))
-        } "Path of TLS/SSL private key")
+            .arg(Arg::new("log").long("log").about("Enable access log output [default: disabled]"))
-        (@subcommand doc =>
+            .arg(Arg::new("quietall").long("quietall").about("Disable all output"))
-            (about: "Open cargo doc via local server (Need cargo installation)")
+            .arg(Arg::new("address").short('a').long("address").default_value("0.0.0.0").takes_value(true).validator(check_is_ip_addr).about("IP address to serve on"))
-            (@arg nocolor: --nocolor "Disable cli colors")
+            .arg(Arg::new("port").short('p').long("port").default_value("8000").takes_value(true).validator(check_is_port_num).about("Port to serve on"))
-            (@arg noopen: -no --noopen "Do not open the page in the default browser")
-            (@arg log: --log "Enable access log output [default: false]")
-            (@arg quietall: --quietall "Disable all output")
-            (@arg address: -a --address +takes_value default_value["0.0.0.0"] {
-                |s| match IpAddr::from_str(&s) {
-                    Ok(_) => Ok(()),
-                    Err(e) => Err(e.to_string()),
-                }
-            } "IP address to serve on")
-            (@arg port: -p --port +takes_value default_value["8000"] {
-                |s| match s.parse::<u16>() {
-                    Ok(_) => Ok(()),
-                    Err(e) => Err(e.to_string()),
-                }
-            } "Port to serve on")
-        )
         )
         .get_matches();
 
@@ -455,15 +433,12 @@ async fn main() -> std::io::Result<()> {
         set_var("RUST_LOG_STYLE", "never");
     }
 
-    match matches.value_of("auth") {
+    if let Some(s) = matches.value_of("auth") {
-        Some(s) => {
         set_var("ENABLE_AUTH", matches.is_present("auth").to_string());
         let parts = s.splitn(2, ':').collect::<Vec<&str>>();
         set_var("AUTH_USERNAME", parts[0]);
         set_var("AUTH_PASSWORD", hash(parts[1]));
     }
-        None => {}
-    }
 
     if matches.is_present("cors") {
         set_var("ENABLE_CORS", matches.is_present("cors").to_string());
@@ -606,13 +581,13 @@ async fn main() -> std::io::Result<()> {
         .format(|buf, record| {
             let data = record.args().to_string();
             let mut style = buf.style();
-            let blue = style.set_color(Color::Rgb(52, 152, 219));
+            let blue = style.set_color(Color::Cyan);
             let mut style = buf.style();
-            let red = style.set_color(Color::Rgb(231, 76, 60));
+            let red = style.set_color(Color::Red);
             let mut style = buf.style();
-            let green = style.set_color(Color::Rgb(76, 175, 80));
+            let green = style.set_color(Color::Green);
             if record.target() == "actix_web::middleware::logger" {
-                let data: Vec<&str> = data.splitn(5, "^").collect();
+                let data: Vec<&str> = data.splitn(5, '^').collect();
                 let time = blue.value(
                     chrono::NaiveDateTime::from_str(data[0])
                         .unwrap()
@@ -626,7 +601,7 @@ async fn main() -> std::io::Result<()> {
                 } else {
                     red.value(status_code)
                 };
-                let process_time: Vec<&str> = data[3].splitn(2, ".").collect();
+                let process_time: Vec<&str> = data[3].splitn(2, '.').collect();
                 let process_time = process_time[0].to_string() + "ms";
                 let process_time = blue.value(if process_time.len() == 3 {
                     "  ".to_string() + &process_time
@@ -664,7 +639,7 @@ async fn main() -> std::io::Result<()> {
                             .map_or("", |m| m.as_str());
                         let data = format!(
                             "[INFO] Serving {} on {}",
-                            var("ROOT").unwrap_or(".".to_string()),
+                            var("ROOT").unwrap_or_else(|_| ".".to_string()),
                             addr
                         );
                         return writeln!(buf, "\r{}", green.value(data));
@@ -683,14 +658,14 @@ async fn main() -> std::io::Result<()> {
         .init();
 
     let server = HttpServer::new(move || {
-        let compress = if var("COMPRESS").unwrap_or("false".to_string()) == "true" {
+        let compress = if var("COMPRESS").unwrap_or_else(|_| "false".to_string()) == "true" {
             http::header::ContentEncoding::Auto
         } else {
             http::header::ContentEncoding::Identity
         };
         let app = App::new()
             .wrap_fn(|req, srv| {
-                let paths = PathBuf::from_str(req.path()).unwrap_or(PathBuf::default());
+                let paths = PathBuf::from_str(req.path()).unwrap_or_default();
                 let mut isdotfile = false;
                 for path in paths.iter() {
                     if path.to_string_lossy().starts_with('.') {
@@ -700,20 +675,21 @@ async fn main() -> std::io::Result<()> {
                 let fut = srv.call(req);
                 async move {
                     Ok(fut.await?.map_body(|head, body| {
-                        if var("NOCACHE").unwrap_or("false".to_string()) == "true" {
+                        if var("NOCACHE").unwrap_or_else(|_| "false".to_string()) == "true" {
                             head.headers_mut().insert(
                                 http::header::CACHE_CONTROL,
                                 http::HeaderValue::from_static("no-store"),
                             );
                         }
-                        if var("ENABLE_CORS").unwrap_or("false".to_string()) == "true" {
+                        if var("ENABLE_CORS").unwrap_or_else(|_| "false".to_string()) == "true" {
-                            let cors = var("CORS").unwrap_or("*".to_string());
+                            let cors = var("CORS").unwrap_or_else(|_| "*".to_string());
                             let cors = http::HeaderValue::from_str(&cors)
-                                .unwrap_or(http::HeaderValue::from_static("*"));
+                                .unwrap_or_else(|_| http::HeaderValue::from_static("*"));
                             head.headers_mut()
                                 .insert(http::header::ACCESS_CONTROL_ALLOW_ORIGIN, cors);
                         }
-                        if isdotfile && !(var("DOTFILES").unwrap_or("false".to_string()) == "true")
+                        if isdotfile
+                            && var("DOTFILES").unwrap_or_else(|_| "false".to_string()) != "true"
                         {
                             head.status = http::StatusCode::FORBIDDEN;
                             *head.headers_mut() = http::HeaderMap::new();
@@ -725,11 +701,11 @@ async fn main() -> std::io::Result<()> {
             })
             .wrap(middleware::Compress::new(compress))
             .wrap(middleware::Condition::new(
-                var("ENABLE_AUTH").unwrap_or("false".to_string()) == "true",
+                var("ENABLE_AUTH").unwrap_or_else(|_| "false".to_string()) == "true",
                 actix_web_httpauth::middleware::HttpAuthentication::basic(validator),
             ))
             .wrap(middleware::Logger::new("%t^%a^%s^%D^%r"));
-        let files = fs::Files::new("/", var("ROOT").unwrap_or(".".to_string()))
+        let files = fs::Files::new("/", var("ROOT").unwrap_or_else(|_| ".".to_string()))
             .use_hidden_files()
             .prefer_utf8(true)
             .show_files_listing()
@@ -737,23 +713,23 @@ async fn main() -> std::io::Result<()> {
             .default_handler(|req: dev::ServiceRequest| {
                 let (http_req, _payload) = req.into_parts();
                 async {
-                    let path = var("ROOT").unwrap_or(".".to_string());
+                    let path = var("ROOT").unwrap_or_else(|_| ".".to_string());
                     let mut path = Path::new(&path).to_path_buf();
                     path.push("index.html");
                     if path.exists()
                         && path.is_file()
-                        && var("SPA").unwrap_or("false".to_string()) == "true"
+                        && var("SPA").unwrap_or_else(|_| "false".to_string()) == "true"
                     {
                         let res = fs::NamedFile::open(path)?.into_response(&http_req)?;
                         return Ok(ServiceResponse::new(http_req, res));
                     }
-                    return Ok(ServiceResponse::new(
+                    Ok(ServiceResponse::new(
                         http_req,
                         HttpResponse::NotFound().body(""),
-                    ));
+                    ))
                 }
             });
-        return app.service(files);
+        app.service(files)
     });
     let server = if enable_tls {
         let cert = &mut BufReader::new(