ProjectHentai/alist
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(s3): unable to copy empty folder (close #4620)

Browse Source
This commit is contained in:
Andy Hsu 2023-07-10 14:55:19 +08:00
parent 3529023bf9
commit 61101a60f4
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/s3/driver.go
View File

@ -53,9 +53,9 @@ func (d *S3) Drop(ctx context.Context) error {
func (d *S3) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) { func (d *S3) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
if d.ListObjectVersion == "v2" { if d.ListObjectVersion == "v2" {
return d.listV2(dir.GetPath()) return d.listV2(dir.GetPath(), args)
} }
return d.listV1(dir.GetPath()) return d.listV1(dir.GetPath(), args)
} }
func (d *S3) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) { func (d *S3) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {

10
drivers/s3/util.go
View File

@ -69,7 +69,7 @@ func getPlaceholderName(placeholder string) string {
return placeholder return placeholder
} }
func (d *S3) listV1(prefix string) ([]model.Obj, error) { func (d *S3) listV1(prefix string, args model.ListArgs) ([]model.Obj, error) {
prefix = getKey(prefix, true) prefix = getKey(prefix, true)
log.Debugf("list: %s", prefix) log.Debugf("list: %s", prefix)
files := make([]model.Obj, 0) files := make([]model.Obj, 0)
@ -97,7 +97,7 @@ func (d *S3) listV1(prefix string) ([]model.Obj, error) {
} }
for _, object := range listObjectsResult.Contents { for _, object := range listObjectsResult.Contents {
name := path.Base(*object.Key) name := path.Base(*object.Key)
if name == getPlaceholderName(d.Placeholder) || name == d.Placeholder { if !args.S3ShowPlaceholder && (name == getPlaceholderName(d.Placeholder) || name == d.Placeholder) {
continue continue
} }
file := model.Object{ file := model.Object{
@ -120,7 +120,7 @@ func (d *S3) listV1(prefix string) ([]model.Obj, error) {
return files, nil return files, nil
} }
func (d *S3) listV2(prefix string) ([]model.Obj, error) { func (d *S3) listV2(prefix string, args model.ListArgs) ([]model.Obj, error) {
prefix = getKey(prefix, true) prefix = getKey(prefix, true)
files := make([]model.Obj, 0) files := make([]model.Obj, 0)
var continuationToken, startAfter *string var continuationToken, startAfter *string
@ -152,7 +152,7 @@ func (d *S3) listV2(prefix string) ([]model.Obj, error) {
continue continue
} }
name := path.Base(*object.Key) name := path.Base(*object.Key)
if name == getPlaceholderName(d.Placeholder) || name == d.Placeholder { if !args.S3ShowPlaceholder && (name == getPlaceholderName(d.Placeholder) || name == d.Placeholder) {
continue continue
} }
file := model.Object{ file := model.Object{
@ -198,7 +198,7 @@ func (d *S3) copyFile(ctx context.Context, src string, dst string) error {
} }
func (d *S3) copyDir(ctx context.Context, src string, dst string) error { func (d *S3) copyDir(ctx context.Context, src string, dst string) error {
objs, err := op.List(ctx, d, src, model.ListArgs{}) objs, err := op.List(ctx, d, src, model.ListArgs{S3ShowPlaceholder: true})
if err != nil { if err != nil {
return err return err
} }

3
internal/model/args.go
View File

@ -7,7 +7,8 @@ import (
) )
type ListArgs struct { type ListArgs struct {
ReqPath string ReqPath string
S3ShowPlaceholder bool
} }
type LinkArgs struct { type LinkArgs struct {