From bcd620ed432f189d063acd3eab3c067de0252c62 Mon Sep 17 00:00:00 2001 From: uniqueNullptr2 Date: Wed, 20 Jul 2022 08:50:23 +0200 Subject: [PATCH 1/2] add configuration from env to all clap options --- Cargo.toml | 2 +- src/args.rs | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d76653c..0c05ecd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ askama-filters={ version = "0.1.3", features = ["chrono"] } chrono="0.4.19" rand="0.8.5" linkify="0.8.1" -clap={ version = "3.1.12", features = ["derive"] } +clap={ version = "3.1.12", features = ["derive", "env"] } actix-multipart = "0.4.0" futures = "0.3" sanitize-filename = "0.3.0" diff --git a/src/args.rs b/src/args.rs index 4a97f3b..a0f2e6d 100644 --- a/src/args.rs +++ b/src/args.rs @@ -9,54 +9,54 @@ lazy_static! { #[derive(Parser, Debug, Clone)] #[clap(author, version, about, long_about = None)] pub struct Args { - #[clap(long)] + #[clap(long, env="MICROBIN_AUTH_USERNAME")] pub auth_username: Option, - #[clap(long)] + #[clap(long, env="MICROBIN_AUTH_PASSWORD")] pub auth_password: Option, - #[clap(long)] + #[clap(long, env="MICROBIN_EDITABLE")] pub editable: bool, - #[clap(long)] + #[clap(long, env="MICROBIN_FOOTER_TEXT")] pub footer_text: Option, - #[clap(long)] + #[clap(long, env="MICROBIN_HIDE_FOOTER")] pub hide_footer: bool, - #[clap(long)] + #[clap(long, env="MICROBIN_HIDE_HEADER")] pub hide_header: bool, - #[clap(long)] + #[clap(long, env="MICROBIN_HIDE_LOGO")] pub hide_logo: bool, - #[clap(long)] + #[clap(long, env="MICROBIN_NO_LISTING")] pub no_listing: bool, - #[clap(long)] + #[clap(long, env="MICROBIN_HIGHLIGHTINGSYNTAX")] pub highlightsyntax: bool, - #[clap(short, long, default_value_t = 8080)] + #[clap(short, long, env="MICROBIN_PORT", default_value_t = 8080)] pub port: u16, - #[clap(short, long, default_value_t = IpAddr::from([0, 0, 0, 0]))] + #[clap(short, long, env="MICROBIN_BIND", default_value_t = IpAddr::from([0, 0, 0, 0]))] pub bind: IpAddr, - #[clap(long)] + #[clap(long, env="MICROBIN_PRIVATE")] pub private: bool, - #[clap(long)] + #[clap(long, env="MICROBIN_PURE_HTML")] pub pure_html: bool, - #[clap(long)] + #[clap(long, env="MICROBIN_READONLY")] pub readonly: bool, - #[clap(long)] + #[clap(long, env="MICROBIN_TITLE")] pub title: Option, - #[clap(short, long, default_value_t = 1)] + #[clap(short, long, env="MICROBIN_THREADS", default_value_t = 1)] pub threads: u8, - #[clap(long)] + #[clap(long, env="MICROBIN_WIDE")] pub wide: bool, } \ No newline at end of file From 35a512680c40205e8357e7bd347cec2c3a2abffc Mon Sep 17 00:00:00 2001 From: uniqueNullptr2 Date: Wed, 20 Jul 2022 09:13:31 +0200 Subject: [PATCH 2/2] fix mistype of syntax highlight option --- src/args.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/args.rs b/src/args.rs index a0f2e6d..577fa0f 100644 --- a/src/args.rs +++ b/src/args.rs @@ -33,7 +33,7 @@ pub struct Args { #[clap(long, env="MICROBIN_NO_LISTING")] pub no_listing: bool, - #[clap(long, env="MICROBIN_HIGHLIGHTINGSYNTAX")] + #[clap(long, env="MICROBIN_HIGHLIGHTSYNTAX")] pub highlightsyntax: bool, #[clap(short, long, env="MICROBIN_PORT", default_value_t = 8080)]