mirror of
https://github.com/rclone/rclone.git
synced 2025-11-23 21:44:49 +02:00
smb: optimize smb mount performance by avoiding stat checks during initialization
add IsPathDir function and tests for trailing slash optimization
This commit is contained in:
@@ -192,6 +192,9 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, e
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if root is empty or ends with / (must be a directory)
|
||||||
|
isRootDir := isPathDir(root)
|
||||||
|
|
||||||
root = strings.Trim(root, "/")
|
root = strings.Trim(root, "/")
|
||||||
|
|
||||||
f := &Fs{
|
f := &Fs{
|
||||||
@@ -218,6 +221,11 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, e
|
|||||||
if share == "" || dir == "" {
|
if share == "" || dir == "" {
|
||||||
return f, nil
|
return f, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Skip stat check if root is already a directory
|
||||||
|
if isRootDir {
|
||||||
|
return f, nil
|
||||||
|
}
|
||||||
cn, err := f.getConnection(ctx, share)
|
cn, err := f.getConnection(ctx, share)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -894,6 +902,11 @@ func ensureSuffix(s, suffix string) string {
|
|||||||
return s + suffix
|
return s + suffix
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isPathDir determines if a path represents a directory based on trailing slash
|
||||||
|
func isPathDir(path string) bool {
|
||||||
|
return path == "" || strings.HasSuffix(path, "/")
|
||||||
|
}
|
||||||
|
|
||||||
func trimPathPrefix(s, prefix string) string {
|
func trimPathPrefix(s, prefix string) string {
|
||||||
// we need to clean the paths to make tests pass!
|
// we need to clean the paths to make tests pass!
|
||||||
s = betterPathClean(s)
|
s = betterPathClean(s)
|
||||||
|
|||||||
41
backend/smb/smb_internal_test.go
Normal file
41
backend/smb/smb_internal_test.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
// Unit tests for internal SMB functions
|
||||||
|
package smb
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// TestIsPathDir tests the isPathDir function logic
|
||||||
|
func TestIsPathDir(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
path string
|
||||||
|
expected bool
|
||||||
|
}{
|
||||||
|
// Empty path should be considered a directory
|
||||||
|
{"", true},
|
||||||
|
|
||||||
|
// Paths with trailing slash should be directories
|
||||||
|
{"/", true},
|
||||||
|
{"share/", true},
|
||||||
|
{"share/dir/", true},
|
||||||
|
{"share/dir/subdir/", true},
|
||||||
|
|
||||||
|
// Paths without trailing slash should not be directories
|
||||||
|
{"share", false},
|
||||||
|
{"share/dir", false},
|
||||||
|
{"share/dir/file", false},
|
||||||
|
{"share/dir/subdir/file", false},
|
||||||
|
|
||||||
|
// Edge cases
|
||||||
|
{"share//", true},
|
||||||
|
{"share///", true},
|
||||||
|
{"share/dir//", true},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.path, func(t *testing.T) {
|
||||||
|
result := isPathDir(tt.path)
|
||||||
|
if result != tt.expected {
|
||||||
|
t.Errorf("isPathDir(%q) = %v, want %v", tt.path, result, tt.expected)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user