2
0
Fork 0
mirror of https://git.asonix.dog/asonix/pict-rs synced 2024-12-22 19:31:35 +00:00

Don't overwrite existing variants

This commit is contained in:
asonix 2023-08-16 15:12:16 -05:00
parent 22cfbe979d
commit 1559d57f0a
5 changed files with 33 additions and 18 deletions

View file

@ -4,7 +4,7 @@ use crate::{
error::{Error, UploadError}, error::{Error, UploadError},
ffmpeg::ThumbnailFormat, ffmpeg::ThumbnailFormat,
formats::{InputProcessableFormat, InternalVideoFormat}, formats::{InputProcessableFormat, InternalVideoFormat},
repo::{Alias, ArcRepo, Hash}, repo::{Alias, ArcRepo, Hash, VariantAlreadyExists},
store::{Identifier, Store}, store::{Identifier, Store},
}; };
use actix_web::web::Bytes; use actix_web::web::Bytes;
@ -167,13 +167,19 @@ async fn process<S: Store + 'static>(
let identifier = store let identifier = store
.save_bytes(bytes.clone(), details.media_type()) .save_bytes(bytes.clone(), details.media_type())
.await?; .await?;
repo.relate_details(&identifier, &details).await?;
repo.relate_variant_identifier( if let Err(VariantAlreadyExists) = repo
.relate_variant_identifier(
hash, hash,
thumbnail_path.to_string_lossy().to_string(), thumbnail_path.to_string_lossy().to_string(),
&identifier, &identifier,
) )
.await?; .await?
{
store.remove(&identifier).await?;
}
repo.relate_details(&identifier, &details).await?;
guard.disarm(); guard.disarm();

View file

@ -253,7 +253,8 @@ where
Ok(new_identifier) => { Ok(new_identifier) => {
migrate_details(repo, &identifier, &new_identifier).await?; migrate_details(repo, &identifier, &new_identifier).await?;
repo.remove_variant(hash.clone(), variant.clone()).await?; repo.remove_variant(hash.clone(), variant.clone()).await?;
repo.relate_variant_identifier(hash.clone(), variant, &new_identifier) let _ = repo
.relate_variant_identifier(hash.clone(), variant, &new_identifier)
.await?; .await?;
repo.mark_migrated(&identifier, &new_identifier).await?; repo.mark_migrated(&identifier, &new_identifier).await?;

View file

@ -43,6 +43,8 @@ pub(crate) struct DeleteToken {
pub(crate) struct HashAlreadyExists; pub(crate) struct HashAlreadyExists;
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct AliasAlreadyExists; pub(crate) struct AliasAlreadyExists;
#[derive(Debug)]
pub(crate) struct VariantAlreadyExists;
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub(crate) struct UploadId { pub(crate) struct UploadId {
@ -474,7 +476,7 @@ pub(crate) trait HashRepo: BaseRepo {
hash: Hash, hash: Hash,
variant: String, variant: String,
identifier: &dyn Identifier, identifier: &dyn Identifier,
) -> Result<(), StoreError>; ) -> Result<Result<(), VariantAlreadyExists>, StoreError>;
async fn variant_identifier( async fn variant_identifier(
&self, &self,
hash: Hash, hash: Hash,
@ -531,7 +533,7 @@ where
hash: Hash, hash: Hash,
variant: String, variant: String,
identifier: &dyn Identifier, identifier: &dyn Identifier,
) -> Result<(), StoreError> { ) -> Result<Result<(), VariantAlreadyExists>, StoreError> {
T::relate_variant_identifier(self, hash, variant, identifier).await T::relate_variant_identifier(self, hash, variant, identifier).await
} }

View file

@ -173,7 +173,7 @@ async fn do_migrate_hash_04<S: Store>(
} }
for (variant, identifier) in variants { for (variant, identifier) in variants {
new_repo let _ = new_repo
.relate_variant_identifier(hash.clone(), variant.clone(), &identifier) .relate_variant_identifier(hash.clone(), variant.clone(), &identifier)
.await?; .await?;

View file

@ -4,7 +4,7 @@ use crate::{
hash::Hash, Alias, AliasAccessRepo, AliasAlreadyExists, AliasRepo, BaseRepo, DeleteToken, hash::Hash, Alias, AliasAccessRepo, AliasAlreadyExists, AliasRepo, BaseRepo, DeleteToken,
Details, FullRepo, HashAlreadyExists, HashRepo, Identifier, IdentifierRepo, JobId, Details, FullRepo, HashAlreadyExists, HashRepo, Identifier, IdentifierRepo, JobId,
ProxyRepo, QueueRepo, RepoError, SettingsRepo, StoreMigrationRepo, UploadId, UploadRepo, ProxyRepo, QueueRepo, RepoError, SettingsRepo, StoreMigrationRepo, UploadId, UploadRepo,
UploadResult, VariantAccessRepo, UploadResult, VariantAccessRepo, VariantAlreadyExists,
}, },
serde_str::Serde, serde_str::Serde,
store::StoreError, store::StoreError,
@ -1053,18 +1053,24 @@ impl HashRepo for SledRepo {
hash: Hash, hash: Hash,
variant: String, variant: String,
identifier: &dyn Identifier, identifier: &dyn Identifier,
) -> Result<(), StoreError> { ) -> Result<Result<(), VariantAlreadyExists>, StoreError> {
let hash = hash.to_bytes(); let hash = hash.to_bytes();
let key = variant_key(&hash, &variant); let key = variant_key(&hash, &variant);
let value = identifier.to_bytes()?; let value = identifier.to_bytes()?;
b!( let hash_variant_identifiers = self.hash_variant_identifiers.clone();
self.hash_variant_identifiers,
hash_variant_identifiers.insert(key, value)
);
Ok(()) actix_rt::task::spawn_blocking(move || {
hash_variant_identifiers
.compare_and_swap(key, Option::<&[u8]>::None, Some(value))
.map(|res| res.map_err(|_| VariantAlreadyExists))
})
.await
.map_err(|_| RepoError::Canceled)?
.map_err(SledError::from)
.map_err(RepoError::from)
.map_err(StoreError::from)
} }
#[tracing::instrument(level = "trace", skip(self))] #[tracing::instrument(level = "trace", skip(self))]