diff options
| author | boastful-squirrel <boastful.squirrel@gmail.com> | 2019-05-03 17:32:51 +0000 |
|---|---|---|
| committer | boastful-squirrel <boastful.squirrel@gmail.com> | 2019-05-03 17:32:51 +0000 |
| commit | a73a74283f64986ff6a0b6da4c234a828bc52522 (patch) | |
| tree | 04e54430bfd8ac2f16e5c5faf59effdffcbfbfb2 /src/file_upload.rs | |
| parent | Merge branch 'master' into themed-errors (diff) | |
| download | miniserve-a73a74283f64986ff6a0b6da4c234a828bc52522.tar.gz miniserve-a73a74283f64986ff6a0b6da4c234a828bc52522.zip | |
Return QueryParameters struct instead of tuple
Diffstat (limited to '')
| -rw-r--r-- | src/file_upload.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/file_upload.rs b/src/file_upload.rs index 36b2401..537c90c 100644 --- a/src/file_upload.rs +++ b/src/file_upload.rs @@ -127,9 +127,9 @@ pub fn upload_file( "/".to_string() }; - let (sort_method, sort_order, _, color_scheme, path) = listing::extract_query_parameters(req); - let color_scheme = color_scheme.unwrap_or(default_color_scheme); - let upload_path = match path { + let query_params = listing::extract_query_parameters(req); + let color_scheme = query_params.theme.unwrap_or(default_color_scheme); + let upload_path = match query_params.path.clone() { Some(path) => match path.strip_prefix(Component::RootDir) { Ok(stripped_path) => stripped_path.to_owned(), Err(_) => path.clone(), @@ -142,8 +142,8 @@ pub fn upload_file( &err.to_string(), StatusCode::BAD_REQUEST, &return_path, - sort_method, - sort_order, + query_params.sort, + query_params.order, color_scheme, default_color_scheme, )); @@ -161,8 +161,8 @@ pub fn upload_file( &err.to_string(), StatusCode::INTERNAL_SERVER_ERROR, &return_path, - sort_method, - sort_order, + query_params.sort, + query_params.order, color_scheme, default_color_scheme, )); @@ -180,8 +180,8 @@ pub fn upload_file( &err.to_string(), StatusCode::BAD_REQUEST, &return_path, - sort_method, - sort_order, + query_params.sort, + query_params.order, color_scheme, default_color_scheme, )); @@ -204,8 +204,8 @@ pub fn upload_file( &e.to_string(), StatusCode::INTERNAL_SERVER_ERROR, &return_path, - sort_method, - sort_order, + query_params.sort, + query_params.order, color_scheme, default_color_scheme, ), |