sigoden/dufs
1
0
Fork 0
mirror of https://github.com/sigoden/dufs.git synced 2026-04-09 09:09:03 +03:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

feat: add option --render-try-index (#47)

Browse Source 
close #46
This commit is contained in:
sigoden
2022-06-17 08:41:01 +08:00
committed by GitHub
parent 6d7da0363c
commit 5b11bb75dd
5 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/args.rs
View File

@@ -1,4 +1,4 @@
use clap::{Arg, ArgMatches, Command};
use clap::{AppSettings, Arg, ArgMatches, Command};
use rustls::{Certificate, PrivateKey};
use std::env;
use std::net::IpAddr;
@@ -17,14 +17,15 @@ fn app() -> Command<'static> {
" - ",
env!("CARGO_PKG_REPOSITORY")
))
.global_setting(AppSettings::DeriveDisplayOrder)
.arg(
Arg::new("address")
Arg::new("bind")
.short('b')
.long("bind")
.help("Specify bind address")
.multiple_values(true)
.multiple_occurrences(true)
.value_name("address"),
.value_name("addr"),
)
.arg(
Arg::new("port")
@@ -46,6 +47,18 @@ fn app() -> Command<'static> {
.value_name("path")
.help("Specify an url path prefix"),
)
.arg(
Arg::new("auth")
.short('a')
.long("auth")
.help("Use HTTP authentication")
.value_name("user:pass"),
)
.arg(
Arg::new("no-auth-access")
.long("no-auth-access")
.help("Not required auth when access static files"),
)
.arg(
Arg::new("allow-all")
.short('A')
@@ -72,25 +85,16 @@ fn app() -> Command<'static> {
.long("render-index")
.help("Render index.html when requesting a directory"),
)
.arg(
Arg::new("render-try-index")
.long("render-try-index")
.help("Try rendering index.html when requesting a directory"),
)
.arg(
Arg::new("render-spa")
.long("render-spa")
.help("Render for single-page application"),
)
.arg(
Arg::new("auth")
.short('a')
.display_order(1)
.long("auth")
.help("Use HTTP authentication")
.value_name("user:pass"),
)
.arg(
Arg::new("no-auth-access")
.display_order(1)
.long("no-auth-access")
.help("Not required auth when access static files"),
)
.arg(
Arg::new("cors")
.long("cors")
@@ -128,6 +132,7 @@ pub struct Args {
pub allow_symlink: bool,
pub render_index: bool,
pub render_spa: bool,
pub render_index_fallback: bool,
pub cors: bool,
pub tls: Option<(Vec<Certificate>, PrivateKey)>,
}
@@ -140,7 +145,7 @@ impl Args {
pub fn parse(matches: ArgMatches) -> BoxResult<Args> {
let port = matches.value_of_t::<u16>("port")?;
let addrs = matches
.values_of("address")
.values_of("bind")
.map(|v| v.collect())
.unwrap_or_else(|| vec!["0.0.0.0", "::"]);
let addrs: Vec<IpAddr> = Args::parse_addrs(&addrs)?;
@@ -163,7 +168,9 @@ impl Args {
let allow_upload = matches.is_present("allow-all") || matches.is_present("allow-upload");
let allow_delete = matches.is_present("allow-all") || matches.is_present("allow-delete");
let allow_symlink = matches.is_present("allow-all") || matches.is_present("allow-symlink");
let render_index = matches.is_present("render-index");
let render_index =
matches.is_present("render-index") || matches.is_present("render-try-index");
let render_index_fallback = matches.is_present("render-try-index");
let render_spa = matches.is_present("render-spa");
let tls = match (matches.value_of("tls-cert"), matches.value_of("tls-key")) {
(Some(certs_file), Some(key_file)) => {
@@ -187,6 +194,7 @@ impl Args {
allow_upload,
allow_symlink,
render_index,
render_index_fallback,
render_spa,
tls,
})