LemmyNet/pict-rs
2
0
Fork 0
mirror of https://git.asonix.dog/asonix/pict-rs synced 2024-12-22 11:21:24 +00:00
Code Releases Activity

Fix Alias cleanup ordering

Browse source 
Update dev.toml
This commit is contained in:
asonix 2023-07-13 19:56:56 -05:00
parent a32355c064
commit afeac8294a
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dev.toml
View file

@ -21,6 +21,11 @@ path = 'data/'
max_file_size = 40 max_file_size = 40
filters = ['blur', 'crop', 'identity', 'resize', 'thumbnail'] filters = ['blur', 'crop', 'identity', 'resize', 'thumbnail']
[media.animation]
max_width = 2000
max_height = 2000
max_area = 2000000
[media.video] [media.video]
enable = true enable = true
allow_audio = true allow_audio = true

6
src/queue/cleanup.rs
View file

@ -95,6 +95,8 @@ where
// TODO: decide if it is okay to skip aliases without tokens // TODO: decide if it is okay to skip aliases without tokens
if let Some(token) = repo.delete_token(&alias).await? { if let Some(token) = repo.delete_token(&alias).await? {
super::cleanup_alias(repo, alias, token).await?; super::cleanup_alias(repo, alias, token).await?;
} else {
tracing::warn!("Not cleaning alias!");
} }
} }
// Return after queueing cleanup alias, since we will be requeued when the last alias is cleaned // Return after queueing cleanup alias, since we will be requeued when the last alias is cleaned
@ -130,13 +132,13 @@ where
return Err(UploadError::InvalidToken.into()); return Err(UploadError::InvalidToken.into());
} }
AliasRepo::cleanup(repo, &alias).await?;
let Some(hash) = repo.hash(&alias).await? else { let Some(hash) = repo.hash(&alias).await? else {
// hash doesn't exist, nothing to do // hash doesn't exist, nothing to do
return Ok(()); return Ok(());
}; };
AliasRepo::cleanup(repo, &alias).await?;
repo.remove_alias(hash.clone(), &alias).await?; repo.remove_alias(hash.clone(), &alias).await?;
if repo.aliases(hash.clone()).await?.is_empty() { if repo.aliases(hash.clone()).await?.is_empty() {