pacer: fix deadlock between pacer token and --max-connections

It was possible in the presence of --max-connections and recursive
calls to the pacer to deadlock it leaving all connections waiting on
either a max connection token or a pacer token.

This fixes the problem by making sure we return the pacer token on
schedule if we take it.

This also short circuits the pacer token if sleepTime is 0.

.github/workflows/build.yml

@@ -100,7 +100,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
           check-latest: true
@@ -222,7 +222,7 @@ jobs:
 
       - name: Install Go
         id: setup-go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version: '>=1.24.0-rc.1'
           check-latest: true
@@ -311,7 +311,7 @@ jobs:
 
       # Upgrade together with NDK version
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version: '>=1.25.0-rc.1'
 

.github/workflows/build_publish_docker_image.yml

@@ -92,7 +92,7 @@ jobs:
         # There's no way around this, because "ImageOS" is only available to
         # processes, but the setup-go action uses it in its key.
         id: imageos
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |

Makefile

@@ -100,7 +100,6 @@ compiletest:
 check:	rclone
 	@echo "-- START CODE QUALITY REPORT -------------------------------"
 	@golangci-lint run $(LINTTAGS) ./...
-	@bin/markdown-lint
 	@echo "-- END CODE QUALITY REPORT ---------------------------------"
 
 # Get the build dependencies
@@ -145,11 +144,9 @@ MANUAL.txt:	MANUAL.md
 	pandoc -s --from markdown-smart --to plain MANUAL.md -o MANUAL.txt
 
 commanddocs: rclone
-	go generate ./lib/transform
 	-@rmdir -p '$$HOME/.config/rclone'
 	XDG_CACHE_HOME="" XDG_CONFIG_HOME="" HOME="\$$HOME" USER="\$$USER" rclone gendocs --config=/notfound docs/content/
 	@[ ! -e '$$HOME' ] || (echo 'Error: created unwanted directory named $$HOME' && exit 1)
-	go run bin/make_bisync_docs.go ./docs/content/
 
 backenddocs: rclone bin/make_backend_docs.py
 	-@rmdir -p '$$HOME/.config/rclone'

README.md

@@ -59,7 +59,6 @@ directories to and from different cloud storage providers.
 - Internet Archive [:page_facing_up:](https://rclone.org/internetarchive/)
 - Jottacloud [:page_facing_up:](https://rclone.org/jottacloud/)
 - IBM COS S3 [:page_facing_up:](https://rclone.org/s3/#ibm-cos-s3)
-- Intercolo Object Storage [:page_facing_up:](https://rclone.org/s3/#intercolo)
 - IONOS Cloud [:page_facing_up:](https://rclone.org/s3/#ionos)
 - Koofr [:page_facing_up:](https://rclone.org/koofr/)
 - Leviia Object Storage [:page_facing_up:](https://rclone.org/s3/#leviia)
@@ -106,7 +105,6 @@ directories to and from different cloud storage providers.
 - Selectel Object Storage [:page_facing_up:](https://rclone.org/s3/#selectel)
 - SFTP [:page_facing_up:](https://rclone.org/sftp/)
 - SMB / CIFS [:page_facing_up:](https://rclone.org/smb/)
-- Spectra Logic [:page_facing_up:](https://rclone.org/s3/#spectralogic)
 - StackPath [:page_facing_up:](https://rclone.org/s3/#stackpath)
 - Storj [:page_facing_up:](https://rclone.org/storj/)
 - SugarSync [:page_facing_up:](https://rclone.org/sugarsync/)

VERSION

@@ -1 +1 @@
-v1.72.0
+v1.71.0

backend/azureblob/azureblob.go

@@ -1338,9 +1338,9 @@ func (f *Fs) containerOK(container string) bool {
 }
 
 // listDir lists a single directory
-func (f *Fs) listDir(ctx context.Context, containerName, directory, prefix string, addContainer bool, callback func(fs.DirEntry) error) (err error) {
+func (f *Fs) listDir(ctx context.Context, containerName, directory, prefix string, addContainer bool) (entries fs.DirEntries, err error) {
 	if !f.containerOK(containerName) {
-		return fs.ErrorDirNotFound
+		return nil, fs.ErrorDirNotFound
 	}
 	err = f.list(ctx, containerName, directory, prefix, addContainer, false, int32(f.opt.ListChunkSize), func(remote string, object *container.BlobItem, isDirectory bool) error {
 		entry, err := f.itemToDirEntry(ctx, remote, object, isDirectory)
@@ -1348,16 +1348,16 @@ func (f *Fs) listDir(ctx context.Context, containerName, directory, prefix strin
 			return err
 		}
 		if entry != nil {
-			return callback(entry)
+			entries = append(entries, entry)
 		}
 		return nil
 	})
 	if err != nil {
-		return err
+		return nil, err
 	}
 	// container must be present if listing succeeded
 	f.cache.MarkOK(containerName)
-	return nil
+	return entries, nil
 }
 
 // listContainers returns all the containers to out
@@ -1393,47 +1393,14 @@ func (f *Fs) listContainers(ctx context.Context) (entries fs.DirEntries, err err
 // This should return ErrDirNotFound if the directory isn't
 // found.
 func (f *Fs) List(ctx context.Context, dir string) (entries fs.DirEntries, err error) {
-	return list.WithListP(ctx, dir, f)
-}
-
-// ListP lists the objects and directories of the Fs starting
-// from dir non recursively into out.
-//
-// dir should be "" to start from the root, and should not
-// have trailing slashes.
-//
-// This should return ErrDirNotFound if the directory isn't
-// found.
-//
-// It should call callback for each tranche of entries read.
-// These need not be returned in any particular order.  If
-// callback returns an error then the listing will stop
-// immediately.
-func (f *Fs) ListP(ctx context.Context, dir string, callback fs.ListRCallback) error {
-	list := list.NewHelper(callback)
 	container, directory := f.split(dir)
 	if container == "" {
 		if directory != "" {
-			return fs.ErrorListBucketRequired
+			return nil, fs.ErrorListBucketRequired
 		}
-		entries, err := f.listContainers(ctx)
-		if err != nil {
-			return err
-		}
-		for _, entry := range entries {
-			err = list.Add(entry)
-			if err != nil {
-				return err
-			}
-		}
-	} else {
-		err := f.listDir(ctx, container, directory, f.rootDirectory, f.rootContainer == "", list.Add)
-		if err != nil {
-			return err
-		}
-
+		return f.listContainers(ctx)
 	}
-	return list.Flush()
+	return f.listDir(ctx, container, directory, f.rootDirectory, f.rootContainer == "")
 }
 
 // ListR lists the objects and directories of the Fs starting
@@ -2152,6 +2119,7 @@ func (o *Object) getMetadata() (metadata map[string]*string) {
 	}
 	metadata = make(map[string]*string, len(o.meta))
 	for k, v := range o.meta {
+		v := v
 		metadata[k] = &v
 	}
 	return metadata
@@ -2797,8 +2765,6 @@ func (o *Object) clearUncommittedBlocks(ctx context.Context) (err error) {
 		blockList    blockblob.GetBlockListResponse
 		properties   *blob.GetPropertiesResponse
 		options      *blockblob.CommitBlockListOptions
-		// Use temporary pacer as this can be called recursively which can cause a deadlock with --max-connections
-		pacer = fs.NewPacer(ctx, pacer.NewS3(pacer.MinSleep(minSleep), pacer.MaxSleep(maxSleep), pacer.DecayConstant(decayConstant)))
 	)
 
 	properties, err = o.readMetaDataAlways(ctx)
@@ -2810,7 +2776,7 @@ func (o *Object) clearUncommittedBlocks(ctx context.Context) (err error) {
 
 	if objectExists {
 		// Get the committed block list
-		err = pacer.Call(func() (bool, error) {
+		err = o.fs.pacer.Call(func() (bool, error) {
 			blockList, err = blockBlobSVC.GetBlockList(ctx, blockblob.BlockListTypeAll, nil)
 			return o.fs.shouldRetry(ctx, err)
 		})
@@ -2852,7 +2818,7 @@ func (o *Object) clearUncommittedBlocks(ctx context.Context) (err error) {
 
 	// Commit only the committed blocks
 	fs.Debugf(o, "Committing %d blocks to remove uncommitted blocks", len(blockIDs))
-	err = pacer.Call(func() (bool, error) {
+	err = o.fs.pacer.Call(func() (bool, error) {
 		_, err := blockBlobSVC.CommitBlockList(ctx, blockIDs, options)
 		return o.fs.shouldRetry(ctx, err)
 	})
@@ -3188,7 +3154,6 @@ var (
 	_ fs.PutStreamer     = &Fs{}
 	_ fs.Purger          = &Fs{}
 	_ fs.ListRer         = &Fs{}
-	_ fs.ListPer         = &Fs{}
 	_ fs.OpenChunkWriter = &Fs{}
 	_ fs.Object          = &Object{}
 	_ fs.MimeTyper       = &Object{}

backend/b2/b2.go

@@ -847,7 +847,7 @@ func (f *Fs) itemToDirEntry(ctx context.Context, remote string, object *api.File
 }
 
 // listDir lists a single directory
-func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addBucket bool, callback func(fs.DirEntry) error) (err error) {
+func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addBucket bool) (entries fs.DirEntries, err error) {
 	last := ""
 	err = f.list(ctx, bucket, directory, prefix, f.rootBucket == "", false, 0, f.opt.Versions, false, func(remote string, object *api.File, isDirectory bool) error {
 		entry, err := f.itemToDirEntry(ctx, remote, object, isDirectory, &last)
@@ -855,16 +855,16 @@ func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addB
 			return err
 		}
 		if entry != nil {
-			return callback(entry)
+			entries = append(entries, entry)
 		}
 		return nil
 	})
 	if err != nil {
-		return err
+		return nil, err
 	}
 	// bucket must be present if listing succeeded
 	f.cache.MarkOK(bucket)
-	return nil
+	return entries, nil
 }
 
 // listBuckets returns all the buckets to out
@@ -890,46 +890,14 @@ func (f *Fs) listBuckets(ctx context.Context) (entries fs.DirEntries, err error)
 // This should return ErrDirNotFound if the directory isn't
 // found.
 func (f *Fs) List(ctx context.Context, dir string) (entries fs.DirEntries, err error) {
-	return list.WithListP(ctx, dir, f)
-}
-
-// ListP lists the objects and directories of the Fs starting
-// from dir non recursively into out.
-//
-// dir should be "" to start from the root, and should not
-// have trailing slashes.
-//
-// This should return ErrDirNotFound if the directory isn't
-// found.
-//
-// It should call callback for each tranche of entries read.
-// These need not be returned in any particular order.  If
-// callback returns an error then the listing will stop
-// immediately.
-func (f *Fs) ListP(ctx context.Context, dir string, callback fs.ListRCallback) error {
-	list := list.NewHelper(callback)
 	bucket, directory := f.split(dir)
 	if bucket == "" {
 		if directory != "" {
-			return fs.ErrorListBucketRequired
-		}
-		entries, err := f.listBuckets(ctx)
-		if err != nil {
-			return err
-		}
-		for _, entry := range entries {
-			err = list.Add(entry)
-			if err != nil {
-				return err
-			}
-		}
-	} else {
-		err := f.listDir(ctx, bucket, directory, f.rootDirectory, f.rootBucket == "", list.Add)
-		if err != nil {
-			return err
+			return nil, fs.ErrorListBucketRequired
 		}
+		return f.listBuckets(ctx)
 	}
-	return list.Flush()
+	return f.listDir(ctx, bucket, directory, f.rootDirectory, f.rootBucket == "")
 }
 
 // ListR lists the objects and directories of the Fs starting
@@ -2460,7 +2428,6 @@ var (
 	_ fs.PutStreamer     = &Fs{}
 	_ fs.CleanUpper      = &Fs{}
 	_ fs.ListRer         = &Fs{}
-	_ fs.ListPer         = &Fs{}
 	_ fs.PublicLinker    = &Fs{}
 	_ fs.OpenChunkWriter = &Fs{}
 	_ fs.Commander       = &Fs{}

backend/box/api/types.go

@@ -125,21 +125,10 @@ type FolderItems struct {
 	Offset     int     `json:"offset"`
 	Limit      int     `json:"limit"`
 	NextMarker *string `json:"next_marker,omitempty"`
-	// There is some confusion about how this is actually
-	// returned. The []struct has worked for many years, but in
-	// https://github.com/rclone/rclone/issues/8776 box was
-	// returning it returned not as a list. We don't actually use
-	// this so comment it out.
-	//
-	// Order struct {
-	// 	By        string `json:"by"`
-	// 	Direction string `json:"direction"`
-	// } `json:"order"`
-	//
-	// Order      []struct {
-	// 	By        string `json:"by"`
-	// 	Direction string `json:"direction"`
-	// } `json:"order"`
+	Order      []struct {
+		By        string `json:"by"`
+		Direction string `json:"direction"`
+	} `json:"order"`
 }
 
 // Parent defined the ID of the parent directory

backend/cache/cache.go

@@ -684,7 +684,7 @@ func (f *Fs) rcFetch(ctx context.Context, in rc.Params) (rc.Params, error) {
 		start, end int64
 	}
 	parseChunks := func(ranges string) (crs []chunkRange, err error) {
-		for part := range strings.SplitSeq(ranges, ",") {
+		for _, part := range strings.Split(ranges, ",") {
 			var start, end int64 = 0, math.MaxInt64
 			switch ints := strings.Split(part, ":"); len(ints) {
 			case 1:

backend/combine/combine.go

@@ -187,6 +187,7 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (outFs fs
 	g, gCtx := errgroup.WithContext(ctx)
 	var mu sync.Mutex
 	for _, upstream := range opt.Upstreams {
+		upstream := upstream
 		g.Go(func() (err error) {
 			equal := strings.IndexRune(upstream, '=')
 			if equal < 0 {
@@ -240,22 +241,18 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (outFs fs
 		DirModTimeUpdatesOnWrite: true,
 		PartialUploads:           true,
 	}).Fill(ctx, f)
-	canMove, slowHash := true, false
+	canMove := true
 	for _, u := range f.upstreams {
 		features = features.Mask(ctx, u.f) // Mask all upstream fs
 		if !operations.CanServerSideMove(u.f) {
 			canMove = false
 		}
-		slowHash = slowHash || u.f.Features().SlowHash
 	}
 	// We can move if all remotes support Move or Copy
 	if canMove {
 		features.Move = f.Move
 	}
 
-	// If any of upstreams are SlowHash, propagate it
-	features.SlowHash = slowHash
-
 	// Enable ListR when upstreams either support ListR or is local
 	// But not when all upstreams are local
 	if features.ListR == nil {
@@ -369,6 +366,7 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (outFs fs
 func (f *Fs) multithread(ctx context.Context, fn func(context.Context, *upstream) error) error {
 	g, gCtx := errgroup.WithContext(ctx)
 	for _, u := range f.upstreams {
+		u := u
 		g.Go(func() (err error) {
 			return fn(gCtx, u)
 		})
@@ -635,6 +633,7 @@ func (f *Fs) ChangeNotify(ctx context.Context, notifyFunc func(string, fs.EntryT
 	var uChans []chan time.Duration
 
 	for _, u := range f.upstreams {
+		u := u
 		if do := u.f.Features().ChangeNotify; do != nil {
 			ch := make(chan time.Duration)
 			uChans = append(uChans, ch)

backend/doi/doi.go

@@ -598,7 +598,7 @@ It doesn't return anything.
 // The result should be capable of being JSON encoded
 // If it is a string or a []string it will be shown to the user
 // otherwise it will be JSON encoded and shown to the user like that
-func (f *Fs) Command(ctx context.Context, name string, arg []string, opt map[string]string) (out any, err error) {
+func (f *Fs) Command(ctx context.Context, name string, arg []string, opt map[string]string) (out interface{}, err error) {
 	switch name {
 	case "metadata":
 		return f.ShowMetadata(ctx)
@@ -625,7 +625,7 @@ func (f *Fs) Command(ctx context.Context, name string, arg []string, opt map[str
 }
 
 // ShowMetadata returns some metadata about the corresponding DOI
-func (f *Fs) ShowMetadata(ctx context.Context) (metadata any, err error) {
+func (f *Fs) ShowMetadata(ctx context.Context) (metadata interface{}, err error) {
 	doiURL, err := url.Parse("https://doi.org/" + f.opt.Doi)
 	if err != nil {
 		return nil, err

backend/doi/link_header.go

@@ -18,7 +18,7 @@ type headerLink struct {
 }
 
 func parseLinkHeader(header string) (links []headerLink) {
-	for link := range strings.SplitSeq(header, ",") {
+	for _, link := range strings.Split(header, ",") {
 		link = strings.TrimSpace(link)
 		parsed := parseLink(link)
 		if parsed != nil {
@@ -30,7 +30,7 @@ func parseLinkHeader(header string) (links []headerLink) {
 
 func parseLink(link string) (parsedLink *headerLink) {
 	var parts []string
-	for part := range strings.SplitSeq(link, ";") {
+	for _, part := range strings.Split(link, ";") {
 		parts = append(parts, strings.TrimSpace(part))
 	}
 

backend/drive/drive.go

@@ -191,7 +191,7 @@ func driveScopes(scopesString string) (scopes []string) {
 	if scopesString == "" {
 		scopesString = defaultScope
 	}
-	for scope := range strings.SplitSeq(scopesString, ",") {
+	for _, scope := range strings.Split(scopesString, ",") {
 		scope = strings.TrimSpace(scope)
 		scopes = append(scopes, scopePrefix+scope)
 	}
@@ -1220,7 +1220,7 @@ func isLinkMimeType(mimeType string) bool {
 // into a list of unique extensions with leading "." and a list of associated MIME types
 func parseExtensions(extensionsIn ...string) (extensions, mimeTypes []string, err error) {
 	for _, extensionText := range extensionsIn {
-		for extension := range strings.SplitSeq(extensionText, ",") {
+		for _, extension := range strings.Split(extensionText, ",") {
 			extension = strings.ToLower(strings.TrimSpace(extension))
 			if extension == "" {
 				continue

backend/drive/metadata.go

@@ -386,6 +386,7 @@ func (o *baseObject) parseMetadata(ctx context.Context, info *drive.File) (err e
 			g.SetLimit(o.fs.ci.Checkers)
 			var mu sync.Mutex // protect the info.Permissions from concurrent writes
 			for _, permissionID := range info.PermissionIds {
+				permissionID := permissionID
 				g.Go(func() error {
 					// must fetch the team drive ones individually to check the inherited flag
 					perm, inherited, err := o.fs.getPermission(gCtx, actualID(info.Id), permissionID, !o.fs.isTeamDrive)
@@ -519,6 +520,7 @@ func (f *Fs) updateMetadata(ctx context.Context, updateInfo *drive.File, meta fs
 	}
 	// merge metadata into request and user metadata
 	for k, v := range meta {
+		k, v := k, v
 		// parse a boolean from v and write into out
 		parseBool := func(out *bool) error {
 			b, err := strconv.ParseBool(v)

backend/filelu/api/types.go

@@ -8,7 +8,7 @@ type CreateFolderResponse struct {
 	Status int    `json:"status"`
 	Msg    string `json:"msg"`
 	Result struct {
-		FldID any `json:"fld_id"`
+		FldID interface{} `json:"fld_id"`
 	} `json:"result"`
 }
 

backend/googlecloudstorage/googlecloudstorage.go

@@ -760,7 +760,7 @@ func (f *Fs) itemToDirEntry(ctx context.Context, remote string, object *storage.
 }
 
 // listDir lists a single directory
-func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addBucket bool, callback func(fs.DirEntry) error) (err error) {
+func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addBucket bool) (entries fs.DirEntries, err error) {
 	// List the objects
 	err = f.list(ctx, bucket, directory, prefix, addBucket, false, func(remote string, object *storage.Object, isDirectory bool) error {
 		entry, err := f.itemToDirEntry(ctx, remote, object, isDirectory)
@@ -768,16 +768,16 @@ func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addB
 			return err
 		}
 		if entry != nil {
-			return callback(entry)
+			entries = append(entries, entry)
 		}
 		return nil
 	})
 	if err != nil {
-		return err
+		return nil, err
 	}
 	// bucket must be present if listing succeeded
 	f.cache.MarkOK(bucket)
-	return err
+	return entries, err
 }
 
 // listBuckets lists the buckets
@@ -820,46 +820,14 @@ func (f *Fs) listBuckets(ctx context.Context) (entries fs.DirEntries, err error)
 // This should return ErrDirNotFound if the directory isn't
 // found.
 func (f *Fs) List(ctx context.Context, dir string) (entries fs.DirEntries, err error) {
-	return list.WithListP(ctx, dir, f)
-}
-
-// ListP lists the objects and directories of the Fs starting
-// from dir non recursively into out.
-//
-// dir should be "" to start from the root, and should not
-// have trailing slashes.
-//
-// This should return ErrDirNotFound if the directory isn't
-// found.
-//
-// It should call callback for each tranche of entries read.
-// These need not be returned in any particular order.  If
-// callback returns an error then the listing will stop
-// immediately.
-func (f *Fs) ListP(ctx context.Context, dir string, callback fs.ListRCallback) error {
-	list := list.NewHelper(callback)
 	bucket, directory := f.split(dir)
 	if bucket == "" {
 		if directory != "" {
-			return fs.ErrorListBucketRequired
-		}
-		entries, err := f.listBuckets(ctx)
-		if err != nil {
-			return err
-		}
-		for _, entry := range entries {
-			err = list.Add(entry)
-			if err != nil {
-				return err
-			}
-		}
-	} else {
-		err := f.listDir(ctx, bucket, directory, f.rootDirectory, f.rootBucket == "", list.Add)
-		if err != nil {
-			return err
+			return nil, fs.ErrorListBucketRequired
 		}
+		return f.listBuckets(ctx)
 	}
-	return list.Flush()
+	return f.listDir(ctx, bucket, directory, f.rootDirectory, f.rootBucket == "")
 }
 
 // ListR lists the objects and directories of the Fs starting
@@ -1494,7 +1462,6 @@ var (
 	_ fs.Copier      = &Fs{}
 	_ fs.PutStreamer = &Fs{}
 	_ fs.ListRer     = &Fs{}
-	_ fs.ListPer     = &Fs{}
 	_ fs.Object      = &Object{}
 	_ fs.MimeTyper   = &Object{}
 )

backend/internetarchive/internetarchive.go

@@ -590,7 +590,7 @@ func (f *Fs) PublicLink(ctx context.Context, remote string, expire fs.Duration,
 		return "", err
 	}
 	bucket, bucketPath := f.split(remote)
-	return path.Join(f.opt.FrontEndpoint, "/download/", bucket, rest.URLPathEscapeAll(bucketPath)), nil
+	return path.Join(f.opt.FrontEndpoint, "/download/", bucket, quotePath(bucketPath)), nil
 }
 
 // Copy src to this remote using server-side copy operations.
@@ -622,7 +622,7 @@ func (f *Fs) Copy(ctx context.Context, src fs.Object, remote string) (_ fs.Objec
 		"x-archive-auto-make-bucket": "1",
 		"x-archive-queue-derive":     "0",
 		"x-archive-keep-old-version": "0",
-		"x-amz-copy-source":          rest.URLPathEscapeAll(path.Join("/", srcBucket, srcPath)),
+		"x-amz-copy-source":          quotePath(path.Join("/", srcBucket, srcPath)),
 		"x-amz-metadata-directive":   "COPY",
 		"x-archive-filemeta-sha1":    srcObj.sha1,
 		"x-archive-filemeta-md5":     srcObj.md5,
@@ -778,7 +778,7 @@ func (o *Object) Open(ctx context.Context, options ...fs.OpenOption) (in io.Read
 	// make a GET request to (frontend)/download/:item/:path
 	opts := rest.Opts{
 		Method:  "GET",
-		Path:    path.Join("/download/", o.fs.root, rest.URLPathEscapeAll(o.fs.opt.Enc.FromStandardPath(o.remote))),
+		Path:    path.Join("/download/", o.fs.root, quotePath(o.fs.opt.Enc.FromStandardPath(o.remote))),
 		Options: optionsFixed,
 	}
 	err = o.fs.pacer.Call(func() (bool, error) {
@@ -1334,6 +1334,16 @@ func trimPathPrefix(s, prefix string, enc encoder.MultiEncoder) string {
 	return enc.ToStandardPath(strings.TrimPrefix(s, prefix+"/"))
 }
 
+// mimics urllib.parse.quote() on Python; exclude / from url.PathEscape
+func quotePath(s string) string {
+	seg := strings.Split(s, "/")
+	newValues := []string{}
+	for _, v := range seg {
+		newValues = append(newValues, url.QueryEscape(v))
+	}
+	return strings.Join(newValues, "/")
+}
+
 var (
 	_ fs.Fs           = &Fs{}
 	_ fs.Copier       = &Fs{}

backend/local/local.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	iofs "io/fs"
 	"os"
 	"path"
 	"path/filepath"
@@ -842,13 +841,7 @@ func (f *Fs) Rmdir(ctx context.Context, dir string) error {
 	} else if !fi.IsDir() {
 		return fs.ErrorIsFile
 	}
-	err := os.Remove(localPath)
-	if runtime.GOOS == "windows" && errors.Is(err, iofs.ErrPermission) { // https://github.com/golang/go/issues/26295
-		if os.Chmod(localPath, 0o600) == nil {
-			err = os.Remove(localPath)
-		}
-	}
-	return err
+	return os.Remove(localPath)
 }
 
 // Precision of the file system

backend/local/local_internal_test.go

@@ -334,7 +334,7 @@ func TestMetadata(t *testing.T) {
 
 func testMetadata(t *testing.T, r *fstest.Run, o *Object, when time.Time) {
 	ctx := context.Background()
-	whenRFC := when.Local().Format(time.RFC3339Nano)
+	whenRFC := when.Format(time.RFC3339Nano)
 	const dayLength = len("2001-01-01")
 
 	f := r.Flocal.(*Fs)

backend/local/local_internal_windows_test.go

@@ -1,40 +0,0 @@
-//go:build windows
-
-package local
-
-import (
-	"context"
-	"path/filepath"
-	"runtime"
-	"syscall"
-	"testing"
-
-	"github.com/rclone/rclone/fs/operations"
-	"github.com/rclone/rclone/fstest"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestRmdirWindows tests that FILE_ATTRIBUTE_READONLY does not block Rmdir on windows.
-// Microsoft docs indicate that "This attribute is not honored on directories."
-// See https://learn.microsoft.com/en-us/windows/win32/fileio/file-attribute-constants#file_attribute_readonly
-// and https://github.com/golang/go/issues/26295
-func TestRmdirWindows(t *testing.T) {
-	if runtime.GOOS != "windows" {
-		t.Skipf("windows only")
-	}
-	r := fstest.NewRun(t)
-	defer r.Finalise()
-
-	err := operations.Mkdir(context.Background(), r.Flocal, "testdir")
-	require.NoError(t, err)
-
-	ptr, err := syscall.UTF16PtrFromString(filepath.Join(r.Flocal.Root(), "testdir"))
-	require.NoError(t, err)
-
-	err = syscall.SetFileAttributes(ptr, uint32(syscall.FILE_ATTRIBUTE_DIRECTORY+syscall.FILE_ATTRIBUTE_READONLY))
-	require.NoError(t, err)
-
-	err = operations.Rmdir(context.Background(), r.Flocal, "testdir")
-	assert.NoError(t, err)
-}

backend/mailru/mailru.go

@@ -400,7 +400,7 @@ type quirks struct {
 }
 
 func (q *quirks) parseQuirks(option string) {
-	for flag := range strings.SplitSeq(option, ",") {
+	for _, flag := range strings.Split(option, ",") {
 		switch strings.ToLower(strings.TrimSpace(flag)) {
 		case "binlist":
 			// The official client sometimes uses a so called "bin" protocol,
@@ -1770,7 +1770,7 @@ func (f *Fs) parseSpeedupPatterns(patternString string) (err error) {
 	f.speedupAny = false
 	uniqueValidPatterns := make(map[string]any)
 
-	for pattern := range strings.SplitSeq(patternString, ",") {
+	for _, pattern := range strings.Split(patternString, ",") {
 		pattern = strings.ToLower(strings.TrimSpace(pattern))
 		if pattern == "" {
 			continue

backend/memory/memory.go

@@ -325,12 +325,13 @@ func (f *Fs) list(ctx context.Context, bucket, directory, prefix string, addBuck
 }
 
 // listDir lists the bucket to the entries
-func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addBucket bool, callback func(fs.DirEntry) error) (err error) {
+func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addBucket bool) (entries fs.DirEntries, err error) {
 	// List the objects and directories
 	err = f.list(ctx, bucket, directory, prefix, addBucket, false, func(remote string, entry fs.DirEntry, isDirectory bool) error {
-		return callback(entry)
+		entries = append(entries, entry)
+		return nil
 	})
-	return err
+	return entries, err
 }
 
 // listBuckets lists the buckets to entries
@@ -353,46 +354,15 @@ func (f *Fs) listBuckets(ctx context.Context) (entries fs.DirEntries, err error)
 // This should return ErrDirNotFound if the directory isn't
 // found.
 func (f *Fs) List(ctx context.Context, dir string) (entries fs.DirEntries, err error) {
-	return list.WithListP(ctx, dir, f)
-}
-
-// ListP lists the objects and directories of the Fs starting
-// from dir non recursively into out.
-//
-// dir should be "" to start from the root, and should not
-// have trailing slashes.
-//
-// This should return ErrDirNotFound if the directory isn't
-// found.
-//
-// It should call callback for each tranche of entries read.
-// These need not be returned in any particular order.  If
-// callback returns an error then the listing will stop
-// immediately.
-func (f *Fs) ListP(ctx context.Context, dir string, callback fs.ListRCallback) error {
-	list := list.NewHelper(callback)
+	// defer fslog.Trace(dir, "")("entries = %q, err = %v", &entries, &err)
 	bucket, directory := f.split(dir)
 	if bucket == "" {
 		if directory != "" {
-			return fs.ErrorListBucketRequired
-		}
-		entries, err := f.listBuckets(ctx)
-		if err != nil {
-			return err
-		}
-		for _, entry := range entries {
-			err = list.Add(entry)
-			if err != nil {
-				return err
-			}
-		}
-	} else {
-		err := f.listDir(ctx, bucket, directory, f.rootDirectory, f.rootBucket == "", list.Add)
-		if err != nil {
-			return err
+			return nil, fs.ErrorListBucketRequired
 		}
+		return f.listBuckets(ctx)
 	}
-	return list.Flush()
+	return f.listDir(ctx, bucket, directory, f.rootDirectory, f.rootBucket == "")
 }
 
 // ListR lists the objects and directories of the Fs starting
@@ -659,7 +629,6 @@ var (
 	_ fs.Copier      = &Fs{}
 	_ fs.PutStreamer = &Fs{}
 	_ fs.ListRer     = &Fs{}
-	_ fs.ListPer     = &Fs{}
 	_ fs.Object      = &Object{}
 	_ fs.MimeTyper   = &Object{}
 )

backend/onedrive/metadata.go

@@ -243,6 +243,7 @@ func (m *Metadata) Get(ctx context.Context) (metadata fs.Metadata, err error) {
 func (m *Metadata) Set(ctx context.Context, metadata fs.Metadata) (numSet int, err error) {
 	numSet = 0
 	for k, v := range metadata {
+		k, v := k, v
 		switch k {
 		case "mtime":
 			t, err := time.Parse(timeFormatIn, v)
@@ -421,7 +422,12 @@ func (m *Metadata) orderPermissions(xs []*api.PermissionsType) {
 		if hasUserIdentity(p.GetGrantedTo(m.fs.driveType)) {
 			return true
 		}
-		return slices.ContainsFunc(p.GetGrantedToIdentities(m.fs.driveType), hasUserIdentity)
+		for _, identity := range p.GetGrantedToIdentities(m.fs.driveType) {
+			if hasUserIdentity(identity) {
+				return true
+			}
+		}
+		return false
 	}
 	// Put Permissions with a user first, leaving unsorted otherwise
 	slices.SortStableFunc(xs, func(a, b *api.PermissionsType) int {

backend/onedrive/quickxorhash/quickxorhash_test.go

@@ -172,8 +172,8 @@ func BenchmarkQuickXorHash(b *testing.B) {
 	require.NoError(b, err)
 	require.Equal(b, len(buf), n)
 	h := New()
-
-	for b.Loop() {
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
 		h.Reset()
 		h.Write(buf)
 		h.Sum(nil)

backend/oracleobjectstorage/oracleobjectstorage.go

@@ -254,47 +254,15 @@ func (f *Fs) split(rootRelativePath string) (bucketName, bucketPath string) {
 // This should return ErrDirNotFound if the directory isn't
 // found.
 func (f *Fs) List(ctx context.Context, dir string) (entries fs.DirEntries, err error) {
-	return list.WithListP(ctx, dir, f)
-}
-
-// ListP lists the objects and directories of the Fs starting
-// from dir non recursively into out.
-//
-// dir should be "" to start from the root, and should not
-// have trailing slashes.
-//
-// This should return ErrDirNotFound if the directory isn't
-// found.
-//
-// It should call callback for each tranche of entries read.
-// These need not be returned in any particular order.  If
-// callback returns an error then the listing will stop
-// immediately.
-func (f *Fs) ListP(ctx context.Context, dir string, callback fs.ListRCallback) error {
-	list := list.NewHelper(callback)
 	bucketName, directory := f.split(dir)
 	fs.Debugf(f, "listing: bucket : %v, directory: %v", bucketName, dir)
 	if bucketName == "" {
 		if directory != "" {
-			return fs.ErrorListBucketRequired
-		}
-		entries, err := f.listBuckets(ctx)
-		if err != nil {
-			return err
-		}
-		for _, entry := range entries {
-			err = list.Add(entry)
-			if err != nil {
-				return err
-			}
-		}
-	} else {
-		err := f.listDir(ctx, bucketName, directory, f.rootDirectory, f.rootBucket == "", list.Add)
-		if err != nil {
-			return err
+			return nil, fs.ErrorListBucketRequired
 		}
+		return f.listBuckets(ctx)
 	}
-	return list.Flush()
+	return f.listDir(ctx, bucketName, directory, f.rootDirectory, f.rootBucket == "")
 }
 
 // listFn is called from list to handle an object.
@@ -443,24 +411,24 @@ func (f *Fs) itemToDirEntry(ctx context.Context, remote string, object *objectst
 }
 
 // listDir lists a single directory
-func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addBucket bool, callback func(fs.DirEntry) error) (err error) {
+func (f *Fs) listDir(ctx context.Context, bucket, directory, prefix string, addBucket bool) (entries fs.DirEntries, err error) {
 	fn := func(remote string, object *objectstorage.ObjectSummary, isDirectory bool) error {
 		entry, err := f.itemToDirEntry(ctx, remote, object, isDirectory)
 		if err != nil {
 			return err
 		}
 		if entry != nil {
-			return callback(entry)
+			entries = append(entries, entry)
 		}
 		return nil
 	}
 	err = f.list(ctx, bucket, directory, prefix, addBucket, false, 0, fn)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	// bucket must be present if listing succeeded
 	f.cache.MarkOK(bucket)
-	return nil
+	return entries, nil
 }
 
 // listBuckets returns all the buckets to out
@@ -797,7 +765,6 @@ var (
 	_ fs.Copier          = &Fs{}
 	_ fs.PutStreamer     = &Fs{}
 	_ fs.ListRer         = &Fs{}
-	_ fs.ListPer         = &Fs{}
 	_ fs.Commander       = &Fs{}
 	_ fs.CleanUpper      = &Fs{}
 	_ fs.OpenChunkWriter = &Fs{}

backend/quatrix/upload_memory.go

@@ -59,7 +59,11 @@ func (u *UploadMemoryManager) Consume(fileID string, neededMemory int64, speed f
 
 	defer func() { u.fileUsage[fileID] = borrowed }()
 
-	effectiveChunkSize := min(neededMemory, max(int64(speed*u.effectiveTime.Seconds()), u.reserved))
+	effectiveChunkSize := max(int64(speed*u.effectiveTime.Seconds()), u.reserved)
+
+	if neededMemory < effectiveChunkSize {
+		effectiveChunkSize = neededMemory
+	}
 
 	if effectiveChunkSize <= u.reserved {
 		return effectiveChunkSize

backend/s3/s3.go

@@ -119,9 +119,6 @@ var providerOption = fs.Option{
 	}, {
 		Value: "IDrive",
 		Help:  "IDrive e2",
-	}, {
-		Value: "Intercolo",
-		Help:  "Intercolo Object Storage",
 	}, {
 		Value: "IONOS",
 		Help:  "IONOS Cloud",
@@ -173,9 +170,6 @@ var providerOption = fs.Option{
 	}, {
 		Value: "Selectel",
 		Help:  "Selectel Object Storage",
-	}, {
-		Value: "SpectraLogic",
-		Help:  "Spectra Logic Black Pearl",
 	}, {
 		Value: "StackPath",
 		Help:  "StackPath Object Storage",
@@ -510,14 +504,6 @@ func init() {
 				Value: "us-east-1",
 				Help:  "Indore, Madhya Pradesh, India",
 			}},
-		}, {
-			Name:     "region",
-			Help:     "Region where your bucket will be created and your data stored.\n",
-			Provider: "Intercolo",
-			Examples: []fs.OptionExample{{
-				Value: "de-fra",
-				Help:  "Frankfurt, Germany",
-			}},
 		}, {
 			Name:     "region",
 			Help:     "Region where your bucket will be created and your data stored.\n",
@@ -657,7 +643,7 @@ func init() {
 		}, {
 			Name:     "region",
 			Help:     "Region to connect to.\n\nLeave blank if you are using an S3 clone and you don't have a region.",
-			Provider: "!AWS,Alibaba,ArvanCloud,ChinaMobile,Cloudflare,FlashBlade,Intercolo,IONOS,Petabox,Liara,Linode,Magalu,OVHcloud,Qiniu,RackCorp,Scaleway,Selectel,SpectraLogic,Storj,Synology,TencentCOS,HuaweiOBS,IDrive,Mega,Zata",
+			Provider: "!AWS,Alibaba,ArvanCloud,ChinaMobile,Cloudflare,FlashBlade,IONOS,Petabox,Liara,Linode,Magalu,OVHcloud,Qiniu,RackCorp,Scaleway,Selectel,Storj,Synology,TencentCOS,HuaweiOBS,IDrive,Mega,Zata",
 			Examples: []fs.OptionExample{{
 				Value: "",
 				Help:  "Use this if unsure.\nWill use v4 signatures and an empty region.",
@@ -968,14 +954,6 @@ func init() {
 				Value: "s3.private.sng01.cloud-object-storage.appdomain.cloud",
 				Help:  "Singapore Single Site Private Endpoint",
 			}},
-		}, {
-			Name:     "endpoint",
-			Help:     "Endpoint for Intercolo Object Storage.",
-			Provider: "Intercolo",
-			Examples: []fs.OptionExample{{
-				Value: "de-fra.i3storage.com",
-				Help:  "Frankfurt, Germany",
-			}},
 		}, {
 			Name:     "endpoint",
 			Help:     "Endpoint for IONOS S3 Object Storage.\n\nSpecify the endpoint from the same region.",
@@ -1554,7 +1532,7 @@ func init() {
 		}, {
 			Name:     "endpoint",
 			Help:     "Endpoint for S3 API.\n\nRequired when using an S3 clone.",
-			Provider: "!AWS,ArvanCloud,IBMCOS,IDrive,Intercolo,IONOS,TencentCOS,HuaweiOBS,Alibaba,ChinaMobile,GCS,Liara,Linode,LyveCloud,Magalu,OVHcloud,Scaleway,Selectel,StackPath,Storj,Synology,RackCorp,Qiniu,Petabox,Zata",
+			Provider: "!AWS,ArvanCloud,IBMCOS,IDrive,IONOS,TencentCOS,HuaweiOBS,Alibaba,ChinaMobile,GCS,Liara,Linode,LyveCloud,Magalu,OVHcloud,Scaleway,Selectel,StackPath,Storj,Synology,RackCorp,Qiniu,Petabox,Zata",
 			Examples: []fs.OptionExample{{
 				Value:    "objects-us-east-1.dream.io",
 				Help:     "Dream Objects endpoint",
@@ -2089,7 +2067,7 @@ func init() {
 		}, {
 			Name:     "location_constraint",
 			Help:     "Location constraint - must be set to match the Region.\n\nLeave blank if not sure. Used when creating buckets only.",
-			Provider: "!AWS,Alibaba,ArvanCloud,HuaweiOBS,ChinaMobile,Cloudflare,FlashBlade,IBMCOS,IDrive,Intercolo,IONOS,Leviia,Liara,Linode,Magalu,Outscale,OVHcloud,Qiniu,RackCorp,Scaleway,Selectel,SpectraLogic,StackPath,Storj,TencentCOS,Petabox,Mega",
+			Provider: "!AWS,Alibaba,ArvanCloud,HuaweiOBS,ChinaMobile,Cloudflare,FlashBlade,IBMCOS,IDrive,IONOS,Leviia,Liara,Linode,Magalu,Outscale,OVHcloud,Qiniu,RackCorp,Scaleway,Selectel,StackPath,Storj,TencentCOS,Petabox,Mega",
 		}, {
 			Name: "acl",
 			Help: `Canned ACL used when creating buckets and storing or copying objects.
@@ -2104,7 +2082,7 @@ doesn't copy the ACL from the source but rather writes a fresh one.
 If the acl is an empty string then no X-Amz-Acl: header is added and
 the default (private) will be used.
 `,
-			Provider: "!Storj,Selectel,SpectraLogic,Synology,Cloudflare,FlashBlade,Mega",
+			Provider: "!Storj,Selectel,Synology,Cloudflare,FlashBlade,Mega",
 			Examples: []fs.OptionExample{{
 				Value:    "default",
 				Help:     "Owner gets Full_CONTROL.\nNo one else has access rights (default).",
@@ -2162,7 +2140,7 @@ isn't set then "acl" is used instead.
 If the "acl" and "bucket_acl" are empty strings then no X-Amz-Acl:
 header is added and the default (private) will be used.
 `,
-			Provider: "!Storj,Selectel,SpectraLogic,Synology,Cloudflare,FlashBlade",
+			Provider: "!Storj,Selectel,Synology,Cloudflare,FlashBlade",
 			Advanced: true,
 			Examples: []fs.OptionExample{{
 				Value: "private",
@@ -3699,9 +3677,6 @@ func setQuirks(opt *Options) {
 	case "IDrive":
 		virtualHostStyle = false
 		useAlreadyExists = false // untested
-	case "Intercolo":
-		// no quirks
-		useUnsignedPayload = false // Intercolo has trailer support
 	case "IONOS":
 		// listObjectsV2 supported - https://api.ionos.com/docs/s3/#Basic-Operations-get-Bucket-list-type-2
 		virtualHostStyle = false
@@ -3774,8 +3749,6 @@ func setQuirks(opt *Options) {
 		urlEncodeListings = false
 		useMultipartEtag = false // untested
 		useAlreadyExists = false // untested
-	case "SpectraLogic":
-		virtualHostStyle = false // path-style required
 	case "StackPath":
 		listObjectsV2 = false // untested
 		virtualHostStyle = false
@@ -6247,8 +6220,8 @@ func (o *Object) downloadFromURL(ctx context.Context, bucketPath string, options
 	metaData := make(map[string]string)
 	for key, value := range resp.Header {
 		key = strings.ToLower(key)
-		if after, ok := strings.CutPrefix(key, "x-amz-meta-"); ok {
-			metaKey := after
+		if strings.HasPrefix(key, "x-amz-meta-") {
+			metaKey := strings.TrimPrefix(key, "x-amz-meta-")
 			metaData[metaKey] = value[0]
 		}
 	}

backend/smb/filepool_test.go

@@ -200,7 +200,7 @@ func TestFilePool_ConcurrentAccess(t *testing.T) {
 	pool := newFilePool(ctx, fs, "testshare", "/test/path")
 
 	const numGoroutines = 10
-	for range numGoroutines {
+	for i := 0; i < numGoroutines; i++ {
 		mockFile := newMockFile()
 		pool.pool = append(pool.pool, mockFile)
 	}
@@ -208,7 +208,7 @@ func TestFilePool_ConcurrentAccess(t *testing.T) {
 	// Test concurrent get operations
 	done := make(chan bool, numGoroutines)
 
-	for range numGoroutines {
+	for i := 0; i < numGoroutines; i++ {
 		go func() {
 			defer func() { done <- true }()
 
@@ -219,7 +219,7 @@ func TestFilePool_ConcurrentAccess(t *testing.T) {
 		}()
 	}
 
-	for range numGoroutines {
+	for i := 0; i < numGoroutines; i++ {
 		<-done
 	}
 

backend/swift/swift.go

@@ -773,20 +773,21 @@ func (f *Fs) list(ctx context.Context, container, directory, prefix string, addC
 }
 
 // listDir lists a single directory
-func (f *Fs) listDir(ctx context.Context, container, directory, prefix string, addContainer bool, callback func(fs.DirEntry) error) (err error) {
+func (f *Fs) listDir(ctx context.Context, container, directory, prefix string, addContainer bool) (entries fs.DirEntries, err error) {
 	if container == "" {
-		return fs.ErrorListBucketRequired
+		return nil, fs.ErrorListBucketRequired
 	}
 	// List the objects
 	err = f.list(ctx, container, directory, prefix, addContainer, false, false, func(entry fs.DirEntry) error {
-		return callback(entry)
+		entries = append(entries, entry)
+		return nil
 	})
 	if err != nil {
-		return err
+		return nil, err
 	}
 	// container must be present if listing succeeded
 	f.cache.MarkOK(container)
-	return nil
+	return entries, nil
 }
 
 // listContainers lists the containers
@@ -817,46 +818,14 @@ func (f *Fs) listContainers(ctx context.Context) (entries fs.DirEntries, err err
 // This should return ErrDirNotFound if the directory isn't
 // found.
 func (f *Fs) List(ctx context.Context, dir string) (entries fs.DirEntries, err error) {
-	return list.WithListP(ctx, dir, f)
-}
-
-// ListP lists the objects and directories of the Fs starting
-// from dir non recursively into out.
-//
-// dir should be "" to start from the root, and should not
-// have trailing slashes.
-//
-// This should return ErrDirNotFound if the directory isn't
-// found.
-//
-// It should call callback for each tranche of entries read.
-// These need not be returned in any particular order.  If
-// callback returns an error then the listing will stop
-// immediately.
-func (f *Fs) ListP(ctx context.Context, dir string, callback fs.ListRCallback) error {
-	list := list.NewHelper(callback)
 	container, directory := f.split(dir)
 	if container == "" {
 		if directory != "" {
-			return fs.ErrorListBucketRequired
-		}
-		entries, err := f.listContainers(ctx)
-		if err != nil {
-			return err
-		}
-		for _, entry := range entries {
-			err = list.Add(entry)
-			if err != nil {
-				return err
-			}
-		}
-	} else {
-		err := f.listDir(ctx, container, directory, f.rootDirectory, f.rootContainer == "", list.Add)
-		if err != nil {
-			return err
+			return nil, fs.ErrorListBucketRequired
 		}
+		return f.listContainers(ctx)
 	}
-	return list.Flush()
+	return f.listDir(ctx, container, directory, f.rootDirectory, f.rootContainer == "")
 }
 
 // ListR lists the objects and directories of the Fs starting
@@ -1681,7 +1650,6 @@ var (
 	_ fs.PutStreamer = &Fs{}
 	_ fs.Copier      = &Fs{}
 	_ fs.ListRer     = &Fs{}
-	_ fs.ListPer     = &Fs{}
 	_ fs.Object      = &Object{}
 	_ fs.MimeTyper   = &Object{}
 )

backend/union/policy/epff.go

@@ -21,6 +21,7 @@ func (p *EpFF) epff(ctx context.Context, upstreams []*upstream.Fs, filePath stri
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 	for _, u := range upstreams {
+		u := u // Closure
 		go func() {
 			rfs := u.RootFs
 			remote := path.Join(u.RootPath, filePath)

backend/webdav/api/types.go

@@ -123,7 +123,7 @@ func (p *Prop) Hashes() (hashes map[hash.Type]string) {
 		hashes = make(map[hash.Type]string)
 		for _, checksums := range p.Checksums {
 			checksums = strings.ToLower(checksums)
-			for checksum := range strings.SplitSeq(checksums, " ") {
+			for _, checksum := range strings.Split(checksums, " ") {
 				switch {
 				case strings.HasPrefix(checksum, "sha1:"):
 					hashes[hash.SHA1] = checksum[5:]

bin/make_bisync_docs.go

@@ -1,159 +0,0 @@
-//go:build ignore
-
-package main
-
-import (
-	"bytes"
-	"cmp"
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"os"
-	"path/filepath"
-	"slices"
-	"strings"
-
-	"github.com/rclone/rclone/fs"
-	"github.com/rclone/rclone/fs/operations"
-	"github.com/rclone/rclone/fstest/runs"
-	"github.com/stretchr/testify/assert/yaml"
-)
-
-var path = flag.String("path", "./docs/content/", "root path")
-
-const (
-	configFile              = "fstest/test_all/config.yaml"
-	startListIgnores        = "<!--- start list_ignores - DO NOT EDIT THIS SECTION - use make commanddocs --->"
-	endListIgnores          = "<!--- end list_ignores - DO NOT EDIT THIS SECTION - use make commanddocs --->"
-	startListFailures       = "<!--- start list_failures - DO NOT EDIT THIS SECTION - use make commanddocs --->"
-	endListFailures         = "<!--- end list_failures - DO NOT EDIT THIS SECTION - use make commanddocs --->"
-	integrationTestsJSONURL = "https://pub.rclone.org/integration-tests/current/index.json"
-	integrationTestsHTMLURL = "https://pub.rclone.org/integration-tests/current/"
-)
-
-func main() {
-	err := replaceBetween(*path, startListIgnores, endListIgnores, getIgnores)
-	if err != nil {
-		fs.Errorf(*path, "error replacing ignores: %v", err)
-	}
-	err = replaceBetween(*path, startListFailures, endListFailures, getFailures)
-	if err != nil {
-		fs.Errorf(*path, "error replacing failures: %v", err)
-	}
-}
-
-// replaceBetween replaces the text between startSep and endSep with fn()
-func replaceBetween(path, startSep, endSep string, fn func() (string, error)) error {
-	b, err := os.ReadFile(filepath.Join(path, "bisync.md"))
-	if err != nil {
-		return err
-	}
-	doc := string(b)
-
-	before, after, found := strings.Cut(doc, startSep)
-	if !found {
-		return fmt.Errorf("could not find: %v", startSep)
-	}
-	_, after, found = strings.Cut(after, endSep)
-	if !found {
-		return fmt.Errorf("could not find: %v", endSep)
-	}
-
-	replaceSection, err := fn()
-	if err != nil {
-		return err
-	}
-
-	newDoc := before + startSep + "\n" + strings.TrimSpace(replaceSection) + "\n" + endSep + after
-
-	err = os.WriteFile(filepath.Join(path, "bisync.md"), []byte(newDoc), 0777)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// getIgnores updates the list of ignores from config.yaml
-func getIgnores() (string, error) {
-	config, err := parseConfig()
-	if err != nil {
-		return "", fmt.Errorf("failed to parse config: %v", err)
-	}
-	s := ""
-	slices.SortFunc(config.Backends, func(a, b runs.Backend) int {
-		return cmp.Compare(a.Remote, b.Remote)
-	})
-	for _, backend := range config.Backends {
-		include := false
-
-		if slices.Contains(backend.IgnoreTests, "cmd/bisync") {
-			include = true
-			s += fmt.Sprintf("- `%s` (`%s`)\n", strings.TrimSuffix(backend.Remote, ":"), backend.Backend)
-		}
-
-		for _, ignore := range backend.Ignore {
-			if strings.Contains(strings.ToLower(ignore), "bisync") {
-				if !include { // don't have header row yet
-					s += fmt.Sprintf("- `%s` (`%s`)\n", strings.TrimSuffix(backend.Remote, ":"), backend.Backend)
-				}
-				include = true
-				s += fmt.Sprintf("  - `%s`\n", ignore)
-				// TODO: might be neat to add a "reason" param displaying the reason the test is ignored
-			}
-		}
-	}
-	return s, nil
-}
-
-// getFailures updates the list of currently failing tests from the integration tests server
-func getFailures() (string, error) {
-	var buf bytes.Buffer
-	err := operations.CopyURLToWriter(context.Background(), integrationTestsJSONURL, &buf)
-	if err != nil {
-		return "", err
-	}
-
-	r := runs.Report{}
-	err = json.Unmarshal(buf.Bytes(), &r)
-	if err != nil {
-		return "", fmt.Errorf("failed to unmarshal json: %v", err)
-	}
-
-	s := ""
-	for _, run := range r.Failed {
-		for i, t := range run.FailedTests {
-			if strings.Contains(strings.ToLower(t), "bisync") {
-
-				if i == 0 { // don't have header row yet
-					s += fmt.Sprintf("- `%s` (`%s`)\n", strings.TrimSuffix(run.Remote, ":"), run.Backend)
-				}
-
-				url := integrationTestsHTMLURL + run.TrialName
-				url = url[:len(url)-5] + "1.txt" // numbers higher than 1 could change from night to night
-				s += fmt.Sprintf("  - [`%s`](%v)\n", t, url)
-
-				if i == 4 && len(run.FailedTests) > 5 { // stop after 5
-					s += fmt.Sprintf("  - [%v more](%v)\n", len(run.FailedTests)-5, integrationTestsHTMLURL)
-					break
-				}
-			}
-		}
-	}
-	s += fmt.Sprintf("- Updated: %v", r.DateTime)
-	return s, nil
-}
-
-// parseConfig reads and parses the config.yaml file
-func parseConfig() (*runs.Config, error) {
-	d, err := os.ReadFile(configFile)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read config file: %w", err)
-	}
-	config := &runs.Config{}
-	err = yaml.Unmarshal(d, &config)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse config file: %w", err)
-	}
-	return config, nil
-}

bin/markdown-lint

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-# Run markdown linting locally
-set -e
-
-# Workflow
-build=.github/workflows/build.yml
-
-# Globs read from from $build
-globs=$(awk '/- name: Check Markdown format/{f=1;next} f && /globs:/{f=2;next} f==2 && NF{if($1=="-"){exit} print $0}' $build)
-
-if [ -z "$globs" ]; then
-    echo "Error: No globs found in Check Markdown step in $build" >&2
-    exit 1
-fi
-
-docker run -v $PWD:/workdir --user $(id -u):$(id -g) davidanson/markdownlint-cli2 $globs

bin/not-in-stable.go

@@ -33,7 +33,7 @@ func readCommits(from, to string) (logMap map[string]string, logs []string) {
 	}
 	logMap = map[string]string{}
 	logs = []string{}
-	for line := range bytes.SplitSeq(out, []byte{'\n'}) {
+	for _, line := range bytes.Split(out, []byte{'\n'}) {
 		if len(line) == 0 {
 			continue
 		}

cmd/about/about.go

@@ -51,52 +51,47 @@ output. The output is typically used, free, quota and trash contents.
 
 E.g. Typical output from ` + "`rclone about remote:`" + ` is:
 
-` + "```text" + `
-Total:   17 GiB
-Used:    7.444 GiB
-Free:    1.315 GiB
-Trashed: 100.000 MiB
-Other:   8.241 GiB
-` + "```" + `
+    Total:   17 GiB
+    Used:    7.444 GiB
+    Free:    1.315 GiB
+    Trashed: 100.000 MiB
+    Other:   8.241 GiB
 
 Where the fields are:
 
-- Total: Total size available.
-- Used: Total size used.
-- Free: Total space available to this user.
-- Trashed: Total space used by trash.
-- Other: Total amount in other storage (e.g. Gmail, Google Photos).
-- Objects: Total number of objects in the storage.
+  * Total: Total size available.
+  * Used: Total size used.
+  * Free: Total space available to this user.
+  * Trashed: Total space used by trash.
+  * Other: Total amount in other storage (e.g. Gmail, Google Photos).
+  * Objects: Total number of objects in the storage.
 
 All sizes are in number of bytes.
 
 Applying a ` + "`--full`" + ` flag to the command prints the bytes in full, e.g.
 
-` + "```text" + `
-Total:   18253611008
-Used:    7993453766
-Free:    1411001220
-Trashed: 104857602
-Other:   8849156022
-` + "```" + `
+    Total:   18253611008
+    Used:    7993453766
+    Free:    1411001220
+    Trashed: 104857602
+    Other:   8849156022
 
 A ` + "`--json`" + ` flag generates conveniently machine-readable output, e.g.
 
-` + "```json" + `
-{
-  "total": 18253611008,
-  "used": 7993453766,
-  "trashed": 104857602,
-  "other": 8849156022,
-  "free": 1411001220
-}
-` + "```" + `
+    {
+        "total": 18253611008,
+        "used": 7993453766,
+        "trashed": 104857602,
+        "other": 8849156022,
+        "free": 1411001220
+    }
 
 Not all backends print all fields. Information is not included if it is not
 provided by a backend. Where the value is unlimited it is omitted.
 
 Some backends does not support the ` + "`rclone about`" + ` command at all,
-see complete list in [documentation](https://rclone.org/overview/#optional-features).`,
+see complete list in [documentation](https://rclone.org/overview/#optional-features).
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.41",
 		// "groups":            "",

cmd/authorize/authorize.go

@@ -30,16 +30,14 @@ rclone from a machine with a browser - use as instructed by
 rclone config.
 
 The command requires 1-3 arguments:
-
-- fs name (e.g., "drive", "s3", etc.)
-- Either a base64 encoded JSON blob obtained from a previous rclone config session
-- Or a client_id and client_secret pair obtained from the remote service
+  - fs name (e.g., "drive", "s3", etc.)
+  - Either a base64 encoded JSON blob obtained from a previous rclone config session
+  - Or a client_id and client_secret pair obtained from the remote service
 
 Use --auth-no-open-browser to prevent rclone to open auth
 link in default browser automatically.
 
-Use --template to generate HTML output via a custom Go template. If a blank
-string is provided as an argument to this flag, the default template is used.`,
+Use --template to generate HTML output via a custom Go template. If a blank string is provided as an argument to this flag, the default template is used.`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.27",
 	},

cmd/backend/backend.go

@@ -37,33 +37,26 @@ see the backend docs for definitions.
 
 You can discover what commands a backend implements by using
 
-` + "```sh" + `
-rclone backend help remote:
-rclone backend help <backendname>
-` + "```" + `
+    rclone backend help remote:
+    rclone backend help <backendname>
 
 You can also discover information about the backend using (see
 [operations/fsinfo](/rc/#operations-fsinfo) in the remote control docs
 for more info).
 
-` + "```sh" + `
-rclone backend features remote:
-` + "```" + `
+    rclone backend features remote:
 
 Pass options to the backend command with -o. This should be key=value or key, e.g.:
 
-` + "```sh" + `
-rclone backend stats remote:path stats -o format=json -o long
-` + "```" + `
+    rclone backend stats remote:path stats -o format=json -o long
 
 Pass arguments to the backend by placing them on the end of the line
 
-` + "```sh" + `
-rclone backend cleanup remote:path file1 file2 file3
-` + "```" + `
+    rclone backend cleanup remote:path file1 file2 file3
 
 Note to run these commands on a running backend then see
-[backend/command](/rc/#backend-command) in the rc docs.`,
+[backend/command](/rc/#backend-command) in the rc docs.
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.52",
 		"groups":            "Important",

cmd/bisync/bisync_test.go

@@ -177,7 +177,6 @@ var (
 	// "src and dst identical but can't set mod time without deleting and re-uploading"
 	argRefreshTimes = flag.Bool("refresh-times", false, "Force refreshing the target modtime, useful for Dropbox (default: false)")
 	ignoreLogs      = flag.Bool("ignore-logs", false, "skip comparing log lines but still compare listings")
-	argPCount       = flag.Int("pcount", 2, "number of parallel subtests to run for TestBisyncConcurrent") // go test ./cmd/bisync -race -pcount 10
 )
 
 // bisyncTest keeps all test data in a single place
@@ -285,15 +284,6 @@ func TestBisyncConcurrent(t *testing.T) {
 	if !isLocal(*fstest.RemoteName) {
 		t.Skip("TestBisyncConcurrent is skipped on non-local")
 	}
-	if *argTestCase != "" && *argTestCase != "basic" {
-		t.Skip("TestBisyncConcurrent only tests 'basic'")
-	}
-	if *argPCount < 2 {
-		t.Skip("TestBisyncConcurrent is pointless with -pcount < 2")
-	}
-	if *argGolden {
-		t.Skip("skip TestBisyncConcurrent when goldenizing")
-	}
 	oldArgTestCase := argTestCase
 	*argTestCase = "basic"
 	*ignoreLogs = true // not useful to compare logs here because both runs will be logging at once
@@ -302,9 +292,8 @@ func TestBisyncConcurrent(t *testing.T) {
 		*ignoreLogs = false
 	})
 
-	for i := 0; i < *argPCount; i++ {
-		t.Run(fmt.Sprintf("test%v", i), testParallel)
-	}
+	t.Run("test1", testParallel)
+	t.Run("test2", testParallel)
 }
 
 func testParallel(t *testing.T) {
@@ -476,7 +465,6 @@ func (b *bisyncTest) runTestCase(ctx context.Context, t *testing.T, testCase str
 
 	// Prepare initial content
 	b.cleanupCase(ctx)
-	ctx = accounting.WithStatsGroup(ctx, random.String(8))
 	fstest.CheckListingWithPrecision(b.t, b.fs1, []fstest.Item{}, []string{}, b.fs1.Precision()) // verify starting from empty
 	fstest.CheckListingWithPrecision(b.t, b.fs2, []fstest.Item{}, []string{}, b.fs2.Precision())
 	initFs, err := cache.Get(ctx, b.initDir)
@@ -522,7 +510,7 @@ func (b *bisyncTest) runTestCase(ctx context.Context, t *testing.T, testCase str
 	require.NoError(b.t, err)
 	b.step = 0
 	b.stopped = false
-	for line := range strings.SplitSeq(string(scenBuf), "\n") {
+	for _, line := range strings.Split(string(scenBuf), "\n") {
 		comment := strings.Index(line, "#")
 		if comment != -1 {
 			line = line[:comment]
@@ -653,11 +641,12 @@ func (b *bisyncTest) cleanupCase(ctx context.Context) {
 	_ = operations.Purge(ctx, b.fs1, "")
 	_ = operations.Purge(ctx, b.fs2, "")
 	_ = os.RemoveAll(b.workDir)
+	accounting.Stats(ctx).ResetCounters()
 }
 
 func (b *bisyncTest) runTestStep(ctx context.Context, line string) (err error) {
 	var fsrc, fdst fs.Fs
-	ctx = accounting.WithStatsGroup(ctx, random.String(8))
+	accounting.Stats(ctx).ResetErrors()
 	b.logPrintf("%s %s", color(terminal.CyanFg, b.stepStr), color(terminal.BlueFg, line))
 
 	ci := fs.GetConfig(ctx)
@@ -936,7 +925,7 @@ func (b *bisyncTest) runTestStep(ctx context.Context, line string) (err error) {
 // splitLine splits scenario line into tokens and performs
 // substitutions that involve whitespace or control chars.
 func splitLine(line string) (args []string) {
-	for s := range strings.FieldsSeq(line) {
+	for _, s := range strings.Fields(line) {
 		b := []byte(whitespaceReplacer.Replace(s))
 		b = regexChar.ReplaceAllFunc(b, func(b []byte) []byte {
 			c, _ := strconv.ParseUint(string(b[5:7]), 16, 8)
@@ -1018,7 +1007,6 @@ func (b *bisyncTest) checkPreReqs(ctx context.Context, opt *bisync.Options) (con
 	}
 	// test if modtimes are writeable
 	testSetModtime := func(f fs.Fs) {
-		ctx := accounting.WithStatsGroup(ctx, random.String(8)) // keep stats separate
 		in := bytes.NewBufferString("modtime_write_test")
 		objinfo := object.NewStaticObjectInfo("modtime_write_test", initDate, int64(len("modtime_write_test")), true, nil, nil)
 		obj, err := f.Put(ctx, in, objinfo)
@@ -1030,11 +1018,6 @@ func (b *bisyncTest) checkPreReqs(ctx context.Context, opt *bisync.Options) (con
 		if err == fs.ErrorCantSetModTime {
 			b.t.Skip("skipping test as at least one remote does not support setting modtime")
 		}
-		if err == fs.ErrorCantSetModTimeWithoutDelete { // transfers stats expected to differ on this backend
-			logReplacements = append(logReplacements, `^.*There was nothing to transfer.*$`, dropMe)
-		} else {
-			require.NoError(b.t, err)
-		}
 		if !f.Features().IsLocal {
 			time.Sleep(time.Second) // avoid GoogleCloudStorage Error 429 rateLimitExceeded
 		}
@@ -1513,7 +1496,7 @@ func (b *bisyncTest) compareResults() int {
 
 		fs.Log(nil, divider)
 		fs.Logf(nil, color(terminal.RedFg, "| MISCOMPARE  -Golden vs +Results for  %s"), file)
-		for line := range strings.SplitSeq(strings.TrimSpace(text), "\n") {
+		for _, line := range strings.Split(strings.TrimSpace(text), "\n") {
 			fs.Logf(nil, "| %s", strings.TrimSpace(line))
 		}
 	}
@@ -1636,14 +1619,6 @@ func (b *bisyncTest) mangleResult(dir, file string, golden bool) string {
 			`^.*not equal on recheck.*$`, dropMe,
 		)
 	}
-	if b.ignoreBlankHash || !b.fs1.Hashes().Contains(hash.MD5) || !b.fs2.Hashes().Contains(hash.MD5) {
-		// if either side lacks support for md5, need to ignore the "nothing to transfer" log,
-		// as sync may in fact need to transfer, where it would otherwise skip based on hash or just update modtime.
-		// transfer stats will also differ in fs.ErrorCantSetModTimeWithoutDelete scenario, and where --download-hash is needed.
-		logReplacements = append(logReplacements,
-			`^.*There was nothing to transfer.*$`, dropMe,
-		)
-	}
 	rep := logReplacements
 	if b.testCase == "dry_run" {
 		rep = append(rep, dryrunReplacements...)

cmd/bisync/compare.go

@@ -219,8 +219,8 @@ func (b *bisyncRun) setFromCompareFlag(ctx context.Context) error {
 		return nil
 	}
 	var CompareFlag CompareOpt // for exclusions
-	opts := strings.SplitSeq(b.opt.CompareFlag, ",")
-	for opt := range opts {
+	opts := strings.Split(b.opt.CompareFlag, ",")
+	for _, opt := range opts {
 		switch strings.ToLower(strings.TrimSpace(opt)) {
 		case "size":
 			b.opt.Compare.Size = true

cmd/bisync/help.go

@@ -51,15 +51,14 @@ var longHelp = shortHelp + makeHelp(`
 bidirectional cloud sync solution in rclone.
 It retains the Path1 and Path2 filesystem listings from the prior run.
 On each successive run it will:
-
 - list files on Path1 and Path2, and check for changes on each side.
   Changes include |New|, |Newer|, |Older|, and |Deleted| files.
 - Propagate changes on Path1 to Path2, and vice-versa.
 
 Bisync is considered an **advanced command**, so use with care.
 Make sure you have read and understood the entire [manual](https://rclone.org/bisync)
-(especially the [Limitations](https://rclone.org/bisync/#limitations) section)
-before using, or data loss can result. Questions can be asked in the
-[Rclone Forum](https://forum.rclone.org/).
+(especially the [Limitations](https://rclone.org/bisync/#limitations) section) before using,
+or data loss can result. Questions can be asked in the [Rclone Forum](https://forum.rclone.org/).
 
-See [full bisync description](https://rclone.org/bisync/) for details.`)
+See [full bisync description](https://rclone.org/bisync/) for details.
+`)

cmd/bisync/listing.go

@@ -434,6 +434,7 @@ func (b *bisyncRun) listDirsOnly(listingNum int) (*fileList, error) {
 	}
 
 	fulllisting, err = b.loadListingNum(listingNum)
+
 	if err != nil {
 		b.critical = true
 		b.retryable = true
@@ -609,11 +610,6 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res
 				}
 			}
 			if srcNewName != "" { // if it was renamed and not deleted
-				if new == nil { // should not happen. log error and debug info
-					b.handleErr(b.renames, "internal error", fmt.Errorf("missing info for %q. Please report a bug at https://github.com/rclone/rclone/issues", srcNewName), true, true)
-					fs.PrettyPrint(srcList, "srcList for debugging", fs.LogLevelNotice)
-					continue
-				}
 				srcList.put(srcNewName, new.size, new.time, new.hash, new.id, new.flags)
 				dstList.put(srcNewName, new.size, new.time, new.hash, new.id, new.flags)
 			}

cmd/bisync/testdata/test_all_changed/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -61,7 +59,6 @@ INFO  : - Path1    Queue copy to Path2       - {
 INFO  : - Path1    Queue copy to Path2       - {path2/}file1.txt
 INFO  : - Path1    Queue copy to Path2       - {path2/}subdir/file20.txt
 INFO  : - Path1    Do queued copies to                - Path2
-INFO  : There was nothing to transfer
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -136,7 +133,6 @@ INFO  : - Path1    Queue copy to Path2       - {
 INFO  : - Path1    Queue copy to Path2       - {path2/}file1.txt
 INFO  : - Path1    Queue copy to Path2       - {path2/}subdir/file20.txt
 INFO  : - Path1    Do queued copies to                - Path2
-INFO  : There was nothing to transfer
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_backupdir/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_basic/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_changes/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_check_access/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -89,7 +87,6 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"

cmd/bisync/testdata/test_check_access_filters/golden/test.log

@@ -21,9 +21,7 @@ INFO  : Using filters file {workdir/}exclude-other-filtersfile.txt
 INFO  : Storing filters file hash to {workdir/}exclude-other-filtersfile.txt.{hashtype}
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -138,9 +136,7 @@ INFO  : Using filters file {workdir/}include-other-filtersfile.txt
 INFO  : Storing filters file hash to {workdir/}include-other-filtersfile.txt.{hashtype}
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_check_filename/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -92,9 +90,7 @@ INFO  : Copying Path2 files to Path1
 INFO  : Checking access health
 INFO  : Found 2 matching ".chk_file" files on both paths
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_check_sync/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -104,9 +102,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_compare_all/golden/test.log

@@ -15,9 +15,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_concurrent/golden/test.log

@@ -15,9 +15,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log

@@ -23,9 +23,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -82,7 +80,7 @@ INFO  : Path2 checking for diffs
 INFO  : Applying changes
 INFO  : - Path1    Queue copy to Path2       - {path2/}subdir
 INFO  : - Path1    Do queued copies to                - Path2
-INFO  : There was nothing to transfer
+INFO  : subdir: Making directory
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -126,7 +124,6 @@ INFO  : Path2:    1 changes:    0 new,    0 modified, 
 INFO  : Applying changes
 INFO  : - Path2    Queue delete              - {path2/}RCLONE_TEST
 INFO  : - Path1    Do queued copies to                - Path2
-INFO  : There was nothing to transfer
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -151,9 +148,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -193,7 +188,6 @@ INFO  : Path2 checking for diffs
 INFO  : Applying changes
 INFO  : - Path2    Queue delete              - {path2/}subdir
 INFO  : - Path1    Do queued copies to                - Path2
-INFO  : There was nothing to transfer
 INFO  : subdir: Removing directory
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"

cmd/bisync/testdata/test_dry_run/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_equal/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_ext_paths/golden/test.log

@@ -27,9 +27,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}測試Русский  ěáñ/" with Path2 "{path2/}測試Русский  ěáñ/"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}測試Русский  ěáñ/" vs Path2 "{path2/}測試Русский  ěáñ/"
 INFO  : Bisync successful
@@ -86,9 +84,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -178,9 +174,7 @@ INFO  : Using filters file {workdir/}測試_filtersfile.txt
 INFO  : Storing filters file hash to {workdir/}測試_filtersfile.txt.{hashtype}
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_filters/golden/test.log

@@ -20,9 +20,7 @@ INFO  : Using filters file {workdir/}filtersfile.flt
 INFO  : Storing filters file hash to {workdir/}filtersfile.flt.{hashtype}
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_filtersfile_checks/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -83,9 +81,7 @@ INFO  : Using filters file {workdir/}filtersfile.txt
 INFO  : Storing filters file hash to {workdir/}filtersfile.txt.{hashtype}
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -150,9 +146,7 @@ INFO  : Using filters file {workdir/}filtersfile.txt
 INFO  : Skipped storing filters file hash to {workdir/}filtersfile.txt.{hashtype} as --dry-run is set
 INFO  : Copying Path2 files to Path1
 NOTICE: - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 NOTICE: - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Bisync successful
 

cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -35,9 +33,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_max_delete_path1/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -86,7 +84,6 @@ INFO  : - Path2    Queue delete              - {
 INFO  : - Path2    Queue delete              - {path2/}file4.txt
 INFO  : - Path2    Queue delete              - {path2/}file5.txt
 INFO  : - Path1    Do queued copies to                - Path2
-INFO  : There was nothing to transfer
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_max_delete_path2_force/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -86,7 +84,6 @@ INFO  : - Path1    Queue delete              - {
 INFO  : - Path1    Queue delete              - {path1/}file4.txt
 INFO  : - Path1    Queue delete              - {path1/}file5.txt
 INFO  : - Path2    Do queued copies to                - Path1
-INFO  : There was nothing to transfer
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_nomodtime/golden/test.log

@@ -15,9 +15,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_rclone_args/golden/test.log

@@ -17,9 +17,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -117,9 +115,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -158,7 +154,6 @@ INFO  : Applying changes
 INFO  : - Path2    Queue copy to Path1       - {path1/}file2.txt
 INFO  : - Path2    Queue copy to Path1       - {path1/}subdir/file21.txt
 INFO  : - Path2    Do queued copies to                - Path1
-INFO  : There was nothing to transfer
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -176,7 +171,6 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"

cmd/bisync/testdata/test_resolve/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_resync/golden/test.log

@@ -39,7 +39,6 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"

cmd/bisync/testdata/test_resync_modes/golden/test.log

@@ -22,7 +22,6 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
@@ -130,7 +129,6 @@ INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
 INFO  : file1.txt: Path1 is smaller. Path1: 33, Path2: 42, Difference: 9
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
 INFO  : file1.txt: Path1 is smaller. Path1: 33, Path2: 42, Difference: 9
 INFO  : Resync updating listings
@@ -160,7 +158,6 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"

cmd/bisync/testdata/test_rmdirs/golden/test.log

@@ -16,9 +16,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -47,7 +45,6 @@ INFO  : Path2 checking for diffs
 INFO  : Applying changes
 INFO  : - Path2    Queue delete              - {path2/}subdir/file20.txt
 INFO  : - Path1    Do queued copies to                - Path2
-INFO  : There was nothing to transfer
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_volatile/golden/test.log

@@ -15,9 +15,7 @@ INFO  : Bisyncing with Comparison Settings:
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Copying Path2 files to Path1
 INFO  : - Path2    Resync is copying files to         - Path1
-INFO  : There was nothing to transfer
 INFO  : - Path1    Resync is copying files to         - Path2
-INFO  : There was nothing to transfer
 INFO  : Resync updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/cat/cat.go

@@ -43,21 +43,15 @@ var commandDefinition = &cobra.Command{
 
 You can use it like this to output a single file
 
-|||sh
-rclone cat remote:path/to/file
-|||
+    rclone cat remote:path/to/file
 
 Or like this to output any file in dir or its subdirectories.
 
-|||sh
-rclone cat remote:path/to/dir
-|||
+    rclone cat remote:path/to/dir
 
 Or like this to output any .txt files in dir or its subdirectories.
 
-|||sh
-rclone --include "*.txt" cat remote:path/to/dir
-|||
+    rclone --include "*.txt" cat remote:path/to/dir
 
 Use the |--head| flag to print characters only at the start, |--tail| for
 the end and |--offset| and |--count| to print a section in the middle.
@@ -68,17 +62,14 @@ Use the |--separator| flag to print a separator value between files. Be sure to
 shell-escape special characters. For example, to print a newline between
 files, use:
 
-- bash:
+* bash:
 
-  |||sh
-  rclone --include "*.txt" --separator $'\n' cat remote:path/to/dir
-  |||
+      rclone --include "*.txt" --separator $'\n' cat remote:path/to/dir
 
-- powershell:
+* powershell:
 
-  |||powershell
-  rclone --include "*.txt" --separator "|n" cat remote:path/to/dir
-  |||`, "|", "`"),
+      rclone --include "*.txt" --separator "|n" cat remote:path/to/dir
+`, "|", "`"),
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.33",
 		"groups":            "Filter,Listing",

cmd/check/check.go

@@ -74,7 +74,8 @@ you what happened to it. These are reminiscent of diff files.
 - |! path| means there was an error reading or hashing the source or dest.
 
 The default number of parallel checks is 8. See the [--checkers](/docs/#checkers-int)
-option for more information.`, "|", "`")
+option for more information.
+`, "|", "`")
 
 // GetCheckOpt gets the options corresponding to the check flags
 func GetCheckOpt(fsrc, fdst fs.Fs) (opt *operations.CheckOpt, close func(), err error) {

cmd/cleanup/cleanup.go

@@ -17,7 +17,8 @@ var commandDefinition = &cobra.Command{
 	Use:   "cleanup remote:path",
 	Short: `Clean up the remote if possible.`,
 	Long: `Clean up the remote if possible.  Empty the trash or delete old file
-versions. Not supported by all remotes.`,
+versions. Not supported by all remotes.
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.31",
 		"groups":            "Important",

cmd/config/config.go

@@ -44,7 +44,8 @@ var configCommand = &cobra.Command{
 	Short: `Enter an interactive configuration session.`,
 	Long: `Enter an interactive configuration session where you can setup new
 remotes and manage existing ones. You may also set or remove a
-password to protect your configuration.`,
+password to protect your configuration.
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.39",
 	},
@@ -133,7 +134,9 @@ sensitive info with XXX.
 
 This makes the config file suitable for posting online for support.
 
-It should be double checked before posting as the redaction may not be perfect.`,
+It should be double checked before posting as the redaction may not be perfect.
+
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.64",
 	},
@@ -175,8 +178,8 @@ var configProvidersCommand = &cobra.Command{
 
 var updateRemoteOpt config.UpdateRemoteOpt
 
-var configPasswordHelp = strings.ReplaceAll(
-	`Note that if the config process would normally ask a question the
+var configPasswordHelp = strings.ReplaceAll(`
+Note that if the config process would normally ask a question the
 default is taken (unless |--non-interactive| is used).  Each time
 that happens rclone will print or DEBUG a message saying how to
 affect the value taken.
@@ -202,29 +205,29 @@ it.
 
 This will look something like (some irrelevant detail removed):
 
-|||json
+|||
 {
-  "State": "*oauth-islocal,teamdrive,,",
-  "Option": {
-    "Name": "config_is_local",
-    "Help": "Use web browser to automatically authenticate rclone with remote?\n * Say Y if the machine running rclone has a web browser you can use\n * Say N if running rclone on a (remote) machine without web browser access\nIf not sure try Y. If Y failed, try N.\n",
-    "Default": true,
-    "Examples": [
-      {
-        "Value": "true",
-        "Help": "Yes"
-      },
-      {
-        "Value": "false",
-        "Help": "No"
-      }
-    ],
-    "Required": false,
-    "IsPassword": false,
-    "Type": "bool",
-    "Exclusive": true,
-  },
-  "Error": "",
+    "State": "*oauth-islocal,teamdrive,,",
+    "Option": {
+        "Name": "config_is_local",
+        "Help": "Use web browser to automatically authenticate rclone with remote?\n * Say Y if the machine running rclone has a web browser you can use\n * Say N if running rclone on a (remote) machine without web browser access\nIf not sure try Y. If Y failed, try N.\n",
+        "Default": true,
+        "Examples": [
+            {
+                "Value": "true",
+                "Help": "Yes"
+            },
+            {
+                "Value": "false",
+                "Help": "No"
+            }
+        ],
+        "Required": false,
+        "IsPassword": false,
+        "Type": "bool",
+        "Exclusive": true,
+    },
+    "Error": "",
 }
 |||
 
@@ -247,9 +250,7 @@ The keys of |Option| are used as follows:
 If |Error| is set then it should be shown to the user at the same
 time as the question.
 
-|||sh
-rclone config update name --continue --state "*oauth-islocal,teamdrive,," --result "true"
-|||
+    rclone config update name --continue --state "*oauth-islocal,teamdrive,," --result "true"
 
 Note that when using |--continue| all passwords should be passed in
 the clear (not obscured). Any default config values should be passed
@@ -263,7 +264,8 @@ not just the post config questions. Any parameters are used as
 defaults for questions as usual.
 
 Note that |bin/config.py| in the rclone source implements this protocol
-as a readable demonstration.`, "|", "`")
+as a readable demonstration.
+`, "|", "`")
 var configCreateCommand = &cobra.Command{
 	Use:   "create name type [key value]*",
 	Short: `Create a new remote with name, type and options.`,
@@ -273,18 +275,13 @@ should be passed in pairs of |key| |value| or as |key=value|.
 For example, to make a swift remote of name myremote using auto config
 you would do:
 
-|||sh
-rclone config create myremote swift env_auth true
-rclone config create myremote swift env_auth=true
-|||
+    rclone config create myremote swift env_auth true
+    rclone config create myremote swift env_auth=true
 
 So for example if you wanted to configure a Google Drive remote but
 using remote authorization you would do this:
 
-|||sh
-rclone config create mydrive drive config_is_local=false
-|||
-
+    rclone config create mydrive drive config_is_local=false
 `, "|", "`") + configPasswordHelp,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.39",
@@ -347,18 +344,13 @@ pairs of |key| |value| or as |key=value|.
 For example, to update the env_auth field of a remote of name myremote
 you would do:
 
-|||sh
-rclone config update myremote env_auth true
-rclone config update myremote env_auth=true
-|||
+    rclone config update myremote env_auth true
+    rclone config update myremote env_auth=true
 
 If the remote uses OAuth the token will be updated, if you don't
 require this add an extra parameter thus:
 
-|||sh
-rclone config update myremote env_auth=true config_refresh_token=false
-|||
-
+    rclone config update myremote env_auth=true config_refresh_token=false
 `, "|", "`") + configPasswordHelp,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.39",
@@ -396,13 +388,12 @@ The |password| should be passed in in clear (unobscured).
 
 For example, to set password of a remote of name myremote you would do:
 
-|||sh
-rclone config password myremote fieldname mypassword
-rclone config password myremote fieldname=mypassword
-|||
+    rclone config password myremote fieldname mypassword
+    rclone config password myremote fieldname=mypassword
 
 This command is obsolete now that "config update" and "config create"
-both support obscuring passwords directly.`, "|", "`"),
+both support obscuring passwords directly.
+`, "|", "`"),
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.39",
 	},
@@ -450,7 +441,8 @@ var configReconnectCommand = &cobra.Command{
 
 To disconnect the remote use "rclone config disconnect".
 
-This normally means going through the interactive oauth flow again.`,
+This normally means going through the interactive oauth flow again.
+`,
 	RunE: func(command *cobra.Command, args []string) error {
 		ctx := context.Background()
 		cmd.CheckArgs(1, 1, command, args)
@@ -469,7 +461,8 @@ var configDisconnectCommand = &cobra.Command{
 
 This normally means revoking the oauth token.
 
-To reconnect use "rclone config reconnect".`,
+To reconnect use "rclone config reconnect".
+`,
 	RunE: func(command *cobra.Command, args []string) error {
 		cmd.CheckArgs(1, 1, command, args)
 		f := cmd.NewFsSrc(args)
@@ -497,7 +490,8 @@ var configUserInfoCommand = &cobra.Command{
 	Use:   "userinfo remote:",
 	Short: `Prints info about logged in user of remote.`,
 	Long: `This prints the details of the person logged in to the cloud storage
-system.`,
+system.
+`,
 	RunE: func(command *cobra.Command, args []string) error {
 		cmd.CheckArgs(1, 1, command, args)
 		f := cmd.NewFsSrc(args)
@@ -540,7 +534,8 @@ var configEncryptionCommand = &cobra.Command{
 	Use:   "encryption",
 	Short: `set, remove and check the encryption for the config file`,
 	Long: `This command sets, clears and checks the encryption for the config file using
-the subcommands below.`,
+the subcommands below.
+`,
 }
 
 var configEncryptionSetCommand = &cobra.Command{
@@ -564,7 +559,8 @@ variable to distinguish which password you must supply.
 Alternatively you can remove the password first (with |rclone config
 encryption remove|), then set it again with this command which may be
 easier if you don't mind the unencrypted config file being on the disk
-briefly.`, "|", "`"),
+briefly.
+`, "|", "`"),
 	RunE: func(command *cobra.Command, args []string) error {
 		cmd.CheckArgs(0, 0, command, args)
 		config.LoadedData()
@@ -584,7 +580,8 @@ If |--password-command| is in use, this will be called to supply the old config
 password.
 
 If the config was not encrypted then no error will be returned and
-this command will do nothing.`, "|", "`"),
+this command will do nothing.
+`, "|", "`"),
 	RunE: func(command *cobra.Command, args []string) error {
 		cmd.CheckArgs(0, 0, command, args)
 		config.LoadedData()
@@ -603,7 +600,8 @@ It will attempt to decrypt the config using the password you supply.
 If decryption fails it will return a non-zero exit code if using
 |--password-command|, otherwise it will prompt again for the password.
 
-If the config file is not encrypted it will return a non zero exit code.`, "|", "`"),
+If the config file is not encrypted it will return a non zero exit code.
+`, "|", "`"),
 	RunE: func(command *cobra.Command, args []string) error {
 		cmd.CheckArgs(0, 0, command, args)
 		config.LoadedData()

cmd/convmv/convmv.go

@@ -31,27 +31,18 @@ var commandDefinition = &cobra.Command{
 	Use:   "convmv dest:path --name-transform XXX",
 	Short: `Convert file and directory names in place.`,
 	// Warning¡ "¡" will be replaced by backticks below
-	Long: strings.ReplaceAll(`convmv supports advanced path name transformations for converting and renaming
-files and directories by applying prefixes, suffixes, and other alterations.
+	Long: strings.ReplaceAll(`
+convmv supports advanced path name transformations for converting and renaming files and directories by applying prefixes, suffixes, and other alterations.
 
-`+transform.Help()+`The regex command generally accepts Perl-style regular expressions, the exact
-syntax is defined in the [Go regular expression reference](https://golang.org/pkg/regexp/syntax/).
-The replacement string may contain capturing group variables, referencing
-capturing groups using the syntax ¡$name¡ or ¡${name}¡, where the name can
-refer to a named capturing group or it can simply be the index as a number.
-To insert a literal $, use $$.
-
-Multiple transformations can be used in sequence, applied
-in the order they are specified on the command line.
+`+transform.Help()+`Multiple transformations can be used in sequence, applied in the order they are specified on the command line.
 
 The ¡--name-transform¡ flag is also available in ¡sync¡, ¡copy¡, and ¡move¡.
 
-### Files vs Directories
+## Files vs Directories
 
-By default ¡--name-transform¡ will only apply to file names. The means only the
-leaf file name will be transformed. However some of the transforms would be
-better applied to the whole path or just directories. To choose which which
-part of the file path is affected some tags can be added to the ¡--name-transform¡.
+By default ¡--name-transform¡ will only apply to file names. The means only the leaf file name will be transformed.
+However some of the transforms would be better applied to the whole path or just directories.
+To choose which which part of the file path is affected some tags can be added to the ¡--name-transform¡.
 
 | Tag | Effect |
 |------|------|
@@ -59,58 +50,42 @@ part of the file path is affected some tags can be added to the ¡--name-transfo
 | ¡dir¡ | Only transform name of directories - these may appear anywhere in the path |
 | ¡all¡ | Transform the entire path for files and directories |
 
-This is used by adding the tag into the transform name like this:
-¡--name-transform file,prefix=ABC¡ or ¡--name-transform dir,prefix=DEF¡.
+This is used by adding the tag into the transform name like this: ¡--name-transform file,prefix=ABC¡ or ¡--name-transform dir,prefix=DEF¡.
 
-For some conversions using all is more likely to be useful, for example
-¡--name-transform all,nfc¡.
+For some conversions using all is more likely to be useful, for example ¡--name-transform all,nfc¡.
 
-Note that ¡--name-transform¡ may not add path separators ¡/¡ to the name.
-This will cause an error.
+Note that ¡--name-transform¡ may not add path separators ¡/¡ to the name. This will cause an error.
 
-### Ordering and Conflicts
+## Ordering and Conflicts
 
-- Transformations will be applied in the order specified by the user.
-  - If the ¡file¡ tag is in use (the default) then only the leaf name of files
-    will be transformed.
-  - If the ¡dir¡ tag is in use then directories anywhere in the path will be
-    transformed
-  - If the ¡all¡ tag is in use then directories and files anywhere in the path
-    will be transformed
-  - Each transformation will be run one path segment at a time.
-  - If a transformation adds a ¡/¡ or ends up with an empty path segment then
-    that will be an error.
-- It is up to the user to put the transformations in a sensible order.
-  - Conflicting transformations, such as ¡prefix¡ followed by ¡trimprefix¡ or
-    ¡nfc¡ followed by ¡nfd¡, are possible.
-  - Instead of enforcing mutual exclusivity, transformations are applied in
-    sequence as specified by the user, allowing for intentional use cases
-    (e.g., trimming one prefix before adding another).
-  - Users should be aware that certain combinations may lead to unexpected
-    results and should verify transformations using ¡--dry-run¡ before execution.
+* Transformations will be applied in the order specified by the user.
+    * If the ¡file¡ tag is in use (the default) then only the leaf name of files will be transformed.
+    * If the ¡dir¡ tag is in use then directories anywhere in the path will be transformed
+    * If the ¡all¡ tag is in use then directories and files anywhere in the path will be transformed
+    * Each transformation will be run one path segment at a time.
+    * If a transformation adds a ¡/¡ or ends up with an empty path segment then that will be an error.
+* It is up to the user to put the transformations in a sensible order.
+    * Conflicting transformations, such as ¡prefix¡ followed by ¡trimprefix¡ or ¡nfc¡ followed by ¡nfd¡, are possible.
+    * Instead of enforcing mutual exclusivity, transformations are applied in sequence as specified by the
+user, allowing for intentional use cases (e.g., trimming one prefix before adding another).
+    * Users should be aware that certain combinations may lead to unexpected results and should verify
+transformations using ¡--dry-run¡ before execution.
 
-### Race Conditions and Non-Deterministic Behavior
+## Race Conditions and Non-Deterministic Behavior
 
-Some transformations, such as ¡replace=old:new¡, may introduce conflicts where
-multiple source files map to the same destination name. This can lead to race
-conditions when performing concurrent transfers. It is up to the user to
-anticipate these.
-
-- If two files from the source are transformed into the same name at the
-  destination, the final state may be non-deterministic.
-- Running rclone check after a sync using such transformations may erroneously
-  report missing or differing files due to overwritten results.
+Some transformations, such as ¡replace=old:new¡, may introduce conflicts where multiple source files map to the same destination name.
+This can lead to race conditions when performing concurrent transfers. It is up to the user to anticipate these.
+* If two files from the source are transformed into the same name at the destination, the final state may be non-deterministic.
+* Running rclone check after a sync using such transformations may erroneously report missing or differing files due to overwritten results.
 
 To minimize risks, users should:
+* Carefully review transformations that may introduce conflicts.
+* Use ¡--dry-run¡ to inspect changes before executing a sync (but keep in mind that it won't show the effect of non-deterministic transformations).
+* Avoid transformations that cause multiple distinct source files to map to the same destination name.
+* Consider disabling concurrency with ¡--transfers=1¡ if necessary.
+* Certain transformations (e.g. ¡prefix¡) will have a multiplying effect every time they are used. Avoid these when using ¡bisync¡.
 
-- Carefully review transformations that may introduce conflicts.
-- Use ¡--dry-run¡ to inspect changes before executing a sync (but keep in mind
-  that it won't show the effect of non-deterministic transformations).
-- Avoid transformations that cause multiple distinct source files to map to the
-  same destination name.
-- Consider disabling concurrency with ¡--transfers=1¡ if necessary.
-- Certain transformations (e.g. ¡prefix¡) will have a multiplying effect every
-  time they are used. Avoid these when using ¡bisync¡.`, "¡", "`"),
+	`, "¡", "`"),
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.70",
 		"groups":            "Filter,Listing,Important,Copy",

cmd/convmv/convmv_test.go

@@ -152,7 +152,7 @@ func makeTestFiles(t *testing.T, r *fstest.Run, dir string) []fstest.Item {
 	items := []fstest.Item{}
 	for _, c := range alphabet {
 		var out strings.Builder
-		for i := range rune(7) {
+		for i := rune(0); i < 7; i++ {
 			out.WriteRune(c + i)
 		}
 		fileName := path.Join(dir, fmt.Sprintf("%04d-%s.txt", n, out.String()))

cmd/copy/copy.go

@@ -50,30 +50,22 @@ go there.
 
 For example
 
-|||sh
-rclone copy source:sourcepath dest:destpath
-|||
+    rclone copy source:sourcepath dest:destpath
 
 Let's say there are two files in sourcepath
 
-|||text
-sourcepath/one.txt
-sourcepath/two.txt
-|||
+    sourcepath/one.txt
+    sourcepath/two.txt
 
 This copies them to
 
-|||text
-destpath/one.txt
-destpath/two.txt
-|||
+    destpath/one.txt
+    destpath/two.txt
 
 Not to
 
-|||text
-destpath/sourcepath/one.txt
-destpath/sourcepath/two.txt
-|||
+    destpath/sourcepath/one.txt
+    destpath/sourcepath/two.txt
 
 If you are familiar with |rsync|, rclone always works as if you had
 written a trailing |/| - meaning "copy the contents of this directory".
@@ -89,22 +81,20 @@ For example, if you have many files in /path/to/src but only a few of
 them change every day, you can copy all the files which have changed
 recently very efficiently like this:
 
-|||sh
-rclone copy --max-age 24h --no-traverse /path/to/src remote:
-|||
+    rclone copy --max-age 24h --no-traverse /path/to/src remote:
+
 
 Rclone will sync the modification times of files and directories if
 the backend supports it. If metadata syncing is required then use the
 |--metadata| flag.
 
 Note that the modification time and metadata for the root directory
-will **not** be synced. See [issue #7652](https://github.com/rclone/rclone/issues/7652)
+will **not** be synced. See https://github.com/rclone/rclone/issues/7652
 for more info.
 
 **Note**: Use the |-P|/|--progress| flag to view real-time transfer statistics.
 
-**Note**: Use the |--dry-run| or the |--interactive|/|-i| flag to test without
-copying anything.
+**Note**: Use the |--dry-run| or the |--interactive|/|-i| flag to test without copying anything.
 
 `, "|", "`") + operationsflags.Help(),
 	Annotations: map[string]string{

cmd/copyto/copyto.go

@@ -35,32 +35,26 @@ name.  If the source is a directory then it acts exactly like the
 
 So
 
-` + "```sh" + `
-rclone copyto src dst
-` + "```" + `
+    rclone copyto src dst
 
-where src and dst are rclone paths, either ` + "`remote:path`" + ` or
-` + "`/path/to/local`" + ` or ` + "`C:\\windows\\path\\if\\on\\windows`" + `.
+where src and dst are rclone paths, either remote:path or
+/path/to/local or C:\windows\path\if\on\windows.
 
 This will:
 
-` + "```text" + `
-if src is file
-    copy it to dst, overwriting an existing file if it exists
-if src is directory
-    copy it to dst, overwriting existing files if they exist
-    see copy command for full details
-` + "```" + `
+    if src is file
+        copy it to dst, overwriting an existing file if it exists
+    if src is directory
+        copy it to dst, overwriting existing files if they exist
+        see copy command for full details
 
 This doesn't transfer files that are identical on src and dst, testing
 by size and modification time or MD5SUM.  It doesn't delete files from
 the destination.
 
-*If you are looking to copy just a byte range of a file, please see
-` + "`rclone cat --offset X --count Y`" + `.*
+*If you are looking to copy just a byte range of a file, please see 'rclone cat --offset X --count Y'*
 
-**Note**: Use the ` + "`-P`" + `/` + "`--progress`" + ` flag to view
-real-time transfer statistics.
+**Note**: Use the ` + "`-P`" + `/` + "`--progress`" + ` flag to view real-time transfer statistics
 
 ` + operationsflags.Help(),
 	Annotations: map[string]string{

cmd/copyurl/copyurl.go

@@ -3,7 +3,6 @@ package copyurl
 
 import (
 	"context"
-	"encoding/csv"
 	"errors"
 	"fmt"
 	"os"
@@ -13,9 +12,7 @@ import (
 	"github.com/rclone/rclone/fs"
 	"github.com/rclone/rclone/fs/config/flags"
 	"github.com/rclone/rclone/fs/operations"
-	"github.com/rclone/rclone/lib/errcount"
 	"github.com/spf13/cobra"
-	"golang.org/x/sync/errgroup"
 )
 
 var (
@@ -24,7 +21,6 @@ var (
 	printFilename  = false
 	stdout         = false
 	noClobber      = false
-	urls           = false
 )
 
 func init() {
@@ -35,7 +31,6 @@ func init() {
 	flags.BoolVarP(cmdFlags, &printFilename, "print-filename", "p", printFilename, "Print the resulting name from --auto-filename", "")
 	flags.BoolVarP(cmdFlags, &noClobber, "no-clobber", "", noClobber, "Prevent overwriting file with same name", "")
 	flags.BoolVarP(cmdFlags, &stdout, "stdout", "", stdout, "Write the output to stdout rather than a file", "")
-	flags.BoolVarP(cmdFlags, &urls, "urls", "", stdout, "Use a CSV file of links to process multiple URLs", "")
 }
 
 var commandDefinition = &cobra.Command{
@@ -53,23 +48,12 @@ set in HTTP headers, it will be used instead of the name from the URL.
 With |--print-filename| in addition, the resulting file name will be
 printed.
 
-Setting |--no-clobber| will prevent overwriting file on the
+Setting |--no-clobber| will prevent overwriting file on the 
 destination if there is one with the same name.
 
 Setting |--stdout| or making the output file name |-|
 will cause the output to be written to standard output.
 
-Setting |--urls| allows you to input a CSV file of URLs in format: URL,
-FILENAME. If |--urls| is in use then replace the URL in the arguments with the
-file containing the URLs, e.g.:
-|||sh
-rclone copyurl --urls myurls.csv remote:dir
-|||
-Missing filenames will be autogenerated equivalent to using |--auto-filename|.
-Note that |--stdout| and |--print-filename| are incompatible with |--urls|.
-This will do |--transfers| copies in parallel. Note that if |--auto-filename|
-is desired for all URLs then a file with only URLs and no filename can be used.
-
 ### Troubleshooting
 
 If you can't get |rclone copyurl| to work then here are some things you can try:
@@ -78,7 +62,9 @@ If you can't get |rclone copyurl| to work then here are some things you can try:
 - |--bind 0.0.0.0| rclone will use IPv6 if available - try disabling it
 - |--bind ::0| to disable IPv4
 - |--user agent curl| - some sites have whitelists for curl's user-agent - try that
-- Make sure the site works with |curl| directly`, "|", "`"),
+- Make sure the site works with |curl| directly
+
+`, "|", "`"),
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.43",
 		"groups":            "Important",
@@ -86,93 +72,32 @@ If you can't get |rclone copyurl| to work then here are some things you can try:
 	RunE: func(command *cobra.Command, args []string) (err error) {
 		cmd.CheckArgs(1, 2, command, args)
 
-		cmd.Run(true, true, command, func() error {
-			if !urls {
-				return run(args)
+		var dstFileName string
+		var fsdst fs.Fs
+		if !stdout {
+			if len(args) < 2 {
+				return errors.New("need 2 arguments if not using --stdout")
 			}
-			return runURLS(args)
+			if args[1] == "-" {
+				stdout = true
+			} else if autoFilename {
+				fsdst = cmd.NewFsDir(args[1:])
+			} else {
+				fsdst, dstFileName = cmd.NewFsDstFile(args[1:])
+			}
+		}
+		cmd.Run(true, true, command, func() error {
+			var dst fs.Object
+			if stdout {
+				err = operations.CopyURLToWriter(context.Background(), args[0], os.Stdout)
+			} else {
+				dst, err = operations.CopyURL(context.Background(), fsdst, dstFileName, args[0], autoFilename, headerFilename, noClobber)
+				if printFilename && err == nil && dst != nil {
+					fmt.Println(dst.Remote())
+				}
+			}
+			return err
 		})
 		return nil
 	},
 }
-
-var copyURL = operations.CopyURL // for testing
-
-// runURLS processes a .csv file of urls and filenames
-func runURLS(args []string) (err error) {
-	if stdout {
-		return errors.New("can't use --stdout with --urls")
-	}
-	if printFilename {
-		return errors.New("can't use --print-filename with --urls")
-	}
-	dstFs := cmd.NewFsDir(args[1:])
-
-	f, err := os.Open(args[0])
-	if err != nil {
-		return fmt.Errorf("failed to open .csv file: %w", err)
-	}
-	defer fs.CheckClose(f, &err)
-	reader := csv.NewReader(f)
-	reader.FieldsPerRecord = -1
-	urlList, err := reader.ReadAll()
-	if err != nil {
-		return fmt.Errorf("failed reading .csv file: %w", err)
-	}
-
-	ec := errcount.New()
-	g, gCtx := errgroup.WithContext(context.Background())
-	ci := fs.GetConfig(gCtx)
-	g.SetLimit(ci.Transfers)
-
-	for _, urlEntry := range urlList {
-		if len(urlEntry) == 0 {
-			continue
-		}
-		g.Go(func() error {
-			url := urlEntry[0]
-			var filename string
-			if len(urlEntry) > 1 {
-				filename = urlEntry[1]
-			}
-			_, err := copyURL(gCtx, dstFs, filename, url, filename == "", headerFilename, noClobber)
-			if err != nil {
-				fs.Errorf(filename, "failed to copy URL %q: %v", url, err)
-				ec.Add(err)
-			}
-			return nil
-		})
-	}
-	ec.Add(g.Wait())
-	return ec.Err("not all URLs copied successfully")
-}
-
-// run runs the command for a single URL
-func run(args []string) error {
-	var err error
-	var dstFileName string
-	var fsdst fs.Fs
-	if !stdout {
-		if len(args) < 2 {
-			return errors.New("need 2 arguments if not using --stdout")
-		}
-		if args[1] == "-" {
-			stdout = true
-		} else if autoFilename {
-			fsdst = cmd.NewFsDir(args[1:])
-		} else {
-			fsdst, dstFileName = cmd.NewFsDstFile(args[1:])
-		}
-	}
-
-	var dst fs.Object
-	if stdout {
-		err = operations.CopyURLToWriter(context.Background(), args[0], os.Stdout)
-	} else {
-		dst, err = copyURL(context.Background(), fsdst, dstFileName, args[0], autoFilename, headerFilename, noClobber)
-		if printFilename && err == nil && dst != nil {
-			fmt.Println(dst.Remote())
-		}
-	}
-	return err
-}

cmd/copyurl/copyurl_test.go

@@ -1,157 +0,0 @@
-package copyurl
-
-import (
-	"context"
-	"errors"
-	"os"
-	"path/filepath"
-	"sync"
-	"sync/atomic"
-	"testing"
-
-	_ "github.com/rclone/rclone/backend/local"
-	"github.com/rclone/rclone/fs"
-	"github.com/rclone/rclone/fs/operations"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func resetGlobals() {
-	autoFilename = false
-	headerFilename = false
-	printFilename = false
-	stdout = false
-	noClobber = false
-	urls = false
-	copyURL = operations.CopyURL
-}
-
-func TestRun_RequiresTwoArgsWhenNotStdout(t *testing.T) {
-	t.Cleanup(resetGlobals)
-	resetGlobals()
-
-	err := run([]string{"https://example.com/foo"})
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "need 2 arguments if not using --stdout")
-}
-
-func TestRun_CallsCopyURL_WithExplicitFilename_Success(t *testing.T) {
-	t.Cleanup(resetGlobals)
-	resetGlobals()
-
-	tmp := t.TempDir()
-	dstPath := filepath.Join(tmp, "out.txt")
-
-	var called int32
-
-	copyURL = func(_ctx context.Context, _dst fs.Fs, dstFileName, url string, auto, header, noclobber bool) (fs.Object, error) {
-		atomic.AddInt32(&called, 1)
-		assert.Equal(t, "https://example.com/file", url)
-		assert.Equal(t, "out.txt", dstFileName)
-		assert.False(t, auto)
-		assert.False(t, header)
-		assert.False(t, noclobber)
-		return nil, nil
-	}
-
-	err := run([]string{"https://example.com/file", dstPath})
-	require.NoError(t, err)
-	assert.Equal(t, int32(1), atomic.LoadInt32(&called))
-}
-
-func TestRun_CallsCopyURL_WithAutoFilename_AndPropagatesError(t *testing.T) {
-	t.Cleanup(resetGlobals)
-	resetGlobals()
-
-	tmp := t.TempDir()
-	autoFilename = true
-
-	want := errors.New("boom")
-	var called int32
-
-	copyURL = func(_ctx context.Context, _dst fs.Fs, dstFileName, url string, auto, header, noclobber bool) (fs.Object, error) {
-		atomic.AddInt32(&called, 1)
-		assert.Equal(t, "", dstFileName) // auto filename -> empty
-		assert.True(t, auto)
-		return nil, want
-	}
-
-	err := run([]string{"https://example.com/auto/name", tmp})
-	require.Error(t, err)
-	assert.Equal(t, want, err)
-	assert.Equal(t, int32(1), atomic.LoadInt32(&called))
-}
-
-func TestRunURLS_ErrorsWithStdoutAndWithPrintFilename(t *testing.T) {
-	t.Cleanup(resetGlobals)
-	resetGlobals()
-
-	stdout = true
-	err := runURLS([]string{"dummy.csv", "destDir"})
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "can't use --stdout with --urls")
-
-	resetGlobals()
-	printFilename = true
-	err = runURLS([]string{"dummy.csv", "destDir"})
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "can't use --print-filename with --urls")
-}
-
-func TestRunURLS_ProcessesCSV_ParallelCalls_AndAggregatesError(t *testing.T) {
-	t.Cleanup(resetGlobals)
-	resetGlobals()
-
-	tmp := t.TempDir()
-	csvPath := filepath.Join(tmp, "urls.csv")
-	csvContent := []byte(
-		"https://example.com/a,aaa.txt\n" + // success
-			"https://example.com/b\n" + // auto filename
-			"https://example.com/c,ccc.txt\n") // error
-	require.NoError(t, os.WriteFile(csvPath, csvContent, 0o600))
-
-	// destination dir (local backend)
-	dest := t.TempDir()
-
-	// mock copyURL: succeed for /a and /b, fail for /c
-
-	var calls int32
-	var mu sync.Mutex
-	var seen []string
-
-	copyURL = func(_ctx context.Context, _dst fs.Fs, dstFileName, url string, auto, header, noclobber bool) (fs.Object, error) {
-		atomic.AddInt32(&calls, 1)
-		mu.Lock()
-		seen = append(seen, url+"|"+dstFileName)
-		mu.Unlock()
-
-		switch {
-		case url == "https://example.com/a":
-			require.Equal(t, "aaa.txt", dstFileName)
-			return nil, nil
-		case url == "https://example.com/b":
-			require.Equal(t, "", dstFileName) // auto-name path
-			return nil, nil
-		case url == "https://example.com/c":
-			return nil, errors.New("network down")
-		default:
-			return nil, nil
-		}
-	}
-
-	err := runURLS([]string{csvPath, dest})
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "not all URLs copied successfully")
-	// 3 lines => 3 calls
-	assert.Equal(t, int32(3), atomic.LoadInt32(&calls))
-
-	// sanity: all expected URLs were seen
-	assert.ElementsMatch(t,
-		[]string{
-			"https://example.com/a|aaa.txt",
-			"https://example.com/b|",
-			"https://example.com/c|ccc.txt",
-		},
-		seen,
-	)
-}

cmd/cryptcheck/cryptcheck.go

@@ -37,18 +37,14 @@ checksum of the file it has just encrypted.
 
 Use it like this
 
-` + "```sh" + `
-rclone cryptcheck /path/to/files encryptedremote:path
-` + "```" + `
+    rclone cryptcheck /path/to/files encryptedremote:path
 
 You can use it like this also, but that will involve downloading all
-the files in ` + "`remote:path`" + `.
+the files in remote:path.
 
-` + "```sh" + `
-rclone cryptcheck remote:path encryptedremote:path
-` + "```" + `
+    rclone cryptcheck remote:path encryptedremote:path
 
-After it has run it will log the status of the ` + "`encryptedremote:`" + `.
+After it has run it will log the status of the encryptedremote:.
 ` + check.FlagsHelp,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.36",

cmd/cryptdecode/cryptdecode.go

@@ -33,13 +33,13 @@ If you supply the ` + "`--reverse`" + ` flag, it will return encrypted file name
 
 use it like this
 
-` + "```sh" + `
-rclone cryptdecode encryptedremote: encryptedfilename1 encryptedfilename2
-rclone cryptdecode --reverse encryptedremote: filename1 filename2
-` + "```" + `
+	rclone cryptdecode encryptedremote: encryptedfilename1 encryptedfilename2
 
-Another way to accomplish this is by using the ` + "`rclone backend encode` (or `decode`)" + `
-command. See the documentation on the [crypt](/crypt/) overlay for more info.`,
+	rclone cryptdecode --reverse encryptedremote: filename1 filename2
+
+Another way to accomplish this is by using the ` + "`rclone backend encode` (or `decode`)" + ` command.
+See the documentation on the [crypt](/crypt/) overlay for more info.
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.38",
 	},

cmd/dedupe/dedupe.go

@@ -47,15 +47,15 @@ directories have been merged.
 
 Next, if deduping by name, for every group of duplicate file names /
 hashes, it will delete all but one identical file it finds without
-confirmation.  This means that for most duplicated files the
-` + "`dedupe`" + ` command will not be interactive.
+confirmation.  This means that for most duplicated files the ` +
+		"`dedupe`" + ` command will not be interactive.
 
 ` + "`dedupe`" + ` considers files to be identical if they have the
-same file path and the same hash. If the backend does not support
-hashes (e.g. crypt wrapping Google Drive) then they will never be found
-to be identical. If you use the ` + "`--size-only`" + ` flag then files
-will be considered identical if they have the same size (any hash will be
-ignored). This can be useful on crypt backends which do not support hashes.
+same file path and the same hash. If the backend does not support hashes (e.g. crypt wrapping
+Google Drive) then they will never be found to be identical. If you
+use the ` + "`--size-only`" + ` flag then files will be considered
+identical if they have the same size (any hash will be ignored). This
+can be useful on crypt backends which do not support hashes.
 
 Next rclone will resolve the remaining duplicates. Exactly which
 action is taken depends on the dedupe mode. By default, rclone will
@@ -68,82 +68,71 @@ Here is an example run.
 
 Before - with duplicates
 
-` + "```sh" + `
-$ rclone lsl drive:dupes
-  6048320 2016-03-05 16:23:16.798000000 one.txt
-  6048320 2016-03-05 16:23:11.775000000 one.txt
-   564374 2016-03-05 16:23:06.731000000 one.txt
-  6048320 2016-03-05 16:18:26.092000000 one.txt
-  6048320 2016-03-05 16:22:46.185000000 two.txt
-  1744073 2016-03-05 16:22:38.104000000 two.txt
-   564374 2016-03-05 16:22:52.118000000 two.txt
-` + "```" + `
+    $ rclone lsl drive:dupes
+      6048320 2016-03-05 16:23:16.798000000 one.txt
+      6048320 2016-03-05 16:23:11.775000000 one.txt
+       564374 2016-03-05 16:23:06.731000000 one.txt
+      6048320 2016-03-05 16:18:26.092000000 one.txt
+      6048320 2016-03-05 16:22:46.185000000 two.txt
+      1744073 2016-03-05 16:22:38.104000000 two.txt
+       564374 2016-03-05 16:22:52.118000000 two.txt
 
 Now the ` + "`dedupe`" + ` session
 
-` + "```sh" + `
-$ rclone dedupe drive:dupes
-2016/03/05 16:24:37 Google drive root 'dupes': Looking for duplicates using interactive mode.
-one.txt: Found 4 files with duplicate names
-one.txt: Deleting 2/3 identical duplicates (MD5 "1eedaa9fe86fd4b8632e2ac549403b36")
-one.txt: 2 duplicates remain
-  1:      6048320 bytes, 2016-03-05 16:23:16.798000000, MD5 1eedaa9fe86fd4b8632e2ac549403b36
-  2:       564374 bytes, 2016-03-05 16:23:06.731000000, MD5 7594e7dc9fc28f727c42ee3e0749de81
-s) Skip and do nothing
-k) Keep just one (choose which in next step)
-r) Rename all to be different (by changing file.jpg to file-1.jpg)
-s/k/r> k
-Enter the number of the file to keep> 1
-one.txt: Deleted 1 extra copies
-two.txt: Found 3 files with duplicate names
-two.txt: 3 duplicates remain
-  1:       564374 bytes, 2016-03-05 16:22:52.118000000, MD5 7594e7dc9fc28f727c42ee3e0749de81
-  2:      6048320 bytes, 2016-03-05 16:22:46.185000000, MD5 1eedaa9fe86fd4b8632e2ac549403b36
-  3:      1744073 bytes, 2016-03-05 16:22:38.104000000, MD5 851957f7fb6f0bc4ce76be966d336802
-s) Skip and do nothing
-k) Keep just one (choose which in next step)
-r) Rename all to be different (by changing file.jpg to file-1.jpg)
-s/k/r> r
-two-1.txt: renamed from: two.txt
-two-2.txt: renamed from: two.txt
-two-3.txt: renamed from: two.txt
-` + "```" + `
+    $ rclone dedupe drive:dupes
+    2016/03/05 16:24:37 Google drive root 'dupes': Looking for duplicates using interactive mode.
+    one.txt: Found 4 files with duplicate names
+    one.txt: Deleting 2/3 identical duplicates (MD5 "1eedaa9fe86fd4b8632e2ac549403b36")
+    one.txt: 2 duplicates remain
+      1:      6048320 bytes, 2016-03-05 16:23:16.798000000, MD5 1eedaa9fe86fd4b8632e2ac549403b36
+      2:       564374 bytes, 2016-03-05 16:23:06.731000000, MD5 7594e7dc9fc28f727c42ee3e0749de81
+    s) Skip and do nothing
+    k) Keep just one (choose which in next step)
+    r) Rename all to be different (by changing file.jpg to file-1.jpg)
+    s/k/r> k
+    Enter the number of the file to keep> 1
+    one.txt: Deleted 1 extra copies
+    two.txt: Found 3 files with duplicate names
+    two.txt: 3 duplicates remain
+      1:       564374 bytes, 2016-03-05 16:22:52.118000000, MD5 7594e7dc9fc28f727c42ee3e0749de81
+      2:      6048320 bytes, 2016-03-05 16:22:46.185000000, MD5 1eedaa9fe86fd4b8632e2ac549403b36
+      3:      1744073 bytes, 2016-03-05 16:22:38.104000000, MD5 851957f7fb6f0bc4ce76be966d336802
+    s) Skip and do nothing
+    k) Keep just one (choose which in next step)
+    r) Rename all to be different (by changing file.jpg to file-1.jpg)
+    s/k/r> r
+    two-1.txt: renamed from: two.txt
+    two-2.txt: renamed from: two.txt
+    two-3.txt: renamed from: two.txt
 
 The result being
 
-` + "```sh" + `
-$ rclone lsl drive:dupes
-  6048320 2016-03-05 16:23:16.798000000 one.txt
-   564374 2016-03-05 16:22:52.118000000 two-1.txt
-  6048320 2016-03-05 16:22:46.185000000 two-2.txt
-  1744073 2016-03-05 16:22:38.104000000 two-3.txt
-` + "```" + `
+    $ rclone lsl drive:dupes
+      6048320 2016-03-05 16:23:16.798000000 one.txt
+       564374 2016-03-05 16:22:52.118000000 two-1.txt
+      6048320 2016-03-05 16:22:46.185000000 two-2.txt
+      1744073 2016-03-05 16:22:38.104000000 two-3.txt
 
-Dedupe can be run non interactively using the ` + "`" + `--dedupe-mode` + "`" + ` flag
-or by using an extra parameter with the same value
+Dedupe can be run non interactively using the ` + "`" + `--dedupe-mode` + "`" + ` flag or by using an extra parameter with the same value
 
-- ` + "`" + `--dedupe-mode interactive` + "`" + ` - interactive as above.
-- ` + "`" + `--dedupe-mode skip` + "`" + ` - removes identical files then skips anything left.
-- ` + "`" + `--dedupe-mode first` + "`" + ` - removes identical files then keeps the first one.
-- ` + "`" + `--dedupe-mode newest` + "`" + ` - removes identical files then keeps the newest one.
-- ` + "`" + `--dedupe-mode oldest` + "`" + ` - removes identical files then keeps the oldest one.
-- ` + "`" + `--dedupe-mode largest` + "`" + ` - removes identical files then keeps the largest one.
-- ` + "`" + `--dedupe-mode smallest` + "`" + ` - removes identical files then keeps the smallest one.
-- ` + "`" + `--dedupe-mode rename` + "`" + ` - removes identical files then renames the rest to be different.
-- ` + "`" + `--dedupe-mode list` + "`" + ` - lists duplicate dirs and files only and changes nothing.
+  * ` + "`" + `--dedupe-mode interactive` + "`" + ` - interactive as above.
+  * ` + "`" + `--dedupe-mode skip` + "`" + ` - removes identical files then skips anything left.
+  * ` + "`" + `--dedupe-mode first` + "`" + ` - removes identical files then keeps the first one.
+  * ` + "`" + `--dedupe-mode newest` + "`" + ` - removes identical files then keeps the newest one.
+  * ` + "`" + `--dedupe-mode oldest` + "`" + ` - removes identical files then keeps the oldest one.
+  * ` + "`" + `--dedupe-mode largest` + "`" + ` - removes identical files then keeps the largest one.
+  * ` + "`" + `--dedupe-mode smallest` + "`" + ` - removes identical files then keeps the smallest one.
+  * ` + "`" + `--dedupe-mode rename` + "`" + ` - removes identical files then renames the rest to be different.
+  * ` + "`" + `--dedupe-mode list` + "`" + ` - lists duplicate dirs and files only and changes nothing.
 
-For example, to rename all the identically named photos in your Google Photos
-directory, do
+For example, to rename all the identically named photos in your Google Photos directory, do
 
-` + "```sh" + `
-rclone dedupe --dedupe-mode rename "drive:Google Photos"
-` + "```" + `
+    rclone dedupe --dedupe-mode rename "drive:Google Photos"
 
 Or
 
-` + "```sh" + `
-rclone dedupe rename "drive:Google Photos"
-` + "```",
+    rclone dedupe rename "drive:Google Photos"
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.27",
 		"groups":            "Important",

cmd/delete/delete.go

@@ -32,29 +32,26 @@ obeys include/exclude filters so can be used to selectively delete files.
 alone. If you want to delete a directory and all of its contents use
 the [purge](/commands/rclone_purge/) command.
 
-If you supply the |--rmdirs| flag, it will remove all empty directories along
-with it. You can also use the separate command [rmdir](/commands/rclone_rmdir/)
-or [rmdirs](/commands/rclone_rmdirs/) to delete empty directories only.
+If you supply the |--rmdirs| flag, it will remove all empty directories along with it.
+You can also use the separate command [rmdir](/commands/rclone_rmdir/) or
+[rmdirs](/commands/rclone_rmdirs/) to delete empty directories only.
 
 For example, to delete all files bigger than 100 MiB, you may first want to
 check what would be deleted (use either):
 
-|||sh
-rclone --min-size 100M lsl remote:path
-rclone --dry-run --min-size 100M delete remote:path
-|||
+    rclone --min-size 100M lsl remote:path
+    rclone --dry-run --min-size 100M delete remote:path
 
 Then proceed with the actual delete:
 
-|||sh
-rclone --min-size 100M delete remote:path
-|||
+    rclone --min-size 100M delete remote:path
 
 That reads "delete everything with a minimum size of 100 MiB", hence
 delete all files bigger than 100 MiB.
 
 **Important**: Since this can cause data loss, test first with the
-|--dry-run| or the |--interactive|/|-i| flag.`, "|", "`"),
+|--dry-run| or the |--interactive|/|-i| flag.
+`, "|", "`"),
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.27",
 		"groups":            "Important,Filter,Listing",

cmd/deletefile/deletefile.go

@@ -19,8 +19,9 @@ var commandDefinition = &cobra.Command{
 	Use:   "deletefile remote:path",
 	Short: `Remove a single file from remote.`,
 	Long: `Remove a single file from remote.  Unlike ` + "`" + `delete` + "`" + ` it cannot be used to
-remove a directory and it doesn't obey include/exclude filters - if the
-specified file exists, it will always be removed.`,
+remove a directory and it doesn't obey include/exclude filters - if the specified file exists,
+it will always be removed.
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.42",
 		"groups":            "Important",

cmd/genautocomplete/genautocomplete.go

@@ -14,7 +14,8 @@ var completionDefinition = &cobra.Command{
 	Use:   "completion [shell]",
 	Short: `Output completion script for a given shell.`,
 	Long: `Generates a shell completion script for rclone.
-Run with ` + "`--help`" + ` to list the supported shells.`,
+Run with ` + "`--help`" + ` to list the supported shells.
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.33",
 	},

cmd/genautocomplete/genautocomplete_bash.go

@@ -18,21 +18,17 @@ var bashCommandDefinition = &cobra.Command{
 	Short: `Output bash completion script for rclone.`,
 	Long: `Generates a bash shell autocompletion script for rclone.
 
-By default, when run without any arguments,
+By default, when run without any arguments, 
 
-` + "```sh" + `
-rclone completion bash
-` + "```" + `
+    rclone completion bash
 
 the generated script will be written to
 
-` + "```sh" + `
-/etc/bash_completion.d/rclone
-` + "```" + `
+    /etc/bash_completion.d/rclone
 
 and so rclone will probably need to be run as root, or with sudo.
 
-If you supply a path to a file as the command line argument, then
+If you supply a path to a file as the command line argument, then 
 the generated script will be written to that file, in which case
 you should not need root privileges.
 
@@ -43,12 +39,11 @@ can logout and login again to use the autocompletion script.
 
 Alternatively, you can source the script directly
 
-` + "```sh" + `
-. /path/to/my_bash_completion_scripts/rclone
-` + "```" + `
+    . /path/to/my_bash_completion_scripts/rclone
 
 and the autocompletion functionality will be added to your
-current shell.`,
+current shell.
+`,
 	Run: func(command *cobra.Command, args []string) {
 		cmd.CheckArgs(0, 1, command, args)
 		out := "/etc/bash_completion.d/rclone"

cmd/genautocomplete/genautocomplete_fish.go

@@ -21,21 +21,18 @@ var fishCommandDefinition = &cobra.Command{
 This writes to /etc/fish/completions/rclone.fish by default so will
 probably need to be run with sudo or as root, e.g.
 
-` + "```sh" + `
-sudo rclone completion fish
-` + "```" + `
+    sudo rclone completion fish
 
 Logout and login again to use the autocompletion scripts, or source
 them directly
 
-` + "```sh" + `
-. /etc/fish/completions/rclone.fish
-` + "```" + `
+    . /etc/fish/completions/rclone.fish
 
 If you supply a command line argument the script will be written
 there.
 
-If output_file is "-", then the output will be written to stdout.`,
+If output_file is "-", then the output will be written to stdout.
+`,
 	Run: func(command *cobra.Command, args []string) {
 		cmd.CheckArgs(0, 1, command, args)
 		out := "/etc/fish/completions/rclone.fish"

cmd/genautocomplete/genautocomplete_powershell.go

@@ -20,14 +20,13 @@ var powershellCommandDefinition = &cobra.Command{
 
 To load completions in your current shell session:
 
-` + "```sh" + `
-rclone completion powershell | Out-String | Invoke-Expression
-` + "```" + `
+    rclone completion powershell | Out-String | Invoke-Expression
 
 To load completions for every new session, add the output of the above command
 to your powershell profile.
 
-If output_file is "-" or missing, then the output will be written to stdout.`,
+If output_file is "-" or missing, then the output will be written to stdout.
+`,
 	Run: func(command *cobra.Command, args []string) {
 		cmd.CheckArgs(0, 1, command, args)
 		if len(args) == 0 || (len(args) > 0 && args[0] == "-") {

cmd/genautocomplete/genautocomplete_zsh.go

@@ -21,21 +21,18 @@ var zshCommandDefinition = &cobra.Command{
 This writes to /usr/share/zsh/vendor-completions/_rclone by default so will
 probably need to be run with sudo or as root, e.g.
 
-` + "```sh" + `
-sudo rclone completion zsh
-` + "```" + `
+    sudo rclone completion zsh
 
 Logout and login again to use the autocompletion scripts, or source
 them directly
 
-` + "```sh" + `
-autoload -U compinit && compinit
-` + "```" + `
+    autoload -U compinit && compinit
 
 If you supply a command line argument the script will be written
 there.
 
-If output_file is "-", then the output will be written to stdout.`,
+If output_file is "-", then the output will be written to stdout.
+`,
 	Run: func(command *cobra.Command, args []string) {
 		cmd.CheckArgs(0, 1, command, args)
 		out := "/usr/share/zsh/vendor-completions/_rclone"

cmd/gendocs/gendocs.go

@@ -8,7 +8,6 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"strings"
 	"text/template"
 	"time"
@@ -92,7 +91,7 @@ rclone.org website.`,
 			Aliases     []string
 			Annotations map[string]string
 		}
-		commands := map[string]commandDetails{}
+		var commands = map[string]commandDetails{}
 		var addCommandDetails func(root *cobra.Command, parentAliases []string)
 		addCommandDetails = func(root *cobra.Command, parentAliases []string) {
 			name := strings.ReplaceAll(root.CommandPath(), " ", "_") + ".md"
@@ -159,7 +158,7 @@ rclone.org website.`,
 			return err
 		}
 
-		outdentTitle := regexp.MustCompile(`(?m)^#(#+)`)
+		var outdentTitle = regexp.MustCompile(`(?m)^#(#+)`)
 
 		// Munge the files to add a link to the global flags page
 		err = filepath.Walk(out, func(path string, info os.FileInfo, err error) error {
@@ -170,20 +169,6 @@ rclone.org website.`,
 				name := filepath.Base(path)
 				cmd, ok := commands[name]
 				if !ok {
-					switch name {
-					case "rclone_mount.md":
-						switch runtime.GOOS {
-						case "darwin", "windows":
-							fs.Logf(nil, "Skipping docs for command not available without the cmount build tag: %v", name)
-							return nil
-						}
-					case "rclone_nfsmount.md", "rclone_serve_nfs.md":
-						switch runtime.GOOS {
-						case "windows":
-							fs.Logf(nil, "Skipping docs for command not supported on %v: %v", runtime.GOOS, name)
-							return nil
-						}
-					}
 					return fmt.Errorf("didn't find command for %q", name)
 				}
 				b, err := os.ReadFile(path)
@@ -199,12 +184,7 @@ rclone.org website.`,
 						return fmt.Errorf("internal error: failed to find cut points: startCut = %d, endCut = %d", startCut, endCut)
 					}
 					if endCut >= 0 {
-						doc = doc[:endCut] + `### See Also
-
-<!-- markdownlint-capture -->
-<!-- markdownlint-disable ul-style line-length -->` + doc[endCut+12:] + `
-<!-- markdownlint-restore -->
-`
+						doc = doc[:endCut] + "### See Also" + doc[endCut+12:]
 					}
 				} else {
 					var out strings.Builder
@@ -216,7 +196,7 @@ rclone.org website.`,
 							if group.Flags.HasFlags() {
 								_, _ = fmt.Fprintf(&out, "#### %s Options\n\n", group.Name)
 								_, _ = fmt.Fprintf(&out, "%s\n\n", group.Help)
-								_, _ = out.WriteString("```text\n")
+								_, _ = out.WriteString("```\n")
 								_, _ = out.WriteString(group.Flags.FlagUsages())
 								_, _ = out.WriteString("```\n\n")
 							}
@@ -224,12 +204,7 @@ rclone.org website.`,
 					} else {
 						_, _ = out.WriteString("See the [global flags page](/flags/) for global options not listed here.\n\n")
 					}
-					doc = doc[:startCut] + out.String() + `### See Also
-
-<!-- markdownlint-capture -->
-<!-- markdownlint-disable ul-style line-length -->` + doc[endCut+12:] + `
-<!-- markdownlint-restore -->
-`
+					doc = doc[:startCut] + out.String() + "### See Also" + doc[endCut+12:]
 				}
 
 				// outdent all the titles by one

cmd/gitannex/e2e_test.go

@@ -229,6 +229,7 @@ func TestEndToEnd(t *testing.T) {
 	skipE2eTestIfNecessary(t)
 
 	for _, mode := range allLayoutModes() {
+		mode := mode
 		t.Run(string(mode), func(t *testing.T) {
 			t.Parallel()
 
@@ -257,6 +258,7 @@ func TestEndToEndMigration(t *testing.T) {
 	}
 
 	for _, mode := range allLayoutModes() {
+		mode := mode
 		t.Run(string(mode), func(t *testing.T) {
 			t.Parallel()
 
@@ -316,6 +318,7 @@ func TestEndToEndRepoLayoutCompat(t *testing.T) {
 	}
 
 	for _, mode := range allLayoutModes() {
+		mode := mode
 		t.Run(string(mode), func(t *testing.T) {
 			t.Parallel()
 

cmd/gitannex/gitannex.go

@@ -539,7 +539,7 @@ var command = &cobra.Command{
 	Aliases: []string{uniqueCommandName},
 	Use:     subcommandName,
 	Short:   "Speaks with git-annex over stdin/stdout.",
-	Long:    strings.TrimSpace(gitannexHelp),
+	Long:    gitannexHelp,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.67.0",
 	},

cmd/gitannex/gitannex.md

@@ -4,7 +4,8 @@ users.
 
 [git-annex]: https://git-annex.branchable.com/
 
-### Installation on Linux
+Installation on Linux
+---------------------
 
 1. Skip this step if your version of git-annex is [10.20240430] or newer.
    Otherwise, you must create a symlink somewhere on your PATH with a particular

cmd/hashsum/hashsum.go

@@ -103,17 +103,14 @@ as a relative path).
 
 Run without a hash to see the list of all supported hashes, e.g.
 
-` + "```sh" + `
-$ rclone hashsum
-` + hash.HelpString(0) + "```" + `
-
+    $ rclone hashsum
+` + hash.HelpString(4) + `
 Then
 
-` + "```sh" + `
-rclone hashsum MD5 remote:path
-` + "```" + `
+    $ rclone hashsum MD5 remote:path
 
-Note that hash names are case insensitive and values are output in lower case.`,
+Note that hash names are case insensitive and values are output in lower case.
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.41",
 		"groups":            "Filter,Listing",

cmd/help.go

@@ -30,7 +30,9 @@ var Root = &cobra.Command{
 mounting them, listing them in lots of different ways.
 
 See the home page (https://rclone.org/) for installation, usage,
-documentation, changelog and configuration walkthroughs.`,
+documentation, changelog and configuration walkthroughs.
+
+`,
 	PersistentPostRun: func(cmd *cobra.Command, args []string) {
 		fs.Debugf("rclone", "Version %q finishing with parameters %q", fs.Version, os.Args)
 		atexit.Run()
@@ -344,7 +346,7 @@ func showBackend(name string) {
 				}
 				for _, ex := range opt.Examples {
 					fmt.Printf("    - %s\n", quoteString(ex.Value))
-					for line := range strings.SplitSeq(ex.Help, "\n") {
+					for _, line := range strings.Split(ex.Help, "\n") {
 						fmt.Printf("        - %s\n", line)
 					}
 				}

cmd/link/link.go

@@ -29,12 +29,10 @@ var commandDefinition = &cobra.Command{
 	Short: `Generate public link to file/folder.`,
 	Long: `Create, retrieve or remove a public link to the given file or folder.
 
-` + "```sh" + `
-rclone link remote:path/to/file
-rclone link remote:path/to/folder/
-rclone link --unlink remote:path/to/folder/
-rclone link --expire 1d remote:path/to/file
-` + "```" + `
+    rclone link remote:path/to/file
+    rclone link remote:path/to/folder/
+    rclone link --unlink remote:path/to/folder/
+    rclone link --expire 1d remote:path/to/file
 
 If you supply the --expire flag, it will set the expiration time
 otherwise it will use the default (100 years). **Note** not all
@@ -47,8 +45,9 @@ don't will just ignore it.
 
 If successful, the last line of the output will contain the
 link. Exact capabilities depend on the remote, but the link will
-always by default be created with the least constraints - e.g. no
-expiry, no password protection, accessible without account.`,
+always by default be created with the least constraints – e.g. no
+expiry, no password protection, accessible without account.
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.41",
 	},

cmd/listremotes/listremotes.go

@@ -114,7 +114,8 @@ func newLess(orderBy string) (less lessFn, err error) {
 var commandDefinition = &cobra.Command{
 	Use:   "listremotes [<filter>]",
 	Short: `List all the remotes in the config file and defined in environment variables.`,
-	Long: `Lists all the available remotes from the config file, or the remotes matching
+	Long: `
+Lists all the available remotes from the config file, or the remotes matching
 an optional filter.
 
 Prints the result in human-readable format by default, and as a simple list of
@@ -125,7 +126,8 @@ the source (file or environment).
 
 Result can be filtered by a filter argument which applies to all attributes,
 and/or filter flags specific for each attribute. The values must be specified
-according to regular rclone filtering pattern syntax.`,
+according to regular rclone filtering pattern syntax.
+`,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.34",
 	},

cmd/ls/ls.go

@@ -21,15 +21,13 @@ var commandDefinition = &cobra.Command{
 	Long: `Lists the objects in the source path to standard output in a human
 readable format with size and path. Recurses by default.
 
-E.g.
+Eg
 
-` + "```sh" + `
-$ rclone ls swift:bucket
-    60295 bevajer5jef
-    90613 canole
-    94467 diwogej7
-    37600 fubuwic
-` + "```" + `
+    $ rclone ls swift:bucket
+        60295 bevajer5jef
+        90613 canole
+        94467 diwogej7
+        37600 fubuwic
 
 ` + lshelp.Help,
 	Annotations: map[string]string{

cmd/ls/lshelp/lshelp.go

@@ -7,15 +7,16 @@ import (
 
 // Help describes the common help for all the list commands
 // Warning! "|" will be replaced by backticks below
-var Help = strings.ReplaceAll(`Any of the filtering options can be applied to this command.
+var Help = strings.ReplaceAll(`
+Any of the filtering options can be applied to this command.
 
 There are several related list commands
 
-- |ls| to list size and path of objects only
-- |lsl| to list modification time, size and path of objects only
-- |lsd| to list directories only
-- |lsf| to list objects and directories in easy to parse format
-- |lsjson| to list objects and directories in JSON format
+  * |ls| to list size and path of objects only
+  * |lsl| to list modification time, size and path of objects only
+  * |lsd| to list directories only
+  * |lsf| to list objects and directories in easy to parse format
+  * |lsjson| to list objects and directories in JSON format
 
 |ls|,|lsl|,|lsd| are designed to be human-readable.
 |lsf| is designed to be human and machine-readable.
@@ -23,9 +24,9 @@ There are several related list commands
 
 Note that |ls| and |lsl| recurse by default - use |--max-depth 1| to stop the recursion.
 
-The other list commands |lsd|,|lsf|,|lsjson| do not recurse by default -
-use |-R| to make them recurse.
+The other list commands |lsd|,|lsf|,|lsjson| do not recurse by default - use |-R| to make them recurse.
 
 Listing a nonexistent directory will produce an error except for
 remotes which can't have empty directories (e.g. s3, swift, or gcs -
-the bucket-based remotes).`, "|", "`")
+the bucket-based remotes).
+`, "|", "`")

cmd/lsd/lsd.go

@@ -32,22 +32,18 @@ recurse by default.  Use the ` + "`-R`" + ` flag to recurse.
 This command lists the total size of the directory (if known, -1 if
 not), the modification time (if known, the current time if not), the
 number of objects in the directory (if known, -1 if not) and the name
-of the directory, E.g.
+of the directory, Eg
 
-` + "```sh" + `
-$ rclone lsd swift:
-      494000 2018-04-26 08:43:20     10000 10000files
-          65 2018-04-26 08:43:20         1 1File
-` + "```" + `
+    $ rclone lsd swift:
+          494000 2018-04-26 08:43:20     10000 10000files
+              65 2018-04-26 08:43:20         1 1File
 
 Or
 
-` + "```sh" + `
-$ rclone lsd drive:test
-          -1 2016-10-17 17:41:53        -1 1000files
-          -1 2017-01-03 14:40:54        -1 2500files
-          -1 2017-07-08 14:39:28        -1 4000files
-` + "```" + `
+    $ rclone lsd drive:test
+              -1 2016-10-17 17:41:53        -1 1000files
+              -1 2017-01-03 14:40:54        -1 2500files
+              -1 2017-07-08 14:39:28        -1 4000files
 
 If you just want the directory names use ` + "`rclone lsf --dirs-only`" + `.
 

cmd/lsf/lsf.go

@@ -33,7 +33,7 @@ func init() {
 	cmd.Root.AddCommand(commandDefinition)
 	cmdFlags := commandDefinition.Flags()
 	flags.StringVarP(cmdFlags, &format, "format", "F", "p", "Output format - see  help for details", "")
-	flags.StringVarP(cmdFlags, &timeFormat, "time-format", "t", "", "Specify a custom time format - see docs for details (default: 2006-01-02 15:04:05)", "")
+	flags.StringVarP(cmdFlags, &timeFormat, "time-format", "t", "", "Specify a custom time format, or 'max' for max precision supported by remote (default: 2006-01-02 15:04:05)", "")
 	flags.StringVarP(cmdFlags, &separator, "separator", "s", ";", "Separator for the items in the format", "")
 	flags.BoolVarP(cmdFlags, &dirSlash, "dir-slash", "d", true, "Append a slash to directory names", "")
 	flags.FVarP(cmdFlags, &hashType, "hash", "", "Use this hash when `h` is used in the format MD5|SHA-1|DropboxHash", "")
@@ -52,47 +52,41 @@ standard output in a form which is easy to parse by scripts.  By
 default this will just be the names of the objects and directories,
 one per line.  The directories will have a / suffix.
 
-E.g.
+Eg
 
-` + "```sh" + `
-$ rclone lsf swift:bucket
-bevajer5jef
-canole
-diwogej7
-ferejej3gux/
-fubuwic
-` + "```" + `
+    $ rclone lsf swift:bucket
+    bevajer5jef
+    canole
+    diwogej7
+    ferejej3gux/
+    fubuwic
 
 Use the ` + "`--format`" + ` option to control what gets listed.  By default this
 is just the path, but you can use these parameters to control the
 output:
 
-` + "```text" + `
-p - path
-s - size
-t - modification time
-h - hash
-i - ID of object
-o - Original ID of underlying object
-m - MimeType of object if known
-e - encrypted name
-T - tier of storage if known, e.g. "Hot" or "Cool"
-M - Metadata of object in JSON blob format, eg {"key":"value"}
-` + "```" + `
+    p - path
+    s - size
+    t - modification time
+    h - hash
+    i - ID of object
+    o - Original ID of underlying object
+    m - MimeType of object if known
+    e - encrypted name
+    T - tier of storage if known, e.g. "Hot" or "Cool"
+    M - Metadata of object in JSON blob format, eg {"key":"value"}
 
 So if you wanted the path, size and modification time, you would use
 ` + "`--format \"pst\"`, or maybe `--format \"tsp\"`" + ` to put the path last.
 
-E.g.
+Eg
 
-` + "```sh" + `
-$ rclone lsf  --format "tsp" swift:bucket
-2016-06-25 18:55:41;60295;bevajer5jef
-2016-06-25 18:55:43;90613;canole
-2016-06-25 18:55:43;94467;diwogej7
-2018-04-26 08:50:45;0;ferejej3gux/
-2016-06-25 18:55:40;37600;fubuwic
-` + "```" + `
+    $ rclone lsf  --format "tsp" swift:bucket
+    2016-06-25 18:55:41;60295;bevajer5jef
+    2016-06-25 18:55:43;90613;canole
+    2016-06-25 18:55:43;94467;diwogej7
+    2018-04-26 08:50:45;0;ferejej3gux/
+    2016-06-25 18:55:40;37600;fubuwic
 
 If you specify "h" in the format you will get the MD5 hash by default,
 use the ` + "`--hash`" + ` flag to change which hash you want.  Note that this
@@ -103,20 +97,16 @@ type.
 
 For example, to emulate the md5sum command you can use
 
-` + "```sh" + `
-rclone lsf -R --hash MD5 --format hp --separator "  " --files-only .
-` + "```" + `
+    rclone lsf -R --hash MD5 --format hp --separator "  " --files-only .
 
-E.g.
+Eg
 
-` + "```sh" + `
-$ rclone lsf -R --hash MD5 --format hp --separator "  " --files-only swift:bucket
-7908e352297f0f530b84a756f188baa3  bevajer5jef
-cd65ac234e6fea5925974a51cdd865cc  canole
-03b5341b4f234b9d984d03ad076bae91  diwogej7
-8fd37c3810dd660778137ac3a66cc06d  fubuwic
-99713e14a4c4ff553acaf1930fad985b  gixacuh7ku
-` + "```" + `
+    $ rclone lsf -R --hash MD5 --format hp --separator "  " --files-only swift:bucket
+    7908e352297f0f530b84a756f188baa3  bevajer5jef
+    cd65ac234e6fea5925974a51cdd865cc  canole
+    03b5341b4f234b9d984d03ad076bae91  diwogej7
+    8fd37c3810dd660778137ac3a66cc06d  fubuwic
+    99713e14a4c4ff553acaf1930fad985b  gixacuh7ku
 
 (Though "rclone md5sum ." is an easier way of typing this.)
 
@@ -124,28 +114,24 @@ By default the separator is ";" this can be changed with the
 ` + "`--separator`" + ` flag.  Note that separators aren't escaped in the path so
 putting it last is a good strategy.
 
-E.g.
+Eg
 
-` + "```sh" + `
-$ rclone lsf  --separator "," --format "tshp" swift:bucket
-2016-06-25 18:55:41,60295,7908e352297f0f530b84a756f188baa3,bevajer5jef
-2016-06-25 18:55:43,90613,cd65ac234e6fea5925974a51cdd865cc,canole
-2016-06-25 18:55:43,94467,03b5341b4f234b9d984d03ad076bae91,diwogej7
-2018-04-26 08:52:53,0,,ferejej3gux/
-2016-06-25 18:55:40,37600,8fd37c3810dd660778137ac3a66cc06d,fubuwic
-` + "```" + `
+    $ rclone lsf  --separator "," --format "tshp" swift:bucket
+    2016-06-25 18:55:41,60295,7908e352297f0f530b84a756f188baa3,bevajer5jef
+    2016-06-25 18:55:43,90613,cd65ac234e6fea5925974a51cdd865cc,canole
+    2016-06-25 18:55:43,94467,03b5341b4f234b9d984d03ad076bae91,diwogej7
+    2018-04-26 08:52:53,0,,ferejej3gux/
+    2016-06-25 18:55:40,37600,8fd37c3810dd660778137ac3a66cc06d,fubuwic
 
 You can output in CSV standard format.  This will escape things in "
-if they contain,
+if they contain ,
 
-E.g.
+Eg
 
-` + "```sh" + `
-$ rclone lsf --csv --files-only --format ps remote:path
-test.log,22355
-test.sh,449
-"this file contains a comma, in the file name.txt",6
-` + "```" + `
+    $ rclone lsf --csv --files-only --format ps remote:path
+    test.log,22355
+    test.sh,449
+    "this file contains a comma, in the file name.txt",6
 
 Note that the ` + "`--absolute`" + ` parameter is useful for making lists of files
 to pass to an rclone copy with the ` + "`--files-from-raw`" + ` flag.
@@ -153,27 +139,20 @@ to pass to an rclone copy with the ` + "`--files-from-raw`" + ` flag.
 For example, to find all the files modified within one day and copy
 those only (without traversing the whole directory structure):
 
-` + "```sh" + `
-rclone lsf --absolute --files-only --max-age 1d /path/to/local > new_files
-rclone copy --files-from-raw new_files /path/to/local remote:path
-` + "```" + `
+    rclone lsf --absolute --files-only --max-age 1d /path/to/local > new_files
+    rclone copy --files-from-raw new_files /path/to/local remote:path
 
 The default time format is ` + "`'2006-01-02 15:04:05'`" + `.
-[Other formats](https://pkg.go.dev/time#pkg-constants) can be specified with
-the ` + "`--time-format`" + ` flag. Examples:
+[Other formats](https://pkg.go.dev/time#pkg-constants) can be specified with the ` + "`--time-format`" + ` flag.
+Examples:
 
-` + "```sh" + `
-rclone lsf remote:path --format pt --time-format 'Jan 2, 2006 at 3:04pm (MST)'
-rclone lsf remote:path --format pt --time-format '2006-01-02 15:04:05.000000000'
-rclone lsf remote:path --format pt --time-format '2006-01-02T15:04:05.999999999Z07:00'
-rclone lsf remote:path --format pt --time-format RFC3339
-rclone lsf remote:path --format pt --time-format DateOnly
-rclone lsf remote:path --format pt --time-format max
-rclone lsf remote:path --format pt --time-format unix
-rclone lsf remote:path --format pt --time-format unixnano
-` + "```" + `
-
-` + "`--time-format max`" + ` will automatically truncate ` + "`2006-01-02 15:04:05.000000000`" + `
+	rclone lsf remote:path --format pt --time-format 'Jan 2, 2006 at 3:04pm (MST)'
+	rclone lsf remote:path --format pt --time-format '2006-01-02 15:04:05.000000000'
+	rclone lsf remote:path --format pt --time-format '2006-01-02T15:04:05.999999999Z07:00'
+	rclone lsf remote:path --format pt --time-format RFC3339
+	rclone lsf remote:path --format pt --time-format DateOnly
+	rclone lsf remote:path --format pt --time-format max
+` + "`--time-format max`" + ` will automatically truncate ` + "'`2006-01-02 15:04:05.000000000`'" + `
 to the maximum precision supported by the remote.
 
 ` + lshelp.Help,

cmd/lsjson/lsjson.go

@@ -43,27 +43,25 @@ var commandDefinition = &cobra.Command{
 
 The output is an array of Items, where each Item looks like this:
 
-` + "```json" + `
-{
-  "Hashes" : {
-    "SHA-1" : "f572d396fae9206628714fb2ce00f72e94f2258f",
-    "MD5" : "b1946ac92492d2347c6235b4d2611184",
-    "DropboxHash" : "ecb65bb98f9d905b70458986c39fcbad7715e5f2fcc3b1f07767d7c83e2438cc"
-  },
-  "ID": "y2djkhiujf83u33",
-  "OrigID": "UYOJVTUW00Q1RzTDA",
-  "IsBucket" : false,
-  "IsDir" : false,
-  "MimeType" : "application/octet-stream",
-  "ModTime" : "2017-05-31T16:15:57.034468261+01:00",
-  "Name" : "file.txt",
-  "Encrypted" : "v0qpsdq8anpci8n929v3uu9338",
-  "EncryptedPath" : "kja9098349023498/v0qpsdq8anpci8n929v3uu9338",
-  "Path" : "full/path/goes/here/file.txt",
-  "Size" : 6,
-  "Tier" : "hot",
-}
-` + "```" + `
+    {
+      "Hashes" : {
+         "SHA-1" : "f572d396fae9206628714fb2ce00f72e94f2258f",
+         "MD5" : "b1946ac92492d2347c6235b4d2611184",
+         "DropboxHash" : "ecb65bb98f9d905b70458986c39fcbad7715e5f2fcc3b1f07767d7c83e2438cc"
+      },
+      "ID": "y2djkhiujf83u33",
+      "OrigID": "UYOJVTUW00Q1RzTDA",
+      "IsBucket" : false,
+      "IsDir" : false,
+      "MimeType" : "application/octet-stream",
+      "ModTime" : "2017-05-31T16:15:57.034468261+01:00",
+      "Name" : "file.txt",
+      "Encrypted" : "v0qpsdq8anpci8n929v3uu9338",
+      "EncryptedPath" : "kja9098349023498/v0qpsdq8anpci8n929v3uu9338",
+      "Path" : "full/path/goes/here/file.txt",
+      "Size" : 6,
+      "Tier" : "hot",
+    }
 
 The exact set of properties included depends on the backend:
 
@@ -120,7 +118,6 @@ will be shown ("2017-05-31T16:15:57+01:00").
 The whole output can be processed as a JSON blob, or alternatively it
 can be processed line by line as each item is written on individual lines
 (except with ` + "`--stat`" + `).
-
 ` + lshelp.Help,
 	Annotations: map[string]string{
 		"versionIntroduced": "v1.37",