mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-08-28 20:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
chrislu
2025-11-05 22:40:24 -08:00
parent 1cd8a591b9
commit de24b2e42c
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weed/filer/filer.go
+3 -7
View File
@@ -440,13 +440,9 @@ func (f *Filer) doListDirectoryEntries(ctx context.Context, p util.FullPath, sta
var stopAtPath util.FullPath
if strings.HasPrefix(string(p), f.DirBucketsPath+"/") {
// S3 path: stop at the bucket root (e.g., /buckets/mybucket)
pathAfterBuckets := string(p)[len(f.DirBucketsPath)+1:]
parts := strings.SplitN(pathAfterBuckets, "/", 2)
if len(parts) > 0 {
stopAtPath = util.NewFullPath(f.DirBucketsPath, parts[0])
} else {
stopAtPath = util.FullPath(f.DirBucketsPath)
}
pathAfterBuckets := strings.TrimPrefix(string(p), f.DirBucketsPath+"/")
bucketName, _, _ := strings.Cut(pathAfterBuckets, "/")
stopAtPath = util.NewFullPath(f.DirBucketsPath, bucketName)
} else {
// Non-S3 path: allow cleanup up to root
stopAtPath = "/"
weed/server/filer_grpc_server.go
+3 -1
View File
@@ -305,7 +305,9 @@ func (fs *FilerServer) DeleteEntry(ctx context.Context, req *filer_pb.DeleteEntr
if req.DeleteEmptyParentDirectories {
stopAtPath := util.FullPath(req.DeleteEmptyParentDirectoriesStopPath)
if stopAtPath == "" {
stopAtPath = util.FullPath(fs.filer.DirBucketsPath)
// Default to root to allow cleanup for non-S3 paths
// S3 API clients provide a specific bucket stop path
stopAtPath = "/"
}
// Clean up empty parent directories starting from req.Directory