Fix project creation hash lookups failing (#239)
This commit is contained in:
parent
fdf8845a2f
commit
69928219a3
@ -586,7 +586,6 @@ pub async fn upload_file(
|
||||
.ok_or_else(|| CreateError::InvalidFileType(file_extension.to_string()))?;
|
||||
|
||||
let mut data = Vec::new();
|
||||
let mut hash = sha1::Sha1::new();
|
||||
while let Some(chunk) = field.next().await {
|
||||
// Project file size limit of 100MiB
|
||||
const FILE_SIZE_CAP: usize = 100 * (1 << 20);
|
||||
@ -597,12 +596,11 @@ pub async fn upload_file(
|
||||
));
|
||||
} else {
|
||||
let bytes = chunk.map_err(CreateError::MultipartError)?;
|
||||
hash.update(&data);
|
||||
data.append(&mut bytes.to_vec());
|
||||
}
|
||||
}
|
||||
|
||||
let hash = hash.digest().to_string();
|
||||
let hash = sha1::Sha1::from(&data).hexdigest();
|
||||
let exists = sqlx::query!(
|
||||
"
|
||||
SELECT EXISTS(SELECT 1 FROM hashes h
|
||||
|
||||
@ -220,7 +220,6 @@ pub struct EditVersion {
|
||||
#[validate(length(max = 65536))]
|
||||
pub changelog: Option<String>,
|
||||
pub version_type: Option<models::projects::VersionType>,
|
||||
#[validate(length(min = 1, max = 256))]
|
||||
pub dependencies: Option<Vec<Dependency>>,
|
||||
pub game_versions: Option<Vec<models::projects::GameVersion>>,
|
||||
pub loaders: Option<Vec<models::projects::Loader>>,
|
||||
|
||||
@ -70,8 +70,7 @@ pub fn validate_file(
|
||||
|
||||
let mut visited = false;
|
||||
for validator in &VALIDATORS {
|
||||
if
|
||||
validator.get_project_types().contains(&project_type)
|
||||
if validator.get_project_types().contains(&project_type)
|
||||
&& loaders
|
||||
.iter()
|
||||
.any(|x| validator.get_supported_loaders().contains(&&*x.0))
|
||||
@ -90,7 +89,10 @@ pub fn validate_file(
|
||||
}
|
||||
|
||||
if visited {
|
||||
Err(ValidationError::InvalidInputError(format!("File extension {} is invalid for input file", file_extension)))
|
||||
Err(ValidationError::InvalidInputError(format!(
|
||||
"File extension {} is invalid for input file",
|
||||
file_extension
|
||||
)))
|
||||
} else {
|
||||
Ok(ValidationResult::Pass)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user