suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional checks for stopped sync

Browse Source
This commit is contained in:
Dan Stillman 2017-07-07 19:05:22 -04:00
parent 043c0ac6b7
commit 2ba773d612
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chrome/content/zotero/xpcom/sync/syncEngine.js
View File

@ -131,6 +131,9 @@ Zotero.Sync.Data.Engine.prototype.start = Zotero.Promise.coroutine(function* ()
uploadResult = yield this._startUpload(); uploadResult = yield this._startUpload();
} }
catch (e) { catch (e) {
if (e instanceof Zotero.Sync.UserCancelledException) {
throw e;
}
Zotero.debug("Upload failed -- performing download", 2); Zotero.debug("Upload failed -- performing download", 2);
downloadResult = yield this._startDownload(); downloadResult = yield this._startDownload();
Zotero.debug("Download result is " + downloadResult, 4); Zotero.debug("Download result is " + downloadResult, 4);
@ -224,6 +227,8 @@ Zotero.Sync.Data.Engine.prototype._startDownload = Zotero.Promise.coroutine(func
loop: loop:
while (true) { while (true) {
this._statusCheck();
// Get synced settings first, since they affect how other data is displayed // Get synced settings first, since they affect how other data is displayed
let results = yield this._downloadSettings(libraryVersion); let results = yield this._downloadSettings(libraryVersion);
if (results.result == this.DOWNLOAD_RESULT_LIBRARY_UNMODIFIED) { if (results.result == this.DOWNLOAD_RESULT_LIBRARY_UNMODIFIED) {
@ -1119,6 +1124,8 @@ Zotero.Sync.Data.Engine.prototype._uploadObjects = Zotero.Promise.coroutine(func
try { try {
while (queue.length) { while (queue.length) {
this._statusCheck();
// Get a slice of the queue and generate JSON for objects if necessary // Get a slice of the queue and generate JSON for objects if necessary
let batch = []; let batch = [];
let numSkipped = 0; let numSkipped = 0;
@ -1556,6 +1563,8 @@ Zotero.Sync.Data.Engine.prototype._fullSync = Zotero.Promise.coroutine(function*
loop: loop:
while (true) { while (true) {
this._statusCheck();
// Reprocess all deletions available from API // Reprocess all deletions available from API
let result = yield this._downloadDeletions(0, lastLibraryVersion); let result = yield this._downloadDeletions(0, lastLibraryVersion);
if (result == this.DOWNLOAD_RESULT_RESTART) { if (result == this.DOWNLOAD_RESULT_RESTART) {