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

Asyncify Zotero.Translate.ItemGetter.prototype.setCollection()/setAll()

Browse source 
And some of the calling functions, but there's a lot more to do.

Addresses #520 and #734
This commit is contained in:
Dan Stillman 2016-02-11 04:19:04 -05:00
parent ad0d6765d7
commit 7c41618a42
2 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
chrome/content/zotero/xpcom/translation/translate.js
View file

@ -370,7 +370,8 @@ Zotero.Translate.Sandbox = {
var translator = translation.translator[0]; var translator = translation.translator[0];
translator = typeof translator === "object" ? translator : Zotero.Translators.get(translator); translator = typeof translator === "object" ? translator : Zotero.Translators.get(translator);
translation._loadTranslator(translator).then(function() { translation._loadTranslator(translator)
.then(function() {
if(Zotero.isFx && !Zotero.isBookmarklet) { if(Zotero.isFx && !Zotero.isBookmarklet) {
// do same origin check // do same origin check
var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"] var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
@ -392,7 +393,9 @@ Zotero.Translate.Sandbox = {
} }
} }
translation._prepareTranslation(); return translation._prepareTranslation();
})
.then(function () {
setDefaultHandlers(translate, translation); setDefaultHandlers(translate, translation);
sandbox = translation._sandboxManager.sandbox; sandbox = translation._sandboxManager.sandbox;
if(!Zotero.Utilities.isEmpty(sandbox.exports)) { if(!Zotero.Utilities.isEmpty(sandbox.exports)) {
@ -1252,12 +1255,14 @@ Zotero.Translate.Base.prototype = {
/** /**
* Called when translator has been retrieved and loaded * Called when translator has been retrieved and loaded
*/ */
"_translateTranslatorLoaded":function() { "_translateTranslatorLoaded": Zotero.Promise.coroutine(function* () {
// set display options to default if they don't exist // set display options to default if they don't exist
if(!this._displayOptions) this._displayOptions = this._translatorInfo.displayOptions || {}; if(!this._displayOptions) this._displayOptions = this._translatorInfo.displayOptions || {};
// prepare translation // prepare translation
this._prepareTranslation(); this.incrementAsyncProcesses("Zotero.Translate#prepareTranslation()");
yield this._prepareTranslation();
this.decrementAsyncProcesses("Zotero.Translate#prepareTranslation()");
Zotero.debug("Translate: Beginning translation with "+this.translator[0].label); Zotero.debug("Translate: Beginning translation with "+this.translator[0].label);
@ -1272,7 +1277,7 @@ Zotero.Translate.Base.prototype = {
} }
this.decrementAsyncProcesses("Zotero.Translate#translate()"); this.decrementAsyncProcesses("Zotero.Translate#translate()");
}, }),
/** /**
* Return the progress of the import operation, or null if progress cannot be determined * Return the progress of the import operation, or null if progress cannot be determined
@ -1773,7 +1778,7 @@ Zotero.Translate.Base.prototype = {
/** /**
* No-op for preparing translation * No-op for preparing translation
*/ */
"_prepareTranslation":function() {} "_prepareTranslation": function () { return Zotero.Promise.resolve(); }
} }
/** /**
@ -1860,7 +1865,7 @@ Zotero.Translate.Web.prototype._getParameters = function() {
/** /**
* Prepare translation * Prepare translation
*/ */
Zotero.Translate.Web.prototype._prepareTranslation = function() { Zotero.Translate.Web.prototype._prepareTranslation = Zotero.Promise.method(function () {
this._itemSaver = new Zotero.Translate.ItemSaver({ this._itemSaver = new Zotero.Translate.ItemSaver({
"libraryID":this._libraryID, "libraryID":this._libraryID,
"collections": this._collections, "collections": this._collections,
@ -1870,7 +1875,7 @@ Zotero.Translate.Web.prototype._prepareTranslation = function() {
"baseURI":this.location "baseURI":this.location
}); });
this.newItems = []; this.newItems = [];
} });
/** /**
* Overload translate to set selectedItems * Overload translate to set selectedItems
@ -2171,7 +2176,7 @@ Zotero.Translate.Import.prototype._loadTranslatorPrepareIO = function(translator
/** /**
* Prepare translation * Prepare translation
*/ */
Zotero.Translate.Import.prototype._prepareTranslation = function() { Zotero.Translate.Import.prototype._prepareTranslation = Zotero.Promise.method(function () {
this._progress = undefined; this._progress = undefined;
var baseURI = null; var baseURI = null;
@ -2190,7 +2195,7 @@ Zotero.Translate.Import.prototype._prepareTranslation = function() {
}); });
this.newItems = []; this.newItems = [];
this.newCollections = []; this.newCollections = [];
} });
/** /**
* Return the progress of the import operation, or null if progress cannot be determined * Return the progress of the import operation, or null if progress cannot be determined
@ -2296,7 +2301,7 @@ Zotero.Translate.Export.prototype.getTranslators = function() {
/** /**
* Does the actual export, after code has been loaded and parsed * Does the actual export, after code has been loaded and parsed
*/ */
Zotero.Translate.Export.prototype._prepareTranslation = function() { Zotero.Translate.Export.prototype._prepareTranslation = Zotero.Promise.coroutine(function* () {
this._progress = undefined; this._progress = undefined;
// initialize ItemGetter // initialize ItemGetter
@ -2309,13 +2314,13 @@ Zotero.Translate.Export.prototype._prepareTranslation = function() {
getCollections = configOptions.getCollections || false; getCollections = configOptions.getCollections || false;
switch (this._export.type) { switch (this._export.type) {
case 'collection': case 'collection':
this._itemGetter.setCollection(this._export.collection, getCollections); yield this._itemGetter.setCollection(this._export.collection, getCollections);
break; break;
case 'items': case 'items':
this._itemGetter.setItems(this._export.items); this._itemGetter.setItems(this._export.items);
break; break;
case 'library': case 'library':
this._itemGetter.setAll(this._export.id, getCollections); yield this._itemGetter.setAll(this._export.id, getCollections);
break; break;
default: default:
throw new Error('No export set up'); throw new Error('No export set up');
@ -2344,7 +2349,7 @@ Zotero.Translate.Export.prototype._prepareTranslation = function() {
} }
this._sandboxManager.importObject(this._io); this._sandboxManager.importObject(this._io);
} });
/** /**
* Overload Zotero.Translate.Base#translate to make sure that * Overload Zotero.Translate.Base#translate to make sure that

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

@ -657,45 +657,36 @@ Zotero.Translate.ItemGetter.prototype = {
this.numItems = this._itemsLeft.length; this.numItems = this._itemsLeft.length;
}, },
"setCollection":function(collection, getChildCollections) { "setCollection": Zotero.Promise.coroutine(function* (collection, getChildCollections) {
// get items in this collection // get items in this collection
var haveItems = {}; yield collection.loadChildItems();
this._itemsLeft = collection.getChildItems(); var items = new Set(collection.getChildItems());
for each(var item in this._itemsLeft) haveItems[item.id] = true;
if(!this._itemsLeft) {
this._itemsLeft = [];
}
if(getChildCollections) { if(getChildCollections) {
// get child collections // get child collections
this._collectionsLeft = Zotero.getCollections(collection.id, true); // TODO: Replace with Zotero.Collections.getByParent() this._collectionsLeft = yield Zotero.Collections.getByParent(collection.id, true);
// get items in child collections // get items in child collections
for each(var collection in this._collectionsLeft) { for (let collection of this._collectionsLeft) {
yield collection.loadChildItems();
var childItems = collection.getChildItems(); var childItems = collection.getChildItems();
if(childItems) { childItems.forEach(item => items.add(item));
for each(var item in childItems) {
if(!haveItems[item.id]) {
haveItems[item.id] = true;
this._itemsLeft.push(item);;
}
}
}
} }
} }
this._itemsLeft = Array.from(items.values);
this.numItems = this._itemsLeft.length; this.numItems = this._itemsLeft.length;
}, }),
"setAll": function (libraryID, getChildCollections) { "setAll": Zotero.Promise.coroutine(function* (libraryID, getChildCollections) {
this._itemsLeft = Zotero.Items.getAll(libraryID, true); this._itemsLeft = yield Zotero.Items.getAll(libraryID, true);
if(getChildCollections) { if(getChildCollections) {
this._collectionsLeft = Zotero.getCollections(null, true, libraryID); // TODO: Replace with Zotero.Collections.getByLibrary() this._collectionsLeft = yield Zotero.Collections.getByLibrary(libraryID, true);
} }
this.numItems = this._itemsLeft.length; this.numItems = this._itemsLeft.length;
}, }),
"exportFiles":function(dir, extension) { "exportFiles":function(dir, extension) {
// generate directory // generate directory