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

Monetization status, additional files fix, deps fix (#574)

Browse Source
This commit is contained in:
Geometrically
2023-04-16 20:03:53 -07:00
committed by GitHub
parent 95ae981698
commit a560f6e9f6
26 changed files with 1208 additions and 1422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/validate/mod.rs
View File

@@ -82,7 +82,9 @@ pub trait Validator: Sync {
) -> Result<ValidationResult, ValidationError>;
}
static VALIDATORS: [&dyn Validator; 16] = [
static ALWAYS_ALLOWED_EXT: &[&str] = &["zip", "txt"];
static VALIDATORS: &[&dyn Validator] = &[
&ModpackValidator,
&FabricValidator,
&ForgeValidator,
@@ -127,7 +129,7 @@ pub async fn validate_file(
}
let mut visited = false;
for validator in &VALIDATORS {
for validator in VALIDATORS {
if validator.get_project_types().contains(&&*project_type)
&& loaders
.iter()
@@ -147,12 +149,16 @@ pub async fn validate_file(
}
if visited {
Err(ValidationError::InvalidInput(
format!(
"File extension {file_extension} is invalid for input file"
)
.into(),
))
if ALWAYS_ALLOWED_EXT.contains(&&*file_extension) {
Ok(ValidationResult::Warning("File extension is invalid for input file"))
} else {
Err(ValidationError::InvalidInput(
format!(
"File extension {file_extension} is invalid for input file"
)
.into(),
))
}
} else {
Ok(ValidationResult::Pass)
}