SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Ignore missing files when cleaning up media (#1435)

This commit is contained in:
Sam Lade 2023-02-06 14:58:54 +00:00 committed by GitHub
parent 02767bfc7d
commit 6a6647d68b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/processing/media/delete.go
View File

@ -2,9 +2,11 @@ package media
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"strings" "strings"
"codeberg.org/gruf/go-store/v2/storage"
"github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtserror"
) )
@ -24,14 +26,14 @@ func (p *processor) Delete(ctx context.Context, mediaAttachmentID string) gtserr
// delete the thumbnail from storage // delete the thumbnail from storage
if attachment.Thumbnail.Path != "" { if attachment.Thumbnail.Path != "" {
if err := p.storage.Delete(ctx, attachment.Thumbnail.Path); err != nil { if err := p.storage.Delete(ctx, attachment.Thumbnail.Path); err != nil && !errors.Is(err, storage.ErrNotFound) {
errs = append(errs, fmt.Sprintf("remove thumbnail at path %s: %s", attachment.Thumbnail.Path, err)) errs = append(errs, fmt.Sprintf("remove thumbnail at path %s: %s", attachment.Thumbnail.Path, err))
} }
} }
// delete the file from storage // delete the file from storage
if attachment.File.Path != "" { if attachment.File.Path != "" {
if err := p.storage.Delete(ctx, attachment.File.Path); err != nil { if err := p.storage.Delete(ctx, attachment.File.Path); err != nil && !errors.Is(err, storage.ErrNotFound) {
errs = append(errs, fmt.Sprintf("remove file at path %s: %s", attachment.File.Path, err)) errs = append(errs, fmt.Sprintf("remove file at path %s: %s", attachment.File.Path, err))
} }
} }