alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

jottacloud: fix listing output of remote with special characters

Browse source 
This fixes the failing integration test: TestIntegration/FsMkdir/FsPutFiles/FsIsFile
This commit is contained in:
albertony 2022-04-27 12:47:53 +02:00 committed by Nick Craig-Wood
parent edf0412464
commit a9d3283d97
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
backend/jottacloud/jottacloud.go
View file

@ -932,7 +932,7 @@ func (f *Fs) List(ctx context.Context, dir string) (entries fs.DirEntries, err e
return entries, nil return entries, nil
} }
func parseListRStream(ctx context.Context, r io.Reader, trimPrefix string, filesystem *Fs, callback func(fs.DirEntry) error) error { func parseListRStream(ctx context.Context, r io.Reader, filesystem *Fs, callback func(fs.DirEntry) error) error {
type stats struct { type stats struct {
Folders int `xml:"folders"` Folders int `xml:"folders"`
@ -968,8 +968,12 @@ func parseListRStream(ctx context.Context, r io.Reader, trimPrefix string, files
}) })
} }
// liststream paths are /mountpoint/root/path
// so the returned paths should have /mountpoint/root/ trimmed
// as the caller is expecting path.
pathPrefix := filesystem.opt.Enc.FromStandardPath(path.Join("/", filesystem.opt.Mountpoint, filesystem.root))
trimPathPrefix := func(p string) string { trimPathPrefix := func(p string) string {
p = strings.TrimPrefix(p, trimPrefix) p = strings.TrimPrefix(p, pathPrefix)
p = strings.TrimPrefix(p, "/") p = strings.TrimPrefix(p, "/")
return p return p
} }
@ -1052,11 +1056,7 @@ func (f *Fs) ListR(ctx context.Context, dir string, callback fs.ListRCallback) (
return shouldRetry(ctx, resp, err) return shouldRetry(ctx, resp, err)
} }
// liststream paths are /mountpoint/root/path err = parseListRStream(ctx, resp.Body, f, func(d fs.DirEntry) error {
// so the returned paths should have /mountpoint/root/ trimmed
// as the caller is expecting path.
trimPrefix := path.Join("/", f.opt.Mountpoint, f.root)
err = parseListRStream(ctx, resp.Body, trimPrefix, f, func(d fs.DirEntry) error {
if d.Remote() == dir { if d.Remote() == dir {
return nil return nil
} }