diff options
| author | Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com> | 2022-02-06 11:48:33 +0000 |
|---|---|---|
| committer | Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com> | 2022-02-06 11:48:33 +0000 |
| commit | 0e6adbb3b53147f2e78a907909f6c470190ebaf3 (patch) | |
| tree | dc25926d212f9f4cdd0ef2e3115e4c9496b6e01e /src | |
| parent | Merge 'jikstra/feat_route_prefix' #682 (diff) | |
| download | miniserve-0e6adbb3b53147f2e78a907909f6c470190ebaf3.tar.gz miniserve-0e6adbb3b53147f2e78a907909f6c470190ebaf3.zip | |
Fix route_prefix for css and favicon
Diffstat (limited to '')
| -rw-r--r-- | src/config.rs | 6 | ||||
| -rw-r--r-- | src/main.rs | 7 | ||||
| -rw-r--r-- | src/renderer.rs | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/config.rs b/src/config.rs index ae260af..73fcec2 100644 --- a/src/config.rs +++ b/src/config.rs @@ -47,7 +47,7 @@ pub struct MiniserveConfig { /// Show hidden files pub show_hidden: bool, - /// Route prefix + /// Route prefix; Either empty or prefixed with slash pub route_prefix: String, /// Randomly generated favicon route @@ -139,8 +139,8 @@ impl MiniserveConfig { // 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 favicon_route = format!("{}/{}", route_prefix, nanoid::nanoid!(10, &ROUTE_ALPHABET)); + let css_route = format!("{}/{}", route_prefix, nanoid::nanoid!(10, &ROUTE_ALPHABET)); let default_color_scheme = args.color_scheme; let default_color_scheme_dark = args.color_scheme_dark; diff --git a/src/main.rs b/src/main.rs index 732abac..16feaf0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -186,11 +186,8 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { .app_data(inside_config.clone()) .wrap_fn(errors::error_page_middleware) .wrap(middleware::Logger::default()) - .route( - &format!("/{}", inside_config.favicon_route), - web::get().to(favicon), - ) - .route(&format!("/{}", inside_config.css_route), web::get().to(css)) + .route(&inside_config.favicon_route, web::get().to(favicon)) + .route(&inside_config.css_route, web::get().to(css)) .service( web::scope(&inside_config.route_prefix) .wrap(middleware::Condition::new( diff --git a/src/renderer.rs b/src/renderer.rs index 0ac5077..544be42 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -478,8 +478,8 @@ fn page_header(title: &str, file_upload: bool, favicon_route: &str, css_route: & meta http-equiv="X-UA-Compatible" content="IE=edge"; meta name="viewport" content="width=device-width, initial-scale=1"; - link rel="icon" type="image/svg+xml" href={ "/" (favicon_route) }; - link rel="stylesheet" href={ "/" (css_route) }; + link rel="icon" type="image/svg+xml" href={ (favicon_route) }; + link rel="stylesheet" href={ (css_route) }; title { (title) } |