extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-22 16:34:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

vfs: fix invalid cache path on windows when using :backend: as remote

Browse Source 
The initial ':' is included in the ad-hoc remote name, but is illegal character
in Windows path. Replacing it with '^', which is legal in filesystems but illegal
in regular remote names, so name conflict is avoided.

Fixes #4544
This commit is contained in:
albertony 2020-11-14 00:37:54 +01:00 committed by Nick Craig-Wood
parent 20578f3f89
commit 459cc70a50
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vfs/vfscache/cache.go
View File

@ -74,21 +74,26 @@ type AddVirtualFn func(remote string, size int64, isDir bool) error
// This starts background goroutines which can be cancelled with the // This starts background goroutines which can be cancelled with the
// context passed in. // context passed in.
func New(ctx context.Context, fremote fs.Fs, opt *vfscommon.Options, avFn AddVirtualFn) (*Cache, error) { func New(ctx context.Context, fremote fs.Fs, opt *vfscommon.Options, avFn AddVirtualFn) (*Cache, error) {
fName := fremote.Name()
fRoot := filepath.FromSlash(fremote.Root()) fRoot := filepath.FromSlash(fremote.Root())
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
if strings.HasPrefix(fRoot, `\\?`) { if strings.HasPrefix(fRoot, `\\?`) {
fRoot = fRoot[3:] fRoot = fRoot[3:]
} }
fRoot = strings.Replace(fRoot, ":", "", -1) fRoot = strings.Replace(fRoot, ":", "", -1)
// Replace leading ':' if remote was created on the fly as ":backend:/path" as it is illegal in Windows
if fName[0] == ':' {
fName = "^" + fName[1:]
}
} }
cacheDir := config.CacheDir cacheDir := config.CacheDir
cacheDir, err := filepath.Abs(cacheDir) cacheDir, err := filepath.Abs(cacheDir)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to make --cache-dir absolute") return nil, errors.Wrap(err, "failed to make --cache-dir absolute")
} }
root := file.UNCPath(filepath.Join(cacheDir, "vfs", fremote.Name(), fRoot)) root := file.UNCPath(filepath.Join(cacheDir, "vfs", fName, fRoot))
fs.Debugf(nil, "vfs cache: root is %q", root) fs.Debugf(nil, "vfs cache: root is %q", root)
metaRoot := file.UNCPath(filepath.Join(cacheDir, "vfsMeta", fremote.Name(), fRoot)) metaRoot := file.UNCPath(filepath.Join(cacheDir, "vfsMeta", fName, fRoot))
fs.Debugf(nil, "vfs cache: metadata root is %q", root) fs.Debugf(nil, "vfs cache: metadata root is %q", root)
fcache, err := fscache.Get(ctx, root) fcache, err := fscache.Get(ctx, root)