Pernoise/Rocketmc
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Shulkers of fixes (#327)

Browse Source 
* Shulkers of fixes

* Fix validation message

* Update deps

* Bump docker image version
This commit is contained in:
Geometrically
2022-03-27 19:12:42 -07:00
committed by GitHub
parent 7415b07586
commit d1c0c9739d
42 changed files with 683 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/validate/mod.rs
View File

@@ -14,15 +14,15 @@ mod pack;
#[derive(Error, Debug)]
pub enum ValidationError {
#[error("Unable to read Zip Archive: {0}")]
ZipError(#[from] zip::result::ZipError),
Zip(#[from] zip::result::ZipError),
#[error("IO Error: {0}")]
IoError(#[from] std::io::Error),
Io(#[from] std::io::Error),
#[error("Error while validating JSON: {0}")]
SerdeError(#[from] serde_json::Error),
SerDe(#[from] serde_json::Error),
#[error("Invalid Input: {0}")]
InvalidInputError(std::borrow::Cow<'static, str>),
InvalidInput(std::borrow::Cow<'static, str>),
#[error("Error while managing threads")]
BlockingError(#[from] actix_web::error::BlockingError),
Blocking(#[from] actix_web::error::BlockingError),
}
#[derive(Eq, PartialEq)]
@@ -93,7 +93,7 @@ pub async fn validate_file(
}
if visited {
Err(ValidationError::InvalidInputError(
Err(ValidationError::InvalidInput(
format!(
"File extension {} is invalid for input file",
file_extension