GithubBackup/SaveAny-Bot
1
0
Fork 0
mirror of https://github.com/krau/SaveAny-Bot.git synced 2026-06-03 22:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: add unique filename handling with error logging in Save method for Minio and Webdav

Browse Source
This commit is contained in:
krau
2025-07-04 16:10:42 +08:00
parent 4b136bd41e
commit dc0debcd1c
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/minio/client.go
View File

@@ -13,6 +13,7 @@ import (
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage" storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/credentials"
"github.com/rs/xid"
) )
type Minio struct { type Minio struct {
@@ -72,6 +73,11 @@ func (m *Minio) Save(ctx context.Context, r io.Reader, storagePath string) error
candidate := storagePath candidate := storagePath
for i := 1; m.Exists(ctx, candidate); i++ { for i := 1; m.Exists(ctx, candidate); i++ {
candidate = fmt.Sprintf("%s_%d%s", base, i, ext) candidate = fmt.Sprintf("%s_%d%s", base, i, ext)
if i > 1000 {
m.logger.Errorf("Too many attempts to find a unique filename for %s", storagePath)
candidate = fmt.Sprintf("%s_%s%s", base, xid.New().String(), ext)
break
}
} }
size := int64(-1) size := int64(-1)
if length := ctx.Value(ctxkey.ContentLength); length != nil { if length := ctx.Value(ctxkey.ContentLength); length != nil {

6
storage/webdav/webdav.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/charmbracelet/log" "github.com/charmbracelet/log"
config "github.com/krau/SaveAny-Bot/config/storage" config "github.com/krau/SaveAny-Bot/config/storage"
storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage" storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage"
"github.com/rs/xid"
) )
type Webdav struct { type Webdav struct {
@@ -56,6 +57,11 @@ func (w *Webdav) Save(ctx context.Context, r io.Reader, storagePath string) erro
candidate := storagePath candidate := storagePath
for i := 1; w.Exists(ctx, candidate); i++ { for i := 1; w.Exists(ctx, candidate); i++ {
candidate = fmt.Sprintf("%s_%d%s", base, i, ext) candidate = fmt.Sprintf("%s_%d%s", base, i, ext)
if i > 1000 {
w.logger.Errorf("Too many attempts to find a unique filename for %s", storagePath)
candidate = fmt.Sprintf("%s_%s%s", base, xid.New().String(), ext)
break
}
} }
if err := w.client.MkDir(ctx, path.Dir(candidate)); err != nil { if err := w.client.MkDir(ctx, path.Dir(candidate)); err != nil {