www

commit 697937a72c08907224b187b0b00f8ef662295b48
parent c443559c9cc88475863c8f6c68cb397188311497
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu,  4 May 2017 02:04:47 -0400

Make file sync timestamp comparison a little more lenient

There was a report [1] of slow file syncing that showed all file
timestamps being reported as ending with 020 (e.g., 1436492361020). The
previous code assumed that systems without millisecond precision would
report as whole seconds, so the timestamp checks weren't matching and it
was moving on to hash-based checks (which seemed to be taking a very
long time, but that's another matter). This changes the comparison so
that, as long as both timestamps floor to the same whole second, they'll
be considered equal.

[1] https://forums.zotero.org/discussion/65515/5-0-beta-sync-problem

Diffstat:
M
chrome/content/zotero/xpcom/storage/storageLocal.js
 | 
8
++------

1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/chrome/content/zotero/xpcom/storage/storageLocal.js b/chrome/content/zotero/xpcom/storage/storageLocal.js
@@ -415,17 +415,13 @@ Zotero.Sync.Storage.Local = {
 		}
 		// Compare floored timestamps for filesystems that don't support millisecond
 		// precision (e.g., HFS+)
-		else if (Math.floor(mtime / 1000) * 1000 == fmtime
-				|| Math.floor(fmtime / 1000) * 1000 == mtime) {
+		else if (Math.floor(mtime / 1000) == Math.floor(fmtime / 1000)) {
 			Zotero.debug(`File mod times for ${libraryKey} are within one-second precision `
 				+ "(" + fmtime + " \u2248 " + mtime + ") -- skipping");
 		}
 		// Allow timestamp to be exactly one hour off to get around time zone issues
 		// -- there may be a proper way to fix this
-		else if (Math.abs(fmtime - mtime) == 3600000
-				// And check with one-second precision as well
-				|| Math.abs(fmtime - Math.floor(mtime / 1000) * 1000) == 3600000
-				|| Math.abs(Math.floor(fmtime / 1000) * 1000 - mtime) == 3600000) {
+		else if (Math.abs(Math.floor(fmtime / 1000) - Math.floor(mtime / 1000)) == 3600) {
 			Zotero.debug(`File mod time (${fmtime}) for {$libraryKey} is exactly one hour off `
 				+ `remote file (${mtime}) -- assuming time zone issue and skipping`);
 		}