From 975fb16e5bde3d474bbadc99e2846b1940e6b954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Pej=C5=A1a?= <vojtechpejsa7@gmail.com>
Date: Thu, 28 Mar 2019 18:33:07 +0100
Subject: Improve how file upload handler is added to server.

---
 src/main.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 7ae06bd..935d619 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -181,7 +181,7 @@ fn main() {
 }
 
 /// Configures the Actix application
-fn configure_app(mut app: App<MiniserveConfig>) -> App<MiniserveConfig> {
+fn configure_app(app: App<MiniserveConfig>) -> App<MiniserveConfig> {
     let upload_route;
     let s = {
         let path = &app.state().path;
@@ -217,16 +217,18 @@ fn configure_app(mut app: App<MiniserveConfig>) -> App<MiniserveConfig> {
     let random_route = app.state().random_route.clone().unwrap_or_default();
     let full_route = format!("/{}", random_route);
 
-    // Allow file upload
-    if app.state().file_upload {
-        app = app.resource(&upload_route, |r| {
-            r.method(Method::POST).f(file_upload::upload_file)
-        });
-    }
-
     if let Some(s) = s {
-        // Handle directories
-        app.handler(&full_route, s)
+        if app.state().file_upload {
+            // Allow file upload
+            app.resource(&upload_route, |r| {
+                r.method(Method::POST).f(file_upload::upload_file)
+            })
+            // Handle directories
+            .handler(&full_route, s)
+        } else {
+            // Handle directories
+            app.handler(&full_route, s)
+        }
     } else {
         // Handle single files
         app.resource(&full_route, |r| r.f(listing::file_handler))
-- 
cgit v1.2.3