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

Update Zotero.Sync.Storage.QueueManager.start() for async item.clone()

Browse Source 
Via _reconcileConflicts()
This commit is contained in:
Dan Stillman 2015-03-18 22:41:46 -04:00
parent bb3496dfa8
commit 304f46c8cc
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
chrome/content/zotero/xpcom/storage/queueManager.js
View File

@ -28,7 +28,7 @@ Zotero.Sync.Storage.QueueManager = new function () {
var _queues = {};
var _currentQueues = [];
this.start = function (libraryID) {
this.start = Zotero.Promise.coroutine(function* (libraryID) {
if (libraryID) {
var queues = this.getAll(libraryID);
var suffix = " for library " + libraryID;
@ -53,27 +53,27 @@ Zotero.Sync.Storage.QueueManager = new function () {
Zotero.debug("No files to sync" + suffix);
}
return Zotero.Promise.allSettled(promises)
.then(function (results) {
Zotero.debug("All storage queues are finished" + suffix);
results.forEach(function (result) {
// Check for conflicts to resolve
if (result.state == "fulfilled") {
result = result.value;
if (result.conflicts.length) {
Zotero.debug("Reconciling conflicts for library " + result.libraryID);
Zotero.debug(result.conflicts);
var data = _reconcileConflicts(result.conflicts);
if (data) {
_processMergeData(data);
}
var results = yield Zotero.Promise.allSettled(promises);
Zotero.debug("All storage queues are finished" + suffix);
for (let i = 0; i < results.length; i++) {
let result = results[i];
// Check for conflicts to resolve
if (result.state == "fulfilled") {
result = result.value;
if (result.conflicts.length) {
Zotero.debug("Reconciling conflicts for library " + result.libraryID);
Zotero.debug(result.conflicts);
var data = yield _reconcileConflicts(result.conflicts);
if (data) {
_processMergeData(data);
}
}
});
return promises;
});
};
}
}
return promises;
});
this.stop = function (libraryID) {
if (libraryID) {