v1.0.5

Cargo.toml

@@ -3,23 +3,24 @@ authors = ["Tim_Paik <timpaikc@outlook.com>"]
 description = "simple http server written in rust"
 edition = "2018"
 name = "srv"
-version = "1.0.1"
+version = "1.0.5"
 
 [dependencies]
 actix-files = "0.6"
 actix-web = {version = "4.1", features = ["rustls"]}
-actix-web-httpauth = "0.6"
-chrono = "0.4"
+actix-web-httpauth = "0.8"
+askama = "0.11"
+askama_actix = "0.13"
 clap = {version = "3.2", features = ["wrap_help", "color", "cargo"]}
+comrak = {version = "0.14.0", default-features = false}
 env_logger = "0.9"
-lazy_static = "1.4"
 log = "0.4"
 mime_guess = "2.0"
 rustls = "0.20"
 rustls-pemfile = "1.0"
 serde = {version = "1.0", features = ["derive"]}
 sha2 = "0.10"
-tera = "1.16"
+time = {version = "0.3", features = ["formatting", "parsing"]}
 toml = "0.5"
 urlencoding = "2.1"
 

README.md

@@ -8,7 +8,7 @@ This is a simple HTTP Server for use in a development environment, inspired by [
 ### Built With
 
 - [clap](https://github.com/clap-rs/clap) Provide command line parameter analysis
-- [tera](https://github.com/Keats/tera) Provide template support
+- [askama](https://github.com/djc/askama) Provide template support
 - [actix-web](https://github.com/actix/actix-web) Main frame
 - [actix-files](https://github.com/actix/actix-web/tree/master/actix-files) Provide static resources
 - [actix-web-httpauth](https://github.com/actix/actix-extras/tree/master/actix-web-httpauth) Provide authentication

src/filetype.rs

@@ -0,0 +1,120 @@
+#[inline]
+pub fn get_file_type(from: &std::path::Path) -> String {
+    match from.extension() {
+        Some(os_str) => match os_str.to_str().unwrap_or("") {
+            "7z" => "archive",
+            "bz" => "archive",
+            "bz2" => "archive",
+            "cab" => "archive",
+            "gz" => "archive",
+            "iso" => "archive",
+            "rar" => "archive",
+            "xz" => "archive",
+            "zip" => "archive",
+            "zst" => "archive",
+            "zstd" => "archive",
+            "doc" => "word",
+            "docx" => "word",
+            "ppt" => "powerpoint",
+            "pptx" => "powerpoint",
+            "xls" => "excel",
+            "xlsx" => "excel",
+            "heic" => "image",
+            "pdf" => "pdf",
+            // JavaScript / TypeScript
+            "js" => "code",
+            "cjs" => "code",
+            "mjs" => "code",
+            "jsx" => "code",
+            "ts" => "code",
+            "tsx" => "code",
+            "json" => "code",
+            "coffee" => "code",
+            // HTML / CSS
+            "html" => "code",
+            "htm" => "code",
+            "xml" => "code",
+            "xhtml" => "code",
+            "vue" => "code",
+            "ejs" => "code",
+            "template" => "code",
+            "tmpl" => "code",
+            "pug" => "code",
+            "art" => "code",
+            "hbs" => "code",
+            "css" => "code",
+            "scss" => "code",
+            "sass" => "code",
+            "less" => "code",
+            // Python
+            "py" => "code",
+            "pyc" => "code",
+            // JVM
+            "java" => "code",
+            "kt" => "code",
+            "kts" => "code",
+            "gradle" => "code",
+            "groovy" => "code",
+            "scala" => "code",
+            "jsp" => "code",
+            // Shell
+            "sh" => "code",
+            // Php
+            "php" => "code",
+            // C / C++
+            "c" => "code",
+            "cc" => "code",
+            "cpp" => "code",
+            "h" => "code",
+            "cmake" => "code",
+            // C#
+            "cs" => "code",
+            "xaml" => "code",
+            "sln" => "code",
+            "csproj" => "code",
+            // Golang
+            "go" => "code",
+            "mod" => "code",
+            "sum" => "code",
+            // Swift
+            "swift" => "code",
+            "plist" => "code",
+            "xib" => "code",
+            "xcconfig" => "code",
+            "entitlements" => "code",
+            "xcworkspacedata" => "code",
+            "pbxproj" => "code",
+            // Ruby
+            "rb" => "code",
+            // Rust
+            "rs" => "code",
+            // Objective-C
+            "m" => "code",
+            // Dart
+            "dart" => "code",
+            // Microsoft
+            "manifest" => "code",
+            "rc" => "code",
+            "cmd" => "code",
+            "bat" => "code",
+            "ps1" => "code",
+            // Config
+            "ini" => "code",
+            "yaml" => "code",
+            "toml" => "code",
+            "conf" => "code",
+            "properties" => "code",
+            "lock" => "alt",
+            _ => match mime_guess::from_path(from).first_or_octet_stream().type_() {
+                mime_guess::mime::AUDIO => "audio",
+                mime_guess::mime::IMAGE => "image",
+                mime_guess::mime::PDF => "pdf",
+                mime_guess::mime::VIDEO => "video",
+                mime_guess::mime::TEXT => "alt",
+                _ => "file",
+            },
+        },
+        None => "file",
+    }
+    .to_string()
+}

src/main.rs

@@ -2,158 +2,34 @@
  * 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/. */
 
-#[macro_use]
-extern crate lazy_static;
+mod filetype;
 
-use actix_files as fs;
 use actix_web::{
-    dev::{self, Service, ServiceResponse},
-    http, middleware, App, HttpResponse, HttpServer,
+    dev::{Response, Service, ServiceRequest, ServiceResponse},
+    http, middleware, App, HttpRequest, HttpResponse, HttpServer,
 };
+use actix_web_httpauth::{
+    extractors::{basic::BasicAuth, AuthenticationError},
+    headers::www_authenticate::basic::Basic,
+    middleware::HttpAuthentication,
+};
+use askama_actix::TemplateToResponse;
 use clap::Arg;
 use env_logger::fmt::Color;
 use log::{error, info};
 use serde::{Deserialize, Serialize};
 use sha2::Digest;
 use std::{
+    borrow::Cow,
     env::{set_var, var},
-    fs::read_dir,
-    io::{BufReader, Error, ErrorKind, Read, Write},
+    fs::{self, metadata, read_dir, read_to_string},
+    io::{self, BufReader, Read, Write},
     net::IpAddr,
     path::{Path, PathBuf},
+    process::Command,
     str::FromStr,
 };
-
-lazy_static! {
-    pub static ref TEMPLATE: tera::Tera = {
-        let mut tera = tera::Tera::default();
-        tera.add_raw_template("index", include_str!("../templates/index.html.tera"))
-            .unwrap();
-        tera
-    };
-}
-
-#[inline]
-fn get_file_type(from: &Path) -> String {
-    match from.extension() {
-        Some(os_str) => match os_str.to_str().unwrap_or("") {
-            "7z" => "archive",
-            "bz" => "archive",
-            "bz2" => "archive",
-            "cab" => "archive",
-            "gz" => "archive",
-            "iso" => "archive",
-            "rar" => "archive",
-            "xz" => "archive",
-            "zip" => "archive",
-            "zst" => "archive",
-            "zstd" => "archive",
-            "doc" => "word",
-            "docx" => "word",
-            "ppt" => "powerpoint",
-            "pptx" => "powerpoint",
-            "xls" => "excel",
-            "xlsx" => "excel",
-            "heic" => "image",
-            "pdf" => "pdf",
-            // JavaScript / TypeScript
-            "js" => "code",
-            "cjs" => "code",
-            "mjs" => "code",
-            "jsx" => "code",
-            "ts" => "code",
-            "tsx" => "code",
-            "json" => "code",
-            "coffee" => "code",
-            // HTML / CSS
-            "html" => "code",
-            "htm" => "code",
-            "xml" => "code",
-            "xhtml" => "code",
-            "vue" => "code",
-            "ejs" => "code",
-            "template" => "code",
-            "tmpl" => "code",
-            "pug" => "code",
-            "art" => "code",
-            "hbs" => "code",
-            "tera" => "code",
-            "css" => "code",
-            "scss" => "code",
-            "sass" => "code",
-            "less" => "code",
-            // Python
-            "py" => "code",
-            "pyc" => "code",
-            // JVM
-            "java" => "code",
-            "kt" => "code",
-            "kts" => "code",
-            "gradle" => "code",
-            "groovy" => "code",
-            "scala" => "code",
-            "jsp" => "code",
-            // Shell
-            "sh" => "code",
-            // Php
-            "php" => "code",
-            // C / C++
-            "c" => "code",
-            "cc" => "code",
-            "cpp" => "code",
-            "h" => "code",
-            "cmake" => "code",
-            // C#
-            "cs" => "code",
-            "xaml" => "code",
-            "sln" => "code",
-            "csproj" => "code",
-            // Golang
-            "go" => "code",
-            "mod" => "code",
-            "sum" => "code",
-            // Swift
-            "swift" => "code",
-            "plist" => "code",
-            "xib" => "code",
-            "xcconfig" => "code",
-            "entitlements" => "code",
-            "xcworkspacedata" => "code",
-            "pbxproj" => "code",
-            // Ruby
-            "rb" => "code",
-            // Rust
-            "rs" => "code",
-            // Objective-C
-            "m" => "code",
-            // Dart
-            "dart" => "code",
-            // Microsoft
-            "manifest" => "code",
-            "rc" => "code",
-            "cmd" => "code",
-            "bat" => "code",
-            "ps1" => "code",
-            // Config
-            "ini" => "code",
-            "yaml" => "code",
-            "toml" => "code",
-            "conf" => "code",
-            "properties" => "code",
-            "lock" => "alt",
-            _ => match mime_guess::from_path(from).first_or_octet_stream().type_() {
-                mime_guess::mime::AUDIO => "audio",
-                mime_guess::mime::IMAGE => "image",
-                mime_guess::mime::PDF => "pdf",
-                mime_guess::mime::VIDEO => "video",
-                mime_guess::mime::TEXT => "alt",
-                _ => "file",
-            },
-        },
-        None => "file",
-    }
-    .to_string()
-}
+use time::OffsetDateTime;
 
 #[derive(Deserialize)]
 struct Package {
@@ -179,9 +55,12 @@ struct File {
     modified: String,
 }
 
+#[derive(askama_actix::Template)]
+#[template(path = "index.html")]
 #[derive(Serialize)]
 struct IndexContext {
     title: String,
+    readme: String,
     paths: Vec<String>,
     dirs: Vec<Dir>,
     files: Vec<File>,
@@ -189,8 +68,8 @@ struct IndexContext {
 
 fn render_index(
     dir: &actix_files::Directory,
-    req: &actix_web::HttpRequest,
-) -> Result<ServiceResponse, std::io::Error> {
+    req: &HttpRequest,
+) -> Result<ServiceResponse, io::Error> {
     let mut index = dir.path.clone();
     index.push("index.html");
     if index.exists() && index.is_file() {
@@ -208,6 +87,7 @@ fn render_index(
     let show_dot_files = var("DOTFILES").unwrap_or_else(|_| "false".to_string()) == "true";
     let mut context = IndexContext {
         title: "".to_string(),
+        readme: "".to_string(),
         paths: vec![],
         dirs: vec![],
         files: vec![],
@@ -216,11 +96,11 @@ fn render_index(
         if path.is_empty() {
             continue;
         }
-        let path =
-            urlencoding::decode(path).unwrap_or(std::borrow::Cow::Borrowed("[Parse URL Error]"));
+        let path = urlencoding::decode(path).unwrap_or(Cow::Borrowed("[Parse URL Error]"));
         let path = path.into_owned();
         context.paths.push(path);
     }
+    let mut readme_str = "".to_string();
     match read_dir(&dir.path) {
         Err(e) => {
             error!(target: "read_dir", "[ERROR] Read dir error: {}", e.to_string());
@@ -252,9 +132,11 @@ fn render_index(
                     }
                 };
                 let modified = match metadata.modified() {
-                    Ok(time) => chrono::DateTime::<chrono::Local>::from(time)
-                        .format("%Y/%m/%d %H:%M:%S")
-                        .to_string(),
+                    Ok(time) => OffsetDateTime::from(time)
+                        .format(time::macros::format_description!(
+                            "[year]/[month]/[day] [hour]:[minute]:[second]"
+                        ))
+                        .unwrap_or_else(|_| "".to_string()),
                     Err(e) => {
                         error!(target: "read_dir", "[ERROR] Read modified time error: {}", e.to_string());
                         continue;
@@ -264,35 +146,55 @@ fn render_index(
                     context.dirs.push(Dir { name, modified });
                 } else if metadata.is_file() {
                     let size = metadata.len();
-                    let filetype = get_file_type(&path.path());
+                    let filetype = filetype::get_file_type(&path.path());
                     context.files.push(File {
                         name,
                         size,
                         filetype,
                         modified,
                     });
+                    if path.file_name().to_ascii_lowercase() == "readme.md" {
+                        readme_str = read_to_string(path.path()).unwrap_or_else(|_| "".to_string());
+                    }
                 }
             }
         }
     }
+    if var("NOINDEX").unwrap_or_else(|_| "false".to_string()) != "true" {
+        context.readme = comrak::markdown_to_html(
+            &readme_str,
+            &comrak::ComrakOptions {
+                extension: comrak::ComrakExtensionOptions {
+                    strikethrough: true,
+                    tagfilter: true,
+                    table: true,
+                    autolink: true,
+                    tasklist: true,
+                    superscript: true,
+                    header_ids: None,
+                    footnotes: true,
+                    description_lists: true,
+                    front_matter_delimiter: None,
+                },
+                parse: comrak::ComrakParseOptions {
+                    smart: false,
+                    default_info_string: None,
+                },
+                render: comrak::ComrakRenderOptions {
+                    hardbreaks: false,
+                    github_pre_lang: false,
+                    width: 1000,
+                    unsafe_: true,
+                    escape: false,
+                    list_style: comrak::ListStyleType::default(),
+                },
+            },
+        );
+    }
     context.title = context.paths.last().unwrap_or(&"/".to_string()).to_string();
     context.dirs.sort();
     context.files.sort();
-    let content = tera::Context::from_serialize(&context);
-    let content = match content {
-        Ok(ctx) => ctx,
-        Err(e) => {
-            error!(target: "tera::Context::from_serialize", "[ERROR] Read modified time error: {}", e.to_string());
-            return Err(Error::new(ErrorKind::Other, e.to_string()));
-        }
-    };
-    let index = TEMPLATE
-        .render("index", &content)
-        .unwrap_or_else(|_| "TEMPLATE RENDER ERROR".to_string());
-    let res = HttpResponse::Ok()
-        .content_type("text/html; charset=utf-8")
-        .body(index);
-    Ok(ServiceResponse::new(req.to_owned(), res))
+    Ok(ServiceResponse::new(req.to_owned(), context.to_response()))
 }
 
 #[inline]
@@ -314,31 +216,27 @@ fn hash(from: &str) -> String {
 
 #[inline]
 async fn validator(
-    req: dev::ServiceRequest,
-    auth: actix_web_httpauth::extractors::basic::BasicAuth,
-) -> Result<dev::ServiceRequest, actix_web::Error> {
+    req: ServiceRequest,
+    auth: BasicAuth,
+) -> Result<ServiceRequest, (actix_web::Error, ServiceRequest)> {
     if auth.user_id()
         == var("AUTH_USERNAME")
             .unwrap_or_else(|_| "".to_string())
             .as_str()
-        && hash(auth.password().unwrap_or(&std::borrow::Cow::from("")))
+        && hash(auth.password().unwrap_or(&Cow::from("")))
             == var("AUTH_PASSWORD")
                 .unwrap_or_else(|_| "".to_string())
                 .as_str()
     {
         return Ok(req);
     }
-    let err = actix_web_httpauth::extractors::AuthenticationError::new(
-        actix_web_httpauth::headers::www_authenticate::basic::Basic::with_realm(
-            "Incorrect username or password",
-        ),
-    );
-    Err(actix_web::Error::from(err))
+    let err = AuthenticationError::new(Basic::with_realm("Incorrect username or password"));
+    Err((actix_web::Error::from(err), req))
 }
 
 #[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    let check_does_dir_exits = |path: &str| match std::fs::metadata(path) {
+async fn main() -> io::Result<()> {
+    let check_does_dir_exits = |path: &str| match metadata(path) {
         Ok(meta) => {
             if meta.is_dir() {
                 Ok(())
@@ -348,7 +246,7 @@ async fn main() -> std::io::Result<()> {
         }
         Err(e) => Err(e.to_string()),
     };
-    let check_does_file_exits = |path: &str| match std::fs::metadata(path) {
+    let check_does_file_exits = |path: &str| match metadata(path) {
         Ok(metadata) => {
             if metadata.is_file() {
                 Ok(())
@@ -378,6 +276,7 @@ async fn main() -> std::io::Result<()> {
     };
     let matches = clap::command!()
         .arg(Arg::new("noindex").long("noindex").help("Disable automatic index page generation"))
+        .arg(Arg::new("noreadme").long("noreadme").help("Disable automatic readme rendering"))
         .arg(Arg::new("nocache").long("nocache").help("Disable HTTP cache"))
         .arg(Arg::new("nocolor").long("nocolor").help("Disable cli colors"))
         .arg(Arg::new("cors").long("cors").takes_value(true).min_values(0).max_values(1).help("Enable CORS [with custom value]"))
@@ -409,6 +308,7 @@ async fn main() -> std::io::Result<()> {
     );
 
     set_var("NOINDEX", matches.is_present("noindex").to_string());
+    set_var("NOREADME", matches.is_present("noreadme").to_string());
     set_var("SPA", matches.is_present("spa").to_string());
     set_var("DOTFILES", matches.is_present("dotfiles").to_string());
     set_var("NOCACHE", matches.is_present("nocache").to_string());
@@ -461,9 +361,9 @@ async fn main() -> std::io::Result<()> {
 
     let open_in_browser = |url: &str| {
         if cfg!(target_os = "windows") {
-            std::process::Command::new("explorer").arg(url).spawn().ok();
+            Command::new("explorer").arg(url).spawn().ok();
         } else if cfg!(target_os = "macos") {
-            std::process::Command::new("open").arg(url).spawn().ok();
+            Command::new("open").arg(url).spawn().ok();
         } else if cfg!(target_os = "linux")
             || cfg!(target_os = "android")
             || cfg!(target_os = "freebsd")
@@ -471,7 +371,7 @@ async fn main() -> std::io::Result<()> {
             || cfg!(target_os = "openbsd")
             || cfg!(target_os = "netbsd")
         {
-            std::process::Command::new("xdg-open").arg(url).spawn().ok();
+            Command::new("xdg-open").arg(url).spawn().ok();
         }
     };
 
@@ -479,7 +379,6 @@ async fn main() -> std::io::Result<()> {
         open_in_browser(&url);
     }
 
-
     if let Some(matches) = matches.subcommand_matches("doc") {
         if !matches.is_present("log") {
             set_var("RUST_LOG", "info,actix_web::middleware::logger=off");
@@ -504,11 +403,12 @@ async fn main() -> std::io::Result<()> {
             if record.target() == "actix_web::middleware::logger" {
                 let data: Vec<&str> = data.splitn(5, '^').collect();
                 let time = blue.value(
-                    data[0]
-                        .parse::<chrono::DateTime<chrono::Utc>>()
-                        .unwrap()
-                        .format("%Y/%m/%d %H:%M:%S")
-                        .to_string(),
+                    OffsetDateTime::parse(data[0], &time::format_description::well_known::Rfc3339)
+                        .unwrap_or(OffsetDateTime::UNIX_EPOCH)
+                        .format(time::macros::format_description!(
+                            "[year]/[month]/[day] [hour]:[minute]:[second]"
+                        ))
+                        .unwrap_or_else(|_| "".to_string()),
                 );
                 let ipaddr = blue.value(data[1]);
                 let status_code = data[2].parse().unwrap_or(500);
@@ -528,7 +428,7 @@ async fn main() -> std::io::Result<()> {
                 });
                 let content = blue.value(
                     urlencoding::decode(data[4])
-                        .unwrap_or(std::borrow::Cow::Borrowed("[Parse URL Error]"))
+                        .unwrap_or(Cow::Borrowed("[Parse URL Error]"))
                         .into_owned(),
                 );
                 return writeln!(
@@ -550,7 +450,11 @@ async fn main() -> std::io::Result<()> {
                     return writeln!(buf, "\r{}", green.value(data));
                 }
                 if data == "SIGINT received; starting forced shutdown" {
-                    return writeln!(buf, "\r{}", green.value("[INFO] SIGINT received; starting forced shutdown"));
+                    return writeln!(
+                        buf,
+                        "\r{}",
+                        green.value("[INFO] SIGINT received; starting forced shutdown")
+                    );
                     // Add '\r' to remove the input ^C
                 }
                 return Ok(());
@@ -570,78 +474,78 @@ async fn main() -> std::io::Result<()> {
         })
         .init();
 
-        let addr = if let Some(matches) = matches.subcommand_matches("doc") {
-            let mut cargo_toml = match std::fs::File::open("./Cargo.toml") {
-                Ok(file) => file,
-                Err(e) => {
-                    error!("[ERROR] {}", e.to_string());
-                    return Ok(());
-                }
-            };
-            let mut contents = String::new();
-            match cargo_toml.read_to_string(&mut contents) {
-                Ok(_) => {}
-                Err(e) => {
-                    error!("[ERROR] {}", e.to_string());
-                    return Ok(());
-                }
-            }
-            let contents: CargoToml = match toml::from_str(&contents) {
-                Ok(t) => t,
-                Err(e) => {
-                    error!("[ERROR] {}", e.to_string());
-                    return Ok(());
-                }
-            };
-            let crate_name = contents.package.name;
-            info!("[INFO] Generating document (may take a while)");
-            match std::process::Command::new("cargo").arg("doc").output() {
-                Ok(output) => {
-                    let output = std::str::from_utf8(&output.stderr).unwrap_or("");
-                    if output.starts_with("error: could not find `Cargo.toml` in") {
-                        error!("[ERROR] Cargo.toml Not Found");
-                        return Ok(());
-                    } else if output.starts_with("error: ") {
-                        error!(
-                            "[ERROR] {}",
-                            output.strip_prefix("error: ").unwrap_or(output)
-                        );
-                        return Ok(());
-                    }
-                }
-                Err(e) => {
-                    error!("[ERROR] Cargo Error: {}", e.to_string());
-                    return Ok(());
-                }
-            }
-            let path = Path::new("./target/doc/");
-            let mut index_path = path.to_path_buf();
-            index_path.push(crate_name.to_string() + "/index.html");
-            if !index_path.exists() || !index_path.is_file() {
-                error!("[ERROR] Cargo Error: doc path not found");
+    let addr = if let Some(matches) = matches.subcommand_matches("doc") {
+        let mut cargo_toml = match fs::File::open("./Cargo.toml") {
+            Ok(file) => file,
+            Err(e) => {
+                error!("[ERROR] {}", e.to_string());
                 return Ok(());
             }
-            set_var("ROOT", display_path(path));
-            let ip = matches
-                .value_of("address")
-                .unwrap_or("127.0.0.1")
-                .to_string();
-            let addr = format!("{}:{}", ip, matches.value_of("port").unwrap_or("8000"));
-            let url = format!(
-                "http://{}:{}/{}/index.html",
-                if ip == "0.0.0.0" { "127.0.0.1" } else { &ip },
-                matches.value_of("port").unwrap_or("8000"),
-                crate_name,
-            );
-            if !matches.is_present("noopen") {
-                open_in_browser(&url);
-            }
-            addr
-        } else {
-            addr
         };
-        set_var("LISTEN_ADDRESS", addr);
-    
+        let mut contents = String::new();
+        match cargo_toml.read_to_string(&mut contents) {
+            Ok(_) => {}
+            Err(e) => {
+                error!("[ERROR] {}", e.to_string());
+                return Ok(());
+            }
+        }
+        let contents: CargoToml = match toml::from_str(&contents) {
+            Ok(t) => t,
+            Err(e) => {
+                error!("[ERROR] {}", e.to_string());
+                return Ok(());
+            }
+        };
+        let crate_name = contents.package.name;
+        info!("[INFO] Generating document (may take a while)");
+        match Command::new("cargo").arg("doc").output() {
+            Ok(output) => {
+                let output = std::str::from_utf8(&output.stderr).unwrap_or("");
+                if output.starts_with("error: could not find `Cargo.toml` in") {
+                    error!("[ERROR] Cargo.toml Not Found");
+                    return Ok(());
+                } else if output.starts_with("error: ") {
+                    error!(
+                        "[ERROR] {}",
+                        output.strip_prefix("error: ").unwrap_or(output)
+                    );
+                    return Ok(());
+                }
+            }
+            Err(e) => {
+                error!("[ERROR] Cargo Error: {}", e.to_string());
+                return Ok(());
+            }
+        }
+        let path = Path::new("./target/doc/");
+        let mut index_path = path.to_path_buf();
+        index_path.push(crate_name.to_string() + "/index.html");
+        if !index_path.exists() || !index_path.is_file() {
+            error!("[ERROR] Cargo Error: doc path not found");
+            return Ok(());
+        }
+        set_var("ROOT", display_path(path));
+        let ip = matches
+            .value_of("address")
+            .unwrap_or("127.0.0.1")
+            .to_string();
+        let addr = format!("{}:{}", ip, matches.value_of("port").unwrap_or("8000"));
+        let url = format!(
+            "http://{}:{}/{}/index.html",
+            if ip == "0.0.0.0" { "127.0.0.1" } else { &ip },
+            matches.value_of("port").unwrap_or("8000"),
+            crate_name,
+        );
+        if !matches.is_present("noopen") {
+            open_in_browser(&url);
+        }
+        addr
+    } else {
+        addr
+    };
+    set_var("LISTEN_ADDRESS", addr);
+
     let server = HttpServer::new(move || {
         let app = App::new()
             .wrap_fn(|req, srv| {
@@ -671,7 +575,7 @@ async fn main() -> std::io::Result<()> {
                         if isdotfile
                             && var("DOTFILES").unwrap_or_else(|_| "false".to_string()) != "true"
                         {
-                            return dev::Response::new(http::StatusCode::FORBIDDEN).into_body();
+                            return Response::new(http::StatusCode::FORBIDDEN).into_body();
                         }
                         body
                     }))
@@ -680,15 +584,15 @@ async fn main() -> std::io::Result<()> {
             .wrap(middleware::Compress::default())
             .wrap(middleware::Condition::new(
                 var("ENABLE_AUTH").unwrap_or_else(|_| "false".to_string()) == "true",
-                actix_web_httpauth::middleware::HttpAuthentication::basic(validator),
+                HttpAuthentication::basic(validator),
             ))
             .wrap(middleware::Logger::new("%t^%a^%s^%D^%r"));
-        let files = fs::Files::new("/", var("ROOT").unwrap_or_else(|_| ".".to_string()))
+        let files = actix_files::Files::new("/", var("ROOT").unwrap_or_else(|_| ".".to_string()))
             .use_hidden_files()
             .prefer_utf8(true)
             .show_files_listing()
             .files_listing_renderer(render_index)
-            .default_handler(|req: dev::ServiceRequest| {
+            .default_handler(|req: ServiceRequest| {
                 let (http_req, _payload) = req.into_parts();
                 async {
                     let path = var("ROOT").unwrap_or_else(|_| ".".to_string());
@@ -698,7 +602,7 @@ async fn main() -> std::io::Result<()> {
                         && path.is_file()
                         && var("SPA").unwrap_or_else(|_| "false".to_string()) == "true"
                     {
-                        let res = fs::NamedFile::open(path)?.into_response(&http_req);
+                        let res = actix_files::NamedFile::open(path)?.into_response(&http_req);
                         return Ok(ServiceResponse::new(http_req, res));
                     }
                     Ok(ServiceResponse::new(
@@ -711,10 +615,10 @@ async fn main() -> std::io::Result<()> {
     });
     let server = if enable_tls {
         let cert = &mut BufReader::new(
-            std::fs::File::open(Path::new(matches.value_of("cert").unwrap())).unwrap(),
+            fs::File::open(Path::new(matches.value_of("cert").unwrap())).unwrap(),
         );
         let key = &mut BufReader::new(
-            std::fs::File::open(Path::new(matches.value_of("key").unwrap())).unwrap(),
+            fs::File::open(Path::new(matches.value_of("key").unwrap())).unwrap(),
         );
         let cert = rustls_pemfile::certs(cert)
             .unwrap()
@@ -733,7 +637,10 @@ async fn main() -> std::io::Result<()> {
             .with_no_client_auth()
             .with_single_cert(cert, key)
             .expect("bad certificate/key");
-        server.bind_rustls(var("LISTEN_ADDRESS").unwrap_or_else(|_| "0.0.0.0:8000".to_string()), config)
+        server.bind_rustls(
+            var("LISTEN_ADDRESS").unwrap_or_else(|_| "0.0.0.0:8000".to_string()),
+            config,
+        )
     } else {
         server.bind(var("LISTEN_ADDRESS").unwrap_or_else(|_| "0.0.0.0:8000".to_string()))
     };

templates/index.html

@@ -1,6 +1,6 @@
 {# 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/. #}
+# 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/. -#}
 <!DOCTYPE html>
 <html lang="en">
 
@@ -12,9 +12,12 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="color-scheme" content="light dark">
   <title>{{ title }}</title>
-  <!--[if lt IE 9
-      ]><script src="https://cdn.jsdelivr.net/npm/html5shiv/dist/html5shiv.min.js"></script
-    ><![endif]-->
+  <!--[if lt IE 9]><script>
+/**
+* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.3-pre",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b),"object"==typeof module&&module.exports&&(module.exports=t)}("undefined"!=typeof window?window:this,document);
+  </script><![endif]-->
   <style>
     html,
     body,
@@ -142,7 +145,7 @@
       #meta,
       #listing {
         color: #cacaca;
-        background: #000000;
+        background: #0d1117;
       }
 
       #header nav span a {
@@ -151,7 +154,7 @@
 
       #header {
         padding: 1.5rem 5% 1rem;
-        background-color: #0e0e0e;
+        background-color: #161b22;
       }
 
       #listing table {
@@ -219,7 +222,6 @@
         d="M369.9 97.9L286 14C277 5 264.8-.1 252.1-.1H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V131.9c0-12.7-5.1-25-14.1-34zM332.1 128H256V51.9l76.1 76.1zM48 464V48h160v104c0 13.3 10.7 24 24 24h104v288H48zm220.1-208c-5.7 0-10.6 4-11.7 9.5-20.6 97.7-20.4 95.4-21 103.5-.2-1.2-.4-2.6-.7-4.3-.8-5.1.3.2-23.6-99.5-1.3-5.4-6.1-9.2-11.7-9.2h-13.3c-5.5 0-10.3 3.8-11.7 9.1-24.4 99-24 96.2-24.8 103.7-.1-1.1-.2-2.5-.5-4.2-.7-5.2-14.1-73.3-19.1-99-1.1-5.6-6-9.7-11.8-9.7h-16.8c-7.8 0-13.5 7.3-11.7 14.8 8 32.6 26.7 109.5 33.2 136 1.3 5.4 6.1 9.1 11.7 9.1h25.2c5.5 0 10.3-3.7 11.6-9.1l17.9-71.4c1.5-6.2 2.5-12 3-17.3l2.9 17.3c.1.4 12.6 50.5 17.9 71.4 1.3 5.3 6.1 9.1 11.6 9.1h24.7c5.5 0 10.3-3.7 11.6-9.1 20.8-81.9 30.2-119 34.5-136 1.9-7.6-3.8-14.9-11.6-14.9h-15.8z" />
     </defs>
   </svg>
-  {% set paths_length = paths | length -%}
   <header id="header">
     <h1>
       <nav>
@@ -228,7 +230,7 @@
         </span>
         {% for path in paths -%}
         <span>
-          <a href="./{% for i in range(end=paths | length - loop.index) %}../{% endfor %}">{{ path }} /
+          <a href="./{% for i in 0..(paths.len() - loop.index) %}../{% endfor %}">{{ path }} /
           </a>
         </span>
         {% endfor -%}
@@ -237,10 +239,8 @@
   </header>
   <main>
     <div id="meta">
-      {% set dir_length = dirs | length -%}
-      {% set file_length = files | length -%}
-      <span><b>{{ dir_length }}</b> directories</span>
-      <span><b>{{ file_length }}</b> files</span>
+      <span><b>{{ dirs.len() }}</b> directories</span>
+      <span><b>{{ files.len() }}</b> files</span>
     </div>
     <div id="listing">
       <table>
@@ -298,15 +298,7 @@
                 <span>{{ file.name }}</span></a>
             </td>
             <td data-order="-1">
-              {{ file.size | filesizeformat |
-              replace(from="KB", to="KiB") |
-              replace(from="MB", to="MiB") |
-              replace(from="GB", to="GiB") |
-              replace(from="TB", to="TiB") |
-              replace(from="PB", to="PiB") |
-              replace(from="EB", to="EiB") |
-              replace(from="ZB", to="ZiB") |
-              replace(from="YB", to="YiB") }}
+              {{ file.size|filesizeformat }}
             </td>
             <td class="hideable">
               <time class="date" datetime="{{ file.modified }}">{{ file.modified }}</time>
@@ -317,10 +309,30 @@
           <tr></tr>
         </tbody>
       </table>
-      {% if dir_length + file_length == 0 -%}
+      {% if dirs.len() + files.len() == 0 -%}
       <div style="text-align: center; margin: 1rem; color: #cccccc;">Nothing here</div>
       {% endif -%}
     </div>
+    {% if readme != "".to_string() -%}
+    <div id="readme">
+      {{ readme|safe }}
+    </div>
+    {% include "github-markdown.css.html" %}
+    <style>
+      #readme {
+        min-width: 200px;
+        max-width: 980px;
+        margin: 10px auto;
+        padding: 45px;
+      }
+
+      @media (max-width: 767px) {
+        #readme {
+          padding: 15px;
+        }
+      }
+    </style>
+    {% endif -%}
   </main>
   <script>
     (function () {