From 2103ea0ed4df223b238dda96f142814692ed861d Mon Sep 17 00:00:00 2001
From: jikstra <jikstra@disroot.org>
Date: Wed, 29 Dec 2021 04:10:24 +0100
Subject: Implement --route-prefix to set specific route prefix

---
 src/main.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index d5cac00..3cbed1d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -165,9 +165,12 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> {
                 Some(_) => format!("https://{}", addr),
                 None => format!("http://{}", addr),
             })
-            .map(|url| match miniserve_config.random_route {
-                Some(ref random_route) => format!("{}/{}", url, random_route),
-                None => url,
+            .map(|url| {
+                if !miniserve_config.route_prefix.is_empty() {
+                    format!("{}{}", url, miniserve_config.route_prefix)
+                } else {
+                    url
+                }
             })
             .collect::<Vec<_>>()
     };
@@ -195,7 +198,7 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> {
             )
             .route(&format!("/{}", inside_config.css_route), web::get().to(css))
             .service(
-                web::scope(inside_config.random_route.as_deref().unwrap_or(""))
+                web::scope(&inside_config.route_prefix)
                     .wrap(middleware::Condition::new(
                         !inside_config.auth.is_empty(),
                         HttpAuthentication::basic(auth::handle_auth),
-- 
cgit v1.2.3


From 020516c92b220ca47343e360bbec0686899730c0 Mon Sep 17 00:00:00 2001
From: jikstra <jikstra@disroot.org>
Date: Mon, 3 Jan 2022 20:28:03 +0100
Subject: Apply requested changes

---
 src/main.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 3cbed1d..4e16f83 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -165,13 +165,7 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> {
                 Some(_) => format!("https://{}", addr),
                 None => format!("http://{}", addr),
             })
-            .map(|url| {
-                if !miniserve_config.route_prefix.is_empty() {
-                    format!("{}{}", url, miniserve_config.route_prefix)
-                } else {
-                    url
-                }
-            })
+            .map(|url| format!("{}{}", url, miniserve_config.route_prefix))
             .collect::<Vec<_>>()
     };
 
-- 
cgit v1.2.3


From 0e6adbb3b53147f2e78a907909f6c470190ebaf3 Mon Sep 17 00:00:00 2001
From: Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>
Date: Sun, 6 Feb 2022 14:48:33 +0300
Subject: Fix route_prefix for css and favicon

---
 src/main.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/main.rs')

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(
-- 
cgit v1.2.3