diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-10-31 11:12:22 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-10-31 11:12:22 +0000 |
| commit | ce71a5a7902963538fc54583588850563f6746cc (patch) | |
| tree | 3e869eba6d25d2db5fe81184ffee595e451b3147 /internal/db | |
| parent | [bugfix] Relax `Mention` parsing, allowing either href or name (#2320) (diff) | |
| download | gotosocial-ce71a5a7902963538fc54583588850563f6746cc.tar.xz | |
[feature] add per-uri dereferencer locks (#2291)
Diffstat (limited to 'internal/db')
| -rw-r--r-- | internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go b/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go index 688878c0e..28bbb3a81 100644 --- a/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go +++ b/internal/db/bundb/migrations/20220612091800_duplicated_media_cleanup.go @@ -23,7 +23,6 @@ import ( "fmt" "path" - "codeberg.org/gruf/go-store/v2/kv" "codeberg.org/gruf/go-store/v2/storage" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" @@ -32,14 +31,14 @@ import ( ) func init() { - deleteAttachment := func(ctx context.Context, l log.Entry, a *gtsmodel.MediaAttachment, s *kv.KVStore, tx bun.Tx) { - if err := s.Delete(ctx, a.File.Path); err != nil && err != storage.ErrNotFound { + deleteAttachment := func(ctx context.Context, l log.Entry, a *gtsmodel.MediaAttachment, s storage.Storage, tx bun.Tx) { + if err := s.Remove(ctx, a.File.Path); err != nil && err != storage.ErrNotFound { l.Errorf("error removing file %s: %s", a.File.Path, err) } else { l.Debugf("deleted %s", a.File.Path) } - if err := s.Delete(ctx, a.Thumbnail.Path); err != nil && err != storage.ErrNotFound { + if err := s.Remove(ctx, a.Thumbnail.Path); err != nil && err != storage.ErrNotFound { l.Errorf("error removing file %s: %s", a.Thumbnail.Path, err) } else { l.Debugf("deleted %s", a.Thumbnail.Path) @@ -69,7 +68,7 @@ func init() { } return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error { - s, err := kv.OpenDisk(storageBasePath, &storage.DiskConfig{ + s, err := storage.OpenDisk(storageBasePath, &storage.DiskConfig{ LockFile: path.Join(storageBasePath, "store.lock"), }) if err != nil { |