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

Restore progress for attachments indication in connectors

Browse source 
78b1d2e regression
This commit is contained in:
Adomas Venčkauskas 2017-04-07 13:25:09 +03:00
parent d8fed09578
commit 406f50a3fd
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/xpcom/server_connector.js
View file

@ -387,10 +387,11 @@ Zotero.Server.Connector.SaveItem.prototype = {
proxy proxy
}); });
try { try {
let items = yield itemSaver.saveItems( var deferred = Zotero.Promise.defer();
itemSaver.saveItems(
data.items, data.items,
Zotero.Server.Connector.AttachmentProgressManager.onProgress Zotero.Server.Connector.AttachmentProgressManager.onProgress,
); function() {
// Remove attachments not being saved from item.attachments // Remove attachments not being saved from item.attachments
for(var i=0; i<data.items.length; i++) { for(var i=0; i<data.items.length; i++) {
var item = data.items[i]; var item = data.items[i];
@ -401,7 +402,10 @@ Zotero.Server.Connector.SaveItem.prototype = {
} }
} }
return [201, "application/json", JSON.stringify({items: data.items})]; deferred.resolve([201, "application/json", JSON.stringify({items: data.items})]);
}
);
return deferred.promise;
} }
catch (e) { catch (e) {
Zotero.logError(e); Zotero.logError(e);

6
chrome/content/zotero/xpcom/translation/translate_item.js
View file

@ -81,8 +81,10 @@ Zotero.Translate.ItemSaver.prototype = {
* @param {Function} [attachmentCallback] A callback that receives information about attachment * @param {Function} [attachmentCallback] A callback that receives information about attachment
* save progress. The callback will be called as attachmentCallback(attachment, false, error) * save progress. The callback will be called as attachmentCallback(attachment, false, error)
* on failure or attachmentCallback(attachment, progressPercent) periodically during saving. * on failure or attachmentCallback(attachment, progressPercent) periodically during saving.
* @param {Function} [itemsDoneCallback] A callback that is called once all top-level items are
* done saving with a list of items. Will include saved notes, but exclude attachments.
*/ */
saveItems: Zotero.Promise.coroutine(function* (items, attachmentCallback) { saveItems: Zotero.Promise.coroutine(function* (items, attachmentCallback, itemsDoneCallback) {
let newItems = [], standaloneAttachments = [], childAttachments = []; let newItems = [], standaloneAttachments = [], childAttachments = [];
yield Zotero.DB.executeTransaction(function* () { yield Zotero.DB.executeTransaction(function* () {
for (let iitem=0; iitem<items.length; iitem++) { for (let iitem=0; iitem<items.length; iitem++) {
@ -160,6 +162,8 @@ Zotero.Translate.ItemSaver.prototype = {
} }
}.bind(this)); }.bind(this));
itemsDoneCallback(newItems.splice());
// Handle attachments outside of the transaction, because they can involve downloading // Handle attachments outside of the transaction, because they can involve downloading
for (let item of standaloneAttachments) { for (let item of standaloneAttachments) {
let newItem = yield this._saveAttachment(item, null, attachmentCallback); let newItem = yield this._saveAttachment(item, null, attachmentCallback);