Reorganized some imports + removed unused imports

2 files changed, 9 insertions, 7 deletions

diff --git a/src/config.rs b/src/config.rs
index 3d9971b..4873fff 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,4 +1,4 @@
-use actix_web::{fs, App, HttpRequest, Result};
+use actix_web::{fs, App};
 use std::net::IpAddr;
 
 use crate::auth;
@@ -52,11 +52,6 @@ pub fn configure_app(app: App<MiniserveConfig>) -> App<MiniserveConfig> {
     if let Some(s) = s {
         app.handler(&full_route, s)
     } else {
-        app.resource(&full_route, |r| r.f(file_handler))
+        app.resource(&full_route, |r| r.f(listing::file_handler))
     }
 }
-
-fn file_handler(req: &HttpRequest<MiniserveConfig>) -> Result<fs::NamedFile> {
-    let path = &req.state().path;
-    Ok(fs::NamedFile::open(path)?)
-}
diff --git a/src/listing.rs b/src/listing.rs
index 142018a..7a13e9b 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -8,6 +8,8 @@ use std::io;
 use std::path::Path;
 use std::str::FromStr;
 
+use crate::config;
+
 #[derive(Clone, Debug)]
 pub enum SortingMethods {
     Natural,
@@ -67,6 +69,11 @@ impl FromStr for SortingMethods {
     }
 }
 
+pub fn file_handler(req: &HttpRequest<config::MiniserveConfig>) -> Result<fs::NamedFile> {
+    let path = &req.state().path;
+    Ok(fs::NamedFile::open(path)?)
+}
+
 // ↓ Adapted from https://docs.rs/actix-web/0.7.13/src/actix_web/fs.rs.html#564
 pub fn directory_listing<S>(
     dir: &fs::Directory,