"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: don't convert modtime precision in listings - fixes #8025
nielash956c2963fd1d
diff --git a/cmd/bisync/listing.go b/cmd/bisync/listing.goindex 8f6d8eb19..a95029abe 100644--- a/cmd/bisync/listing.go+++ b/cmd/bisync/listing.go@@ -43,8 +43,10 @@ var lineRegex = regexp.MustCompile(`^(\S) +(-?\d+) (\S+) (\S+) (\d{4}-\d\d-\d\dTconst timeFormat = "2006-01-02T15:04:05.000000000-0700"// TZ defines time zone used in listings-var TZ = time.UTC-var tzLocal = false+var (+ TZ = time.UTC+ tzLocal = false+)// fileInfo describes a filetype fileInfo struct {@@ -83,7 +85,7 @@ func (ls *fileList) has(file string) bool {}_, found := ls.info[file]if !found {- //try unquoting+ // try unquotingfile, _ = strconv.Unquote(`"` + file + `"`)_, found = ls.info[file]}@@ -93,7 +95,7 @@ func (ls *fileList) has(file string) bool {func (ls *fileList) get(file string) *fileInfo {info, found := ls.info[file]if !found {- //try unquoting+ // try unquotingfile, _ = strconv.Unquote(`"` + file + `"`)info = ls.info[fmt.Sprint(file)]}@@ -420,7 +422,7 @@ func (b *bisyncRun) loadListingNum(listingNum int) (*fileList, error) {func (b *bisyncRun) listDirsOnly(listingNum int) (*fileList, error) {var fulllisting *fileList- var dirsonly = newFileList()+ dirsonly := newFileList()var err errorif !b.opt.CreateEmptySrcDirs {@@ -450,24 +452,6 @@ func (b *bisyncRun) listDirsOnly(listingNum int) (*fileList, error) {return dirsonly, err}-// ConvertPrecision returns the Modtime rounded to Dest's precision if lower, otherwise unchanged-// Need to use the other fs's precision (if lower) when copying-// Note: we need to use Truncate rather than Round so that After() is reliable.-// (2023-11-02 20:22:45.552679442 +0000 < UTC 2023-11-02 20:22:45.553 +0000 UTC)-func ConvertPrecision(Modtime time.Time, dst fs.Fs) time.Time {- DestPrecision := dst.Precision()-- // In case it's wrapping an Fs with lower precision, try unwrapping and use the lowest.- if Modtime.Truncate(DestPrecision).After(Modtime.Truncate(fs.UnWrapFs(dst).Precision())) {- DestPrecision = fs.UnWrapFs(dst).Precision()- }-- if Modtime.After(Modtime.Truncate(DestPrecision)) {- return Modtime.Truncate(DestPrecision)- }- return Modtime-}-// modifyListing will modify the listing based on the results of the syncfunc (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, results []Results, queues queues, is1to2 bool) (err error) {queue := queues.copy2to1@@ -533,13 +517,13 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res// build src winners listif result.IsSrc && result.Src != "" && (result.Winner.Err == nil || result.Flags == "d") {- srcWinners.put(result.Name, result.Size, ConvertPrecision(result.Modtime, src), result.Hash, "-", result.Flags)+ srcWinners.put(result.Name, result.Size, result.Modtime, result.Hash, "-", result.Flags)prettyprint(result, "winner: copy to src", fs.LogLevelDebug)}// build dst winners listif result.IsWinner && result.Winner.Side != "none" && (result.Winner.Err == nil || result.Flags == "d") {- dstWinners.put(result.Name, result.Size, ConvertPrecision(result.Modtime, dst), result.Hash, "-", result.Flags)+ dstWinners.put(result.Name, result.Size, result.Modtime, result.Hash, "-", result.Flags)prettyprint(result, "winner: copy to dst", fs.LogLevelDebug)}@@ -623,7 +607,7 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res}if srcNewName != "" { // if it was renamed and not deletedsrcList.put(srcNewName, new.size, new.time, new.hash, new.id, new.flags)- dstList.put(srcNewName, new.size, ConvertPrecision(new.time, src), new.hash, new.id, new.flags)+ dstList.put(srcNewName, new.size, new.time, new.hash, new.id, new.flags)}if srcNewName != srcOldName {srcList.remove(srcOldName)diff --git a/docs/content/bisync.md b/docs/content/bisync.mdindex c51030df1..8f0bf4883 100644--- a/docs/content/bisync.md+++ b/docs/content/bisync.md@@ -1812,6 +1812,12 @@ about _Unison_ and synchronization in general.## Changelog+### `v1.68`+* Fixed an issue affecting backends that round modtimes to a lower precision.++### `v1.67`+* Added integration tests against all backends.+### `v1.66`* Copies and deletes are now handled in one operation instead of two* `--track-renames` and `--backup-dir` are now supported