diff --git a/apps/labrinth/src/validate/fabric.rs b/apps/labrinth/src/validate/fabric.rs index 073087b791..3d634e8f1b 100644 --- a/apps/labrinth/src/validate/fabric.rs +++ b/apps/labrinth/src/validate/fabric.rs @@ -1,5 +1,6 @@ use crate::validate::{ - SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs, + SupportedGameVersions, ValidationError, ValidationResult, + validate_pack_formats, }; use std::io::Cursor; use zip::ZipArchive; @@ -29,8 +30,6 @@ impl super::Validator for FabricValidator { )); } - filter_out_packs(archive)?; - - Ok(ValidationResult::Pass) + Ok(validate_pack_formats(archive)) } } diff --git a/apps/labrinth/src/validate/forge.rs b/apps/labrinth/src/validate/forge.rs index 375b31e645..09b16ac2a4 100644 --- a/apps/labrinth/src/validate/forge.rs +++ b/apps/labrinth/src/validate/forge.rs @@ -1,5 +1,6 @@ use crate::validate::{ - SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs, + SupportedGameVersions, ValidationError, ValidationResult, + validate_pack_formats, }; use chrono::DateTime; use std::io::Cursor; @@ -36,9 +37,7 @@ impl super::Validator for ForgeValidator { )); } - filter_out_packs(archive)?; - - Ok(ValidationResult::Pass) + Ok(validate_pack_formats(archive)) } } @@ -74,8 +73,6 @@ impl super::Validator for LegacyForgeValidator { )); }; - filter_out_packs(archive)?; - - Ok(ValidationResult::Pass) + Ok(validate_pack_formats(archive)) } } diff --git a/apps/labrinth/src/validate/liteloader.rs b/apps/labrinth/src/validate/liteloader.rs index 78029f1f1e..11e8e08582 100644 --- a/apps/labrinth/src/validate/liteloader.rs +++ b/apps/labrinth/src/validate/liteloader.rs @@ -1,5 +1,6 @@ use crate::validate::{ - SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs, + SupportedGameVersions, ValidationError, ValidationResult, + validate_pack_formats, }; use std::io::Cursor; use zip::ZipArchive; @@ -29,8 +30,6 @@ impl super::Validator for LiteLoaderValidator { )); } - filter_out_packs(archive)?; - - Ok(ValidationResult::Pass) + Ok(validate_pack_formats(archive)) } } diff --git a/apps/labrinth/src/validate/mod.rs b/apps/labrinth/src/validate/mod.rs index 63a92dacbb..b2df5e03df 100644 --- a/apps/labrinth/src/validate/mod.rs +++ b/apps/labrinth/src/validate/mod.rs @@ -326,9 +326,10 @@ fn game_version_supported( } } -pub fn filter_out_packs( - archive: &mut ZipArchive>, -) -> Result { +#[must_use] +pub fn validate_pack_formats( + archive: &mut ZipArchive>, +) -> ValidationResult { if (archive.by_name("modlist.html").is_ok() && archive.by_name("manifest.json").is_ok()) || archive @@ -338,10 +339,10 @@ pub fn filter_out_packs( .file_names() .any(|x| x.starts_with("override/mods/") && x.ends_with(".jar")) { - return Ok(ValidationResult::Warning( - "Invalid modpack file. You must upload a valid .MRPACK file.", - )); + return ValidationResult::Warning( + "Invalid modpack file. Modpacks must be uploaded in the .mrpack format, not as a ZIP file.", + ); } - Ok(ValidationResult::Pass) + ValidationResult::Pass } diff --git a/apps/labrinth/src/validate/neoforge.rs b/apps/labrinth/src/validate/neoforge.rs index b857274565..341e4a2add 100644 --- a/apps/labrinth/src/validate/neoforge.rs +++ b/apps/labrinth/src/validate/neoforge.rs @@ -1,5 +1,6 @@ use crate::validate::{ - SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs, + SupportedGameVersions, ValidationError, ValidationResult, + validate_pack_formats, }; use std::io::Cursor; use zip::ZipArchive; @@ -33,8 +34,6 @@ impl super::Validator for NeoForgeValidator { )); } - filter_out_packs(archive)?; - - Ok(ValidationResult::Pass) + Ok(validate_pack_formats(archive)) } } diff --git a/apps/labrinth/src/validate/quilt.rs b/apps/labrinth/src/validate/quilt.rs index 29ed0d5432..53ee8fe0d8 100644 --- a/apps/labrinth/src/validate/quilt.rs +++ b/apps/labrinth/src/validate/quilt.rs @@ -1,5 +1,6 @@ use crate::validate::{ - SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs, + SupportedGameVersions, ValidationError, ValidationResult, + validate_pack_formats, }; use chrono::DateTime; use std::io::Cursor; @@ -34,8 +35,6 @@ impl super::Validator for QuiltValidator { )); } - filter_out_packs(archive)?; - - Ok(ValidationResult::Pass) + Ok(validate_pack_formats(archive)) } } diff --git a/apps/labrinth/src/validate/rift.rs b/apps/labrinth/src/validate/rift.rs index b4c6c5d9c1..e2e57bcdee 100644 --- a/apps/labrinth/src/validate/rift.rs +++ b/apps/labrinth/src/validate/rift.rs @@ -1,5 +1,6 @@ use crate::validate::{ - SupportedGameVersions, ValidationError, ValidationResult, filter_out_packs, + SupportedGameVersions, ValidationError, ValidationResult, + validate_pack_formats, }; use std::io::Cursor; use zip::ZipArchive; @@ -29,8 +30,6 @@ impl super::Validator for RiftValidator { )); } - filter_out_packs(archive)?; - - Ok(ValidationResult::Pass) + Ok(validate_pack_formats(archive)) } }