"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
bisync: remove unused parameters
nielashd91cbb2626bf
diff --git a/cmd/bisync/checkfn.go b/cmd/bisync/checkfn.goindex f2015cb11..94fb35471 100644--- a/cmd/bisync/checkfn.go+++ b/cmd/bisync/checkfn.go@@ -249,7 +249,7 @@ func (b *bisyncRun) resyncTimeSizeEqual(ctxNoLogger context.Context, src fs.Obje// note that arg order is path1, path2, regardless of src/dstpath1, path2 := b.resyncWhichIsWhich(src, dst)if sizeDiffers(path1.Size(), path2.Size()) {- winningPath := b.resolveLargerSmaller(path1.Size(), path2.Size(), path1.Remote(), path2.Remote(), b.opt.ResyncMode)+ winningPath := b.resolveLargerSmaller(path1.Size(), path2.Size(), path1.Remote(), b.opt.ResyncMode)// don't need to check/update modtime here, as sizes definitely differ and something will be transferredreturn b.resyncWinningPathToEqual(winningPath), b.resyncWinningPathToEqual(winningPath) // skip hash check if true}@@ -259,7 +259,7 @@ func (b *bisyncRun) resyncTimeSizeEqual(ctxNoLogger context.Context, src fs.Obje// note that arg order is path1, path2, regardless of src/dstpath1, path2 := b.resyncWhichIsWhich(src, dst)if timeDiffers(ctxNoLogger, path1.ModTime(ctxNoLogger), path2.ModTime(ctxNoLogger), path1.Fs(), path2.Fs()) {- winningPath := b.resolveNewerOlder(path1.ModTime(ctxNoLogger), path2.ModTime(ctxNoLogger), path1.Remote(), path2.Remote(), b.opt.ResyncMode)+ winningPath := b.resolveNewerOlder(path1.ModTime(ctxNoLogger), path2.ModTime(ctxNoLogger), path1.Remote(), b.opt.ResyncMode)// if src is winner, proceed with equal to check size/hash and possibly just update dest modtime instead of transferringif !b.resyncWinningPathToEqual(winningPath) {return operations.Equal(ctxNoLogger, src, dst), false // note we're back to src/dst, not path1/path2diff --git a/cmd/bisync/listing.go b/cmd/bisync/listing.goindex 02f332a77..1853eecb5 100644--- a/cmd/bisync/listing.go+++ b/cmd/bisync/listing.go@@ -247,7 +247,7 @@ func (ls *fileList) sort() {}// save will save listing to a file.-func (ls *fileList) save(ctx context.Context, listing string) error {+func (ls *fileList) save(listing string) error {file, err := os.Create(listing)if err != nil {return err@@ -712,9 +712,9 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, resb.debug(b.DebugName, fmt.Sprintf("%s pre-save dstList has it?: %v", direction, dstList.has(b.DebugName)))}// update files- err = srcList.save(ctx, srcListing)+ err = srcList.save(srcListing)b.handleErr(srcList, "error saving srcList from modifyListing", err, true, true)- err = dstList.save(ctx, dstListing)+ err = dstList.save(dstListing)b.handleErr(dstList, "error saving dstList from modifyListing", err, true, true)return errdiff --git a/cmd/bisync/march.go b/cmd/bisync/march.goindex d2a3ecae9..10e22dc38 100644--- a/cmd/bisync/march.go+++ b/cmd/bisync/march.go@@ -60,9 +60,9 @@ func (b *bisyncRun) makeMarchListing(ctx context.Context) (*fileList, *fileList,if b.opt.Compare.DownloadHash && b.march.ls2.hash == hash.None {b.march.ls2.hash = hash.MD5}- b.march.err = b.march.ls1.save(ctx, b.newListing1)+ b.march.err = b.march.ls1.save(b.newListing1)b.handleErr(b.march.ls1, "error saving b.march.ls1 from march", b.march.err, true, true)- b.march.err = b.march.ls2.save(ctx, b.newListing2)+ b.march.err = b.march.ls2.save(b.newListing2)b.handleErr(b.march.ls2, "error saving b.march.ls2 from march", b.march.err, true, true)return b.march.ls1, b.march.ls2, b.march.errdiff --git a/cmd/bisync/operations.go b/cmd/bisync/operations.goindex e458fff60..5041e7109 100644--- a/cmd/bisync/operations.go+++ b/cmd/bisync/operations.go@@ -97,7 +97,7 @@ func Bisync(ctx context.Context, fs1, fs2 fs.Fs, optArg *Options) (err error) {b.setResyncDefaults()- err = b.setResolveDefaults(ctx)+ err = b.setResolveDefaults()if err != nil {return err}@@ -271,7 +271,7 @@ func (b *bisyncRun) runLocked(octx context.Context) (err error) {// Generate Path1 and Path2 listings and copy any unique Path2 files to Path1if opt.Resync {- return b.resync(octx, fctx)+ return b.resync(fctx)}// Check for existence of prior Path1 and Path2 listingsdiff --git a/cmd/bisync/resolve.go b/cmd/bisync/resolve.goindex d40ddb5e6..0263201e2 100644--- a/cmd/bisync/resolve.go+++ b/cmd/bisync/resolve.go@@ -77,7 +77,7 @@ func (conflictLoserChoices) Type() string {// ConflictLoserList is a list of --conflict-loser flag choices used in the helpvar ConflictLoserList = Opt.ConflictLoser.Help()-func (b *bisyncRun) setResolveDefaults(ctx context.Context) error {+func (b *bisyncRun) setResolveDefaults() error {if b.opt.ConflictLoser == ConflictLoserSkip {b.opt.ConflictLoser = ConflictLoserNumber}@@ -197,7 +197,7 @@ func (b *bisyncRun) resolve(ctxMove context.Context, path1, path2, file, alias s// note also that deletes and renames are mutually exclusive -- we never delete one path and rename the other.if b.opt.ConflictLoser == ConflictLoserDelete && winningPath == 1 {// delete 2, copy 1 to 2- err = b.delete(ctxMove, r.path2, path2, path1, b.fs2, 2, 1, renameSkipped)+ err = b.delete(ctxMove, r.path2, path2, b.fs2, 2, renameSkipped)if err != nil {return err}@@ -207,7 +207,7 @@ func (b *bisyncRun) resolve(ctxMove context.Context, path1, path2, file, alias scopy1to2.Add(r.path1.oldName)} else if b.opt.ConflictLoser == ConflictLoserDelete && winningPath == 2 {// delete 1, copy 2 to 1- err = b.delete(ctxMove, r.path1, path1, path2, b.fs1, 1, 2, renameSkipped)+ err = b.delete(ctxMove, r.path1, path1, b.fs1, 1, renameSkipped)if err != nil {return err}@@ -321,7 +321,7 @@ func (b *bisyncRun) rename(ctx context.Context, thisNamePair namePair, thisPath,return nil}-func (b *bisyncRun) delete(ctx context.Context, thisNamePair namePair, thisPath, thatPath string, thisFs fs.Fs, thisPathNum, thatPathNum int, renameSkipped *bilib.Names) (err error) {+func (b *bisyncRun) delete(ctx context.Context, thisNamePair namePair, thisPath string, thisFs fs.Fs, thisPathNum int, renameSkipped *bilib.Names) (err error) {skip := operations.SkipDestructive(ctx, thisNamePair.oldName, "delete")if !skip {b.indent(fmt.Sprintf("!Path%d", thisPathNum), thisPath+thisNamePair.oldName, fmt.Sprintf("Deleting Path%d copy", thisPathNum))@@ -359,17 +359,17 @@ func (b *bisyncRun) conflictWinner(ds1, ds2 *deltaSet, remote1, remote2 string)return 2case PreferNewer, PreferOlder:t1, t2 := ds1.time[remote1], ds2.time[remote2]- return b.resolveNewerOlder(t1, t2, remote1, remote2, b.opt.ConflictResolve)+ return b.resolveNewerOlder(t1, t2, remote1, b.opt.ConflictResolve)case PreferLarger, PreferSmaller:s1, s2 := ds1.size[remote1], ds2.size[remote2]- return b.resolveLargerSmaller(s1, s2, remote1, remote2, b.opt.ConflictResolve)+ return b.resolveLargerSmaller(s1, s2, remote1, b.opt.ConflictResolve)default:return 0}}// returns the winning path number, or 0 if winner can't be determined-func (b *bisyncRun) resolveNewerOlder(t1, t2 time.Time, remote1, remote2 string, prefer Prefer) int {+func (b *bisyncRun) resolveNewerOlder(t1, t2 time.Time, remote1 string, prefer Prefer) int {if fs.GetModifyWindow(b.octx, b.fs1, b.fs2) == fs.ModTimeNotSupported {fs.Infof(remote1, "Winner cannot be determined as at least one path lacks modtime support.")return 0@@ -404,7 +404,7 @@ func (b *bisyncRun) resolveNewerOlder(t1, t2 time.Time, remote1, remote2 string,}// returns the winning path number, or 0 if winner can't be determined-func (b *bisyncRun) resolveLargerSmaller(s1, s2 int64, remote1, remote2 string, prefer Prefer) int {+func (b *bisyncRun) resolveLargerSmaller(s1, s2 int64, remote1 string, prefer Prefer) int {if s1 < 0 || s2 < 0 {fs.Infof(remote1, "Winner cannot be determined as at least one size is unknown. Path1: %v, Path2: %v", s1, s2)return 0diff --git a/cmd/bisync/resync.go b/cmd/bisync/resync.goindex 6df61089a..33565db1d 100644--- a/cmd/bisync/resync.go+++ b/cmd/bisync/resync.go@@ -41,18 +41,18 @@ func (b *bisyncRun) setResyncDefaults() {// It will generate path1 and path2 listings,// copy any unique files to the opposite path,// and resolve any differing files according to the --resync-mode.-func (b *bisyncRun) resync(octx, fctx context.Context) (err error) {+func (b *bisyncRun) resync(fctx context.Context) (err error) {fs.Infof(nil, "Copying Path2 files to Path1")// Save blank filelists (will be filled from sync results)ls1 := newFileList()ls2 := newFileList()- err = ls1.save(fctx, b.newListing1)+ err = ls1.save(b.newListing1)if err != nil {b.handleErr(ls1, "error saving ls1 from resync", err, true, true)b.abort = true}- err = ls2.save(fctx, b.newListing2)+ err = ls2.save(b.newListing2)if err != nil {b.handleErr(ls2, "error saving ls2 from resync", err, true, true)b.abort = true