HyperNet/Paperclip
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix on boost reupload

Browse Source
This commit is contained in:
LittleSheep 2024-12-29 01:59:57 +08:00
parent 0e0ad9c261
commit 1955d94414
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/internal/services/boost.go
View File

@ -94,7 +94,7 @@ func ActivateBoost(boost models.AttachmentBoost) error {
return fmt.Errorf("invalid destination: %d", boost.Destination) return fmt.Errorf("invalid destination: %d", boost.Destination)
} }
if err := ReUploadFile(boost.Attachment, boost.Destination); err != nil { if err := ReUploadFile(boost.Attachment, boost.Destination, true); err != nil {
log.Warn().Any("boost", boost).Err(err).Msg("Unable to activate boost...") log.Warn().Any("boost", boost).Err(err).Msg("Unable to activate boost...")
database.C.Model(&boost).Update("status", models.BoostStatusError) database.C.Model(&boost).Update("status", models.BoostStatusError)
return err return err

7
pkg/internal/services/uploader.go
View File

@ -35,7 +35,7 @@ func UploadFileToTemporary(ctx *fiber.Ctx, file *multipart.FileHeader, meta mode
} }
} }
func ReUploadFile(meta models.Attachment, dst int) error { func ReUploadFile(meta models.Attachment, dst int, doNotUpdate ...bool) error {
if meta.Destination == dst { if meta.Destination == dst {
return fmt.Errorf("destnation cannot be reversed temporary or the same as the original") return fmt.Errorf("destnation cannot be reversed temporary or the same as the original")
} }
@ -47,6 +47,9 @@ func ReUploadFile(meta models.Attachment, dst int) error {
} }
cleanupDst := func() { cleanupDst := func() {
if len(doNotUpdate) == 0 || !doNotUpdate[0] {
database.C.Save(&meta)
}
if prevDst == models.AttachmentDstTemporary { if prevDst == models.AttachmentDstTemporary {
return return
} }
@ -82,7 +85,6 @@ func ReUploadFile(meta models.Attachment, dst int) error {
return fmt.Errorf("unable to copy data to dest file: %v", err) return fmt.Errorf("unable to copy data to dest file: %v", err)
} }
database.C.Save(&meta)
cleanupDst() cleanupDst()
return nil return nil
case models.DestinationTypeS3: case models.DestinationTypeS3:
@ -106,7 +108,6 @@ func ReUploadFile(meta models.Attachment, dst int) error {
return fmt.Errorf("unable to upload file to s3: %v", err) return fmt.Errorf("unable to upload file to s3: %v", err)
} }
database.C.Save(&meta)
cleanupDst() cleanupDst()
return nil return nil
default: default: