www

commit 38330e4c137ec5b1573ef38d46e31db661315020
parent bff7cee374497389689753e3a92a1467f2953bfc
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 28 Mar 2018 08:45:46 -0400

Support target selector sessions for /connector/import

Diffstat:
M
chrome/content/zotero/xpcom/server_connector.js
 | 
22
+++++++++++++++++-----

1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/server_connector.js b/chrome/content/zotero/xpcom/server_connector.js
@@ -850,29 +850,41 @@ Zotero.Server.Connector.Import.prototype = {
 	supportedDataTypes: '*',
 	permitBookmarklet: false,
 	
-	init: Zotero.Promise.coroutine(function* (options) {
+	init: async function (options) {
 		let translate = new Zotero.Translate.Import();
 		translate.setString(options.data);
-		let translators = yield translate.getTranslators();
+		let translators = await translate.getTranslators();
 		if (!translators || !translators.length) {
 			return 400;
 		}
 		translate.setTranslator(translators[0]);
 		var { library, collection, editable } = Zotero.Server.Connector.getSaveTarget();
+		var libraryID = library.libraryID;
 		if (!library.editable) {
 			Zotero.logError("Can't import into read-only library " + library.name);
 			return [500, "application/json", JSON.stringify({ libraryEditable: false })];
 		}
-		let items = yield translate.translate({
-			libraryID: library.libraryID,
+		
+		try {
+			var session = Zotero.Server.Connector.SessionManager.create(options.query.session);
+		}
+		catch (e) {
+			return [409, "application/json", JSON.stringify({ error: "SESSION_EXISTS" })];
+		}
+		await session.update(libraryID, collection ? collection.id : false);
+		
+		let items = await translate.translate({
+			libraryID,
 			collections: collection ? [collection.id] : null,
 			// Import translation skips selection by default, so force it to occur
 			saveOptions: {
 				skipSelect: false
 			}
 		});
+		session.addItems(items);
+		
 		return [201, "application/json", JSON.stringify(items)];
-	})
+	}
 }
 
 /**