github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(s3): mkdir and delete (close #2029)

pull/2058/head
Noah Hsu 2022-10-18 15:10:47 +08:00
parent 2efade123e
commit 45cc0cedbd
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/s3/util.go
View File

@ -52,11 +52,12 @@ func getKey(path string, dir bool) string {
return path return path
} }
// var defaultPlaceholderName = ".placeholder" var defaultPlaceholderName = ".alist"
func getPlaceholderName(placeholder string) string { func getPlaceholderName(placeholder string) string {
//if placeholder == "" { if placeholder == "" {
// return defaultPlaceholderName return defaultPlaceholderName
//} }
return placeholder return placeholder
} }
@ -88,7 +89,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) { if name == getPlaceholderName(d.Placeholder) || name == d.Placeholder {
continue continue
} }
file := model.Object{ file := model.Object{
@ -140,7 +141,7 @@ func (d *S3) listV2(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) { if name == getPlaceholderName(d.Placeholder) || name == d.Placeholder {
continue continue
} }
file := model.Object{ file := model.Object{
@ -222,11 +223,12 @@ func (d *S3) removeDir(ctx context.Context, src string) error {
} }
} }
_ = d.removeFile(path.Join(src, getPlaceholderName(d.Placeholder))) _ = d.removeFile(path.Join(src, getPlaceholderName(d.Placeholder)))
_ = d.removeFile(path.Join(src, d.Placeholder))
return nil return nil
} }
func (d *S3) removeFile(src string) error { func (d *S3) removeFile(src string) error {
key := getKey(src, true) key := getKey(src, false)
input := &s3.DeleteObjectInput{ input := &s3.DeleteObjectInput{
Bucket: &d.Bucket, Bucket: &d.Bucket,
Key: &key, Key: &key,