fs: Simplify maybe_redirect_or_append_path

tower-rs · Feb 19, 2024 · d205b1a · d205b1a
1 parent 853f3e9
commit d205b1a
Showing 1 changed file with 14 additions and 20 deletions.
diff --git a/tower-http/src/services/fs/serve_dir/open_file.rs b/tower-http/src/services/fs/serve_dir/open_file.rs
@@ -255,27 +255,21 @@ async fn maybe_redirect_or_append_path(
     uri: &Uri,
     append_index_html_on_directories: bool,
 ) -> Option<OpenFileOutput> {
-    if !uri.path().ends_with('/') {
-        if is_dir(path_to_file).await {
-            if append_index_html_on_directories {
-                let location =
-                    HeaderValue::from_str(&append_slash_on_path(uri.clone()).to_string()).unwrap();
-                Some(OpenFileOutput::Redirect { location })
-            } else {
-                Some(OpenFileOutput::FileNotFound)
-            }
-        } else {
-            None
-        }
-    } else if is_dir(path_to_file).await {
-        if append_index_html_on_directories {
-            path_to_file.push("index.html");
-            None
-        } else {
-            Some(OpenFileOutput::FileNotFound)
-        }
-    } else {
+    if !is_dir(path_to_file).await {
+        return None;
+    }
+
+    if !append_index_html_on_directories {
+        return Some(OpenFileOutput::FileNotFound);
+    }
+
+    if uri.path().ends_with('/') {
+        path_to_file.push("index.html");
         None
+    } else {
+        let location =
+            HeaderValue::from_str(&append_slash_on_path(uri.clone()).to_string()).unwrap();
+        Some(OpenFileOutput::Redirect { location })
     }
 }