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

Don't initialize storage requests until they start

Browse Source
This commit is contained in:
Dan Stillman 2017-08-06 17:50:05 +02:00
parent 55992e341d
commit 9920a845c6
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
chrome/content/zotero/xpcom/storage/storageEngine.js
View File

@ -293,17 +293,13 @@ Zotero.Sync.Storage.Engine.prototype.queueItem = Zotero.Promise.coroutine(functi
case Zotero.Sync.Storage.Local.SYNC_STATE_TO_DOWNLOAD: case Zotero.Sync.Storage.Local.SYNC_STATE_TO_DOWNLOAD:
case Zotero.Sync.Storage.Local.SYNC_STATE_FORCE_DOWNLOAD: case Zotero.Sync.Storage.Local.SYNC_STATE_FORCE_DOWNLOAD:
var type = 'download'; var type = 'download';
var onStart = Zotero.Promise.method(function (request) { var fn = 'downloadFile';
return this.controller.downloadFile(request);
}.bind(this));
break; break;
case Zotero.Sync.Storage.Local.SYNC_STATE_TO_UPLOAD: case Zotero.Sync.Storage.Local.SYNC_STATE_TO_UPLOAD:
case Zotero.Sync.Storage.Local.SYNC_STATE_FORCE_UPLOAD: case Zotero.Sync.Storage.Local.SYNC_STATE_FORCE_UPLOAD:
var type = 'upload'; var type = 'upload';
var onStart = Zotero.Promise.method(function (request) { var fn = 'uploadFile';
return this.controller.uploadFile(request);
}.bind(this));
break; break;
case false: case false:
@ -314,18 +310,20 @@ Zotero.Sync.Storage.Engine.prototype.queueItem = Zotero.Promise.coroutine(functi
throw new Error("Invalid sync state " + item.attachmentSyncState); throw new Error("Invalid sync state " + item.attachmentSyncState);
} }
var request = new Zotero.Sync.Storage.Request({
type,
libraryID: this.libraryID,
name: item.libraryKey,
onStart,
onProgress: this.onProgress
});
if (type == 'upload') { if (type == 'upload') {
if (!(yield item.fileExists())) { if (!(yield item.fileExists())) {
Zotero.debug("File " + item.libraryKey + " not yet available to upload -- skipping"); Zotero.debug("File " + item.libraryKey + " not yet available to upload -- skipping");
return; return;
} }
} }
this.queues[type].add(request.start.bind(request)); this.queues[type].add(() => {
var request = new Zotero.Sync.Storage.Request({
type,
libraryID: this.libraryID,
name: item.libraryKey,
onStart: request => this.controller[fn](request),
onProgress: this.onProgress
});
return request.start();
});
}) })