diff options
| author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2020-10-02 00:48:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 00:48:16 +0000 |
| commit | 39d7677f90d49af1b836f060787d8b357f36942d (patch) | |
| tree | f8c76796852c7307c7e73ed26961a18d5e2cfb7c /src/listing.rs | |
| parent | Merge pull request #384 from svenstaro/dependabot/cargo/chrono-0.4.19 (diff) | |
| parent | more feedback (diff) | |
| download | miniserve-39d7677f90d49af1b836f060787d8b357f36942d.tar.gz miniserve-39d7677f90d49af1b836f060787d8b357f36942d.zip | |
Merge pull request #380 from ahti/master
client-side color-scheme handling
Diffstat (limited to '')
| -rw-r--r-- | src/listing.rs | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/listing.rs b/src/listing.rs index d14a188..755b026 100644 --- a/src/listing.rs +++ b/src/listing.rs @@ -15,7 +15,6 @@ use strum_macros::{Display, EnumString}; use crate::archive::CompressionMethod; use crate::errors::{self, ContextualError}; use crate::renderer; -use crate::themes::ColorScheme; const FRAGMENT: &AsciiSet = &CONTROLS.add(b' ').add(b'"').add(b'<').add(b'>').add(b'`'); @@ -25,7 +24,6 @@ pub struct QueryParameters { pub path: Option<PathBuf>, pub sort: Option<SortingMethod>, pub order: Option<SortingOrder>, - pub theme: Option<ColorScheme>, qrcode: Option<String>, download: Option<CompressionMethod>, } @@ -153,7 +151,9 @@ pub fn directory_listing( file_upload: bool, random_route: Option<String>, favicon_route: String, - default_color_scheme: ColorScheme, + css_route: String, + default_color_scheme: &str, + default_color_scheme_dark: &str, show_qrcode: bool, upload_route: String, tar_enabled: bool, @@ -323,8 +323,6 @@ pub fn directory_listing( } } - let color_scheme = query_params.theme.unwrap_or(default_color_scheme); - if let Some(compression_method) = query_params.download { if !compression_method.is_enabled(tar_enabled, zip_enabled) { return Ok(ServiceResponse::new( @@ -338,11 +336,12 @@ pub fn directory_listing( "/", None, None, - color_scheme, - default_color_scheme, false, false, &favicon_route, + &css_route, + default_color_scheme, + default_color_scheme_dark, ) .into_string(), ), @@ -393,17 +392,17 @@ pub fn directory_listing( .content_type("text/html; charset=utf-8") .body( renderer::page( - serve_path, entries, is_root, query_params.sort, query_params.order, - default_color_scheme, - color_scheme, show_qrcode, file_upload, &upload_route, &favicon_route, + &css_route, + default_color_scheme, + default_color_scheme_dark, &encoded_dir, breadcrumbs, tar_enabled, @@ -421,7 +420,6 @@ pub fn extract_query_parameters(req: &HttpRequest) -> QueryParameters { sort: query.sort, order: query.order, download: query.download, - theme: query.theme, qrcode: query.qrcode.to_owned(), path: query.path.clone(), }, @@ -432,7 +430,6 @@ pub fn extract_query_parameters(req: &HttpRequest) -> QueryParameters { sort: None, order: None, download: None, - theme: None, qrcode: None, path: None, } |