mirror of
https://github.com/zotero/zotero.git
synced 2026-10-03 02:21:49 +00:00
Migrate Zotero.Promise methods in storageEngine.js
This commit is contained in:
parent
1f433df0b1
commit
842ddcd633
1 changed files with 7 additions and 5 deletions
|
|
@ -223,13 +223,15 @@ Zotero.Sync.Storage.Engine.prototype.start = async function () {
|
|||
var downloadSuccessful = false;
|
||||
var changes = new Zotero.Sync.Storage.Result;
|
||||
for (let type of ['download', 'upload']) {
|
||||
let results = await promises[type];
|
||||
let resultPromises = await promises[type];
|
||||
let succeeded = 0;
|
||||
let failed = 0;
|
||||
|
||||
for (let p of results) {
|
||||
let results = [];
|
||||
|
||||
for (let p of resultPromises) {
|
||||
try {
|
||||
await p;
|
||||
results.push(await p);
|
||||
succeeded++;
|
||||
}
|
||||
catch (e) {
|
||||
|
|
@ -249,13 +251,13 @@ Zotero.Sync.Storage.Engine.prototype.start = async function () {
|
|||
Zotero.debug(`File ${type} sync finished for ${this.library.name} `
|
||||
+ `(${succeeded} succeeded, ${failed} failed)`);
|
||||
|
||||
changes.updateFromResults(results.filter(p => p.isFulfilled()).map(p => p.value()));
|
||||
changes.updateFromResults(results);
|
||||
|
||||
if (type == 'download'
|
||||
// Not stopped
|
||||
&& this.requestsRemaining == 0
|
||||
// No errors
|
||||
&& results.every(p => !p.isRejected())) {
|
||||
&& failed === 0) {
|
||||
downloadSuccessful = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue