Merge branch 'master' into feat_raw_mode

1 files changed, 3 insertions, 17 deletions

diff --git a/src/listing.rs b/src/listing.rs
index 20768f1..9273025 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -28,7 +28,7 @@ mod percent_encode_sets {
 }
 
 /// Query parameters
-#[derive(Deserialize)]
+#[derive(Deserialize, Default)]
 pub struct QueryParameters {
     pub path: Option<PathBuf>,
     pub sort: Option<SortingMethod>,
@@ -389,25 +389,11 @@ pub fn directory_listing(
 
 pub fn extract_query_parameters(req: &HttpRequest) -> QueryParameters {
     match Query::<QueryParameters>::from_query(req.query_string()) {
-        Ok(query) => QueryParameters {
-            sort: query.sort,
-            order: query.order,
-            download: query.download,
-            raw: query.raw,
-            qrcode: query.qrcode.to_owned(),
-            path: query.path.clone(),
-        },
+        Ok(Query(query_params)) => query_params,
         Err(e) => {
             let err = ContextualError::ParseError("query parameters".to_string(), e.to_string());
             errors::log_error_chain(err.to_string());
-            QueryParameters {
-                sort: None,
-                order: None,
-                download: None,
-                raw: None,
-                qrcode: None,
-                path: None,
-            }
+            QueryParameters::default()
         }
     }
 }