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

Use coroutine() in Zotero.Sync.Data.Engine::_downloadObjects()

Browse source
This commit is contained in:
Dan Stillman 2017-05-05 00:29:12 -04:00
parent 7a839e19a6
commit ad9c2ed36c
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -501,7 +501,7 @@ Zotero.Sync.Data.Engine.prototype._downloadObjects = Zotero.Promise.coroutine(fu
// Process batches when they're available, one at a time
yield Zotero.Promise.map(
json,
function (batch) {
Zotero.Promise.coroutine(function* (batch) {
this._failedCheck();
Zotero.debug(`Processing batch of downloaded ${objectTypePlural} in `
@ -520,7 +520,7 @@ Zotero.Sync.Data.Engine.prototype._downloadObjects = Zotero.Promise.coroutine(fu
});
// Process objects
return Zotero.Sync.Data.Local.processObjectsFromJSON(
let results = yield Zotero.Sync.Data.Local.processObjectsFromJSON(
objectType,
this.libraryID,
batch,
@ -546,28 +546,27 @@ Zotero.Sync.Data.Engine.prototype._downloadObjects = Zotero.Promise.coroutine(fu
return Math.min(size, batch.length);
}
})
)
.then(function (results) {
num += results.length;
let processedKeys = [];
let conflictResults = [];
results.forEach(x => {
// If data was processed, remove JSON
if (x.processed) {
delete objectData[x.key];
}
// If object shouldn't be retried, mark as processed
if (x.processed || !x.retry) {
processedKeys.push(x.key);
}
if (x.conflict) {
conflictResults.push(x);
}
});
keys = Zotero.Utilities.arrayDiff(keys, processedKeys);
conflicts.push(...conflictResults);
}.bind(this));
}.bind(this),
);
num += results.length;
let processedKeys = [];
let conflictResults = [];
results.forEach(x => {
// If data was processed, remove JSON
if (x.processed) {
delete objectData[x.key];
}
// If object shouldn't be retried, mark as processed
if (x.processed || !x.retry) {
processedKeys.push(x.key);
}
if (x.conflict) {
conflictResults.push(x);
}
});
keys = Zotero.Utilities.arrayDiff(keys, processedKeys);
conflicts.push(...conflictResults);
}.bind(this)),
{
concurrency: 1
}