From 6f04b34d597f97ec5fa548bb4cce6947c7528e64 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 16 May 2016 18:25:35 -0400
Subject: [PATCH] Close #945, Optimize bulk reload on multi-item changes

---
 .../content/zotero/xpcom/data/dataObjects.js  | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/dataObjects.js b/chrome/content/zotero/xpcom/data/dataObjects.js
index aeb41e1b4f..b042149a92 100644
--- a/chrome/content/zotero/xpcom/data/dataObjects.js
+++ b/chrome/content/zotero/xpcom/data/dataObjects.js
@@ -654,9 +654,32 @@ Zotero.DataObjects.prototype.reload = Zotero.Promise.coroutine(function* (ids, d
 	Zotero.debug('Reloading ' + (dataTypes ? '[' + dataTypes.join(', ') + '] for ' : '')
 		+ this._ZDO_objects + ' ' + ids);
 	
-	for (let i=0; i<ids.length; i++) {
-		if (this._objectCache[ids[i]]) {
-			yield this._objectCache[ids[i]].reload(dataTypes, reloadUnchanged);
+	// If data types not specified, reload loaded data for each object individually.
+	// TODO: optimize
+	if (!dataTypes) {
+		for (let i=0; i<ids.length; i++) {
+			if (this._objectCache[ids[i]]) {
+				yield this._objectCache[ids[i]].reload(dataTypes, reloadUnchanged);
+			}
+		}
+		return;
+	}
+	
+	for (let dataType of dataTypes) {
+		let typeIDsByLibrary = {};
+		for (let id of ids) {
+			let obj = this._objectCache[id];
+			if (!obj || !obj._loaded[dataType] || obj._skipDataTypeLoad[dataType]
+					|| (!reloadUnchanged && !obj._changed[dataType])) {
+				continue;
+			}
+			if (!typeIDsByLibrary[obj.libraryID]) {
+				typeIDsByLibrary[obj.libraryID] = [];
+			}
+			typeIDsByLibrary[obj.libraryID].push(id);
+		}
+		for (let libraryID in typeIDsByLibrary) {
+			yield this._loadDataType(dataType, parseInt(libraryID), typeIDsByLibrary[libraryID]);
 		}
 	}