mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Skip extra sync download after some conflicts

Browse source 
If an upload fails with a 412, and then we download, and then we go to
upload but there was nothing to upload (e.g., because the remote version
was chosen or there was an error saving it), there's no reason to do a
download again after that.
This commit is contained in:
Dan Stillman 2021-02-07 16:38:14 -05:00
parent 61e29aa8eb
commit 254695f4b3
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/sync/syncEngine.js
View file

@ -133,6 +133,7 @@ Zotero.Sync.Data.Engine.prototype.start = Zotero.Promise.coroutine(function* ()
this.downloadDelayGenerator = null;
var autoReset = false;
var skipDownload = false;
sync:
while (true) {
@ -173,6 +174,9 @@ Zotero.Sync.Data.Engine.prototype.start = Zotero.Promise.coroutine(function* ()
break;
case this.UPLOAD_RESULT_NOTHING_TO_UPLOAD:
if (skipDownload) {
break sync;
}
downloadResult = yield this._startDownload();
Zotero.debug("Download result is " + downloadResult, 4);
if (downloadResult == this.DOWNLOAD_RESULT_CHANGES_TO_UPLOAD) {
@ -198,6 +202,10 @@ Zotero.Sync.Data.Engine.prototype.start = Zotero.Promise.coroutine(function* ()
downloadResult = yield this._startDownload();
Zotero.debug("Download result is " + downloadResult, 4);
// No need to download again after the upload
if (downloadResult !== this.DOWNLOAD_RESULT_RESTART) {
skipDownload = true;
}
break;
case this.UPLOAD_RESULT_RESTART: