diff options
Diffstat (limited to 'src/file_upload.rs')
| -rw-r--r-- | src/file_upload.rs | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/file_upload.rs b/src/file_upload.rs index f8c5019..46a3a1f 100644 --- a/src/file_upload.rs +++ b/src/file_upload.rs @@ -9,7 +9,7 @@ use std::{ path::{Component, PathBuf}, }; -use crate::errors::{self, ContextualError, ContextualErrorKind}; +use crate::errors::{self, ContextualError}; use crate::listing::{QueryParameters, SortingMethod, SortingOrder}; use crate::renderer; use crate::themes::ColorScheme; @@ -19,9 +19,9 @@ fn save_file( field: multipart::Field<dev::Payload>, file_path: PathBuf, overwrite_files: bool, -) -> Box<Future<Item = i64, Error = ContextualErrorKind>> { +) -> Box<Future<Item = i64, Error = ContextualError>> { if !overwrite_files && file_path.exists() { - return Box::new(future::err(ContextualErrorKind::CustomError( + return Box::new(future::err(ContextualError::CustomError( "File already exists, and the overwrite_files option has not been set".to_string(), ))); } @@ -29,7 +29,7 @@ fn save_file( let mut file = match std::fs::File::create(&file_path) { Ok(file) => file, Err(e) => { - return Box::new(future::err(ContextualErrorKind::IOError( + return Box::new(future::err(ContextualError::IOError( format!("Failed to create {}", file_path.display()), e, ))); @@ -37,13 +37,13 @@ fn save_file( }; Box::new( field - .map_err(ContextualErrorKind::MultipartError) + .map_err(ContextualError::MultipartError) .fold(0i64, move |acc, bytes| { let rt = file .write_all(bytes.as_ref()) .map(|_| acc + bytes.len() as i64) .map_err(|e| { - ContextualErrorKind::IOError("Failed to write to file".to_string(), e) + ContextualError::IOError("Failed to write to file".to_string(), e) }); future::result(rt) }), @@ -55,41 +55,41 @@ fn handle_multipart( item: multipart::MultipartItem<dev::Payload>, mut file_path: PathBuf, overwrite_files: bool, -) -> Box<Stream<Item = i64, Error = ContextualErrorKind>> { +) -> Box<Stream<Item = i64, Error = ContextualError>> { match item { multipart::MultipartItem::Field(field) => { let filename = field .headers() .get(header::CONTENT_DISPOSITION) - .ok_or(ContextualErrorKind::ParseError) + .ok_or(ContextualError::ParseError) .and_then(|cd| { header::ContentDisposition::from_raw(cd) - .map_err(|_| ContextualErrorKind::ParseError) + .map_err(|_| ContextualError::ParseError) }) .and_then(|content_disposition| { content_disposition .get_filename() - .ok_or(ContextualErrorKind::ParseError) + .ok_or(ContextualError::ParseError) .map(String::from) }); - let err = |e: ContextualErrorKind| Box::new(future::err(e).into_stream()); + let err = |e: ContextualError| Box::new(future::err(e).into_stream()); match filename { Ok(f) => { match fs::metadata(&file_path) { Ok(metadata) => { if !metadata.is_dir() { - return err(ContextualErrorKind::InvalidPathError(format!( + return err(ContextualError::InvalidPathError(format!( "cannot upload file to {}, since it's not a directory", &file_path.display() ))); } else if metadata.permissions().readonly() { - return err(ContextualErrorKind::InsufficientPermissionsError( + return err(ContextualError::InsufficientPermissionsError( file_path.display().to_string(), )); } } Err(_) => { - return err(ContextualErrorKind::InsufficientPermissionsError( + return err(ContextualError::InsufficientPermissionsError( file_path.display().to_string(), )); } @@ -104,7 +104,7 @@ fn handle_multipart( } } multipart::MultipartItem::Nested(mp) => Box::new( - mp.map_err(ContextualErrorKind::MultipartError) + mp.map_err(ContextualError::MultipartError) .map(move |item| handle_multipart(item, file_path.clone(), overwrite_files)) .flatten(), ), @@ -145,9 +145,9 @@ pub fn upload_file( (path.clone(), sort_param, order_param, theme_param) } } else { - let err = ContextualError::new(ContextualErrorKind::InvalidHTTPRequestError( + let err = ContextualError::InvalidHTTPRequestError( "Missing query parameter 'path'".to_string(), - )); + ); return Box::new(create_error_response( &err.to_string(), &return_path, @@ -159,8 +159,7 @@ pub fn upload_file( } } Err(e) => { - let err = - ContextualError::new(ContextualErrorKind::InvalidHTTPRequestError(e.to_string())); + let err = ContextualError::InvalidHTTPRequestError(e.to_string()); return Box::new(create_error_response( &err.to_string(), &return_path, @@ -175,10 +174,10 @@ pub fn upload_file( let app_root_dir = match req.state().path.canonicalize() { Ok(dir) => dir, Err(e) => { - let err = ContextualError::new(ContextualErrorKind::IOError( + let err = ContextualError::IOError( "Failed to resolve path served by miniserve".to_string(), e, - )); + ); return Box::new(create_error_response( &err.to_string(), &return_path, @@ -194,9 +193,9 @@ pub fn upload_file( let target_dir = match &app_root_dir.clone().join(path).canonicalize() { Ok(path) if path.starts_with(&app_root_dir) => path.clone(), _ => { - let err = ContextualError::new(ContextualErrorKind::InvalidHTTPRequestError( + let err = ContextualError::InvalidHTTPRequestError( "Invalid value for 'path' parameter".to_string(), - )); + ); return Box::new(create_error_response( &err.to_string(), &return_path, @@ -210,7 +209,7 @@ pub fn upload_file( let overwrite_files = req.state().overwrite_files; Box::new( req.multipart() - .map_err(ContextualErrorKind::MultipartError) + .map_err(ContextualError::MultipartError) .map(move |item| handle_multipart(item, target_dir.clone(), overwrite_files)) .flatten() .collect() |