From dab13c9bb3336aac4e44171f3074c4ce973b9782 Mon Sep 17 00:00:00 2001 From: Lukas Stabe Date: Sat, 26 Sep 2020 04:45:31 +0200 Subject: move css out of html into its own route --- src/args.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/args.rs') diff --git a/src/args.rs b/src/args.rs index 25a3503..2ffbdc5 100644 --- a/src/args.rs +++ b/src/args.rs @@ -175,9 +175,10 @@ pub fn parse_args() -> crate::MiniserveConfig { None }; - // Generate some random route for the favicon so that it is very unlikely to conflict with a - // real file. + // Generate some random routes for the favicon and css so that they are very unlikely to conflict with + // real files. let favicon_route = nanoid::nanoid!(10, &ROUTE_ALPHABET); + let css_route = nanoid::nanoid!(10, &ROUTE_ALPHABET); let default_color_scheme = args.color_scheme; @@ -198,6 +199,7 @@ pub fn parse_args() -> crate::MiniserveConfig { no_symlinks: args.no_symlinks, random_route, favicon_route, + css_route, default_color_scheme, index: args.index, overwrite_files: args.overwrite_files, -- cgit v1.2.3 From a4d227d34ad2bbf40ff5d542dcc8821ccb090ac7 Mon Sep 17 00:00:00 2001 From: Lukas Stabe Date: Sat, 26 Sep 2020 05:39:52 +0200 Subject: remove default color scheme cli argument --- src/args.rs | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/args.rs') diff --git a/src/args.rs b/src/args.rs index 2ffbdc5..78f9ce3 100644 --- a/src/args.rs +++ b/src/args.rs @@ -5,7 +5,6 @@ use structopt::StructOpt; use crate::auth; use crate::errors::ContextualError; -use crate::themes; /// Possible characters for random routes const ROUTE_ALPHABET: [char; 16] = [ @@ -67,16 +66,6 @@ struct CLIArgs { #[structopt(short = "P", long = "no-symlinks")] no_symlinks: bool, - /// Default color scheme - #[structopt( - short = "c", - long = "color-scheme", - default_value = "Squirrel", - possible_values = &themes::ColorScheme::variants(), - case_insensitive = true, - )] - color_scheme: themes::ColorScheme, - /// Enable QR code display #[structopt(short = "q", long = "qrcode")] qrcode: bool, @@ -180,8 +169,6 @@ pub fn parse_args() -> crate::MiniserveConfig { let favicon_route = nanoid::nanoid!(10, &ROUTE_ALPHABET); let css_route = nanoid::nanoid!(10, &ROUTE_ALPHABET); - let default_color_scheme = args.color_scheme; - let path_explicitly_chosen = args.path.is_some(); let port = match args.port { @@ -200,7 +187,6 @@ pub fn parse_args() -> crate::MiniserveConfig { random_route, favicon_route, css_route, - default_color_scheme, index: args.index, overwrite_files: args.overwrite_files, show_qrcode: args.qrcode, -- cgit v1.2.3 From 47895cad827180787a8f305ddac0372d2dbd266a Mon Sep 17 00:00:00 2001 From: Lukas Stabe Date: Thu, 1 Oct 2020 18:08:05 +0200 Subject: restore default theme cli option and add default theme dark option --- src/args.rs | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'src/args.rs') diff --git a/src/args.rs b/src/args.rs index 78f9ce3..dc160d0 100644 --- a/src/args.rs +++ b/src/args.rs @@ -5,6 +5,7 @@ use structopt::StructOpt; use crate::auth; use crate::errors::ContextualError; +use crate::renderer; /// Possible characters for random routes const ROUTE_ALPHABET: [char; 16] = [ @@ -66,6 +67,26 @@ struct CLIArgs { #[structopt(short = "P", long = "no-symlinks")] no_symlinks: bool, + /// Default color scheme + #[structopt( + short = "c", + long = "color-scheme", + default_value = "squirrel", + possible_values = &renderer::THEME_SLUGS, + case_insensitive = true, + )] + color_scheme: String, + + /// Default color scheme + #[structopt( + short = "d", + long = "color-scheme-dark", + default_value = "archlinux", + possible_values = &renderer::THEME_SLUGS, + case_insensitive = true, + )] + color_scheme_dark: String, + /// Enable QR code display #[structopt(short = "q", long = "qrcode")] qrcode: bool, @@ -169,6 +190,9 @@ pub fn parse_args() -> crate::MiniserveConfig { let favicon_route = nanoid::nanoid!(10, &ROUTE_ALPHABET); let css_route = nanoid::nanoid!(10, &ROUTE_ALPHABET); + let default_color_scheme = args.color_scheme; + let default_color_scheme_dark = args.color_scheme_dark; + let path_explicitly_chosen = args.path.is_some(); let port = match args.port { @@ -187,6 +211,8 @@ pub fn parse_args() -> crate::MiniserveConfig { random_route, favicon_route, css_route, + default_color_scheme, + default_color_scheme_dark, index: args.index, overwrite_files: args.overwrite_files, show_qrcode: args.qrcode, -- cgit v1.2.3