Simplify the file sync code a bit

Just call Zotero.Sync.Storage.[ZFS/WebDAV] directly

This probably breaks some things.

chrome/content/zotero/preferences/preferences.js

@@ -291,7 +291,7 @@ function updateStorageSettings(enabled, protocol, skipWarnings) {
 				var sql = "INSERT OR IGNORE INTO settings VALUES (?,?,?)";
 				Zotero.DB.query(sql, ['storage', 'zfsPurge', 'user']);
 				
-				Zotero.Sync.Storage.purgeDeletedStorageFiles('zfs', function (success) {
+				Zotero.Sync.Storage.ZFS.purgeDeletedStorageFiles(function (success) {
 					if (success) {
 						ps.alert(
 							null,
@@ -363,7 +363,7 @@ function verifyStorageServer() {
 	abortButton.hidden = false;
 	progressMeter.hidden = false;
 	
-	var requestHolder = Zotero.Sync.Storage.checkServer('WebDAV', function (uri, status, callback) {
+	var requestHolder = Zotero.Sync.Storage.WebDAV.checkServer(function (uri, status, callback) {
 		verifyButton.hidden = false;
 		abortButton.hidden = true;
 		progressMeter.hidden = true;
@@ -388,7 +388,7 @@ function verifyStorageServer() {
 				break;
 		}
 		
-		callback(uri, status, window);
+		Zotero.Sync.Storage.WebDAV.checkServerCallback(uri, status, window);
 	});
 	
 	abortButton.onclick = function () {

chrome/content/zotero/preferences/preferences.xul

@@ -157,7 +157,7 @@ To add a new preference:
 	
 	<prefpane id="zotero-prefpane-sync"
 						label="&zotero.preferences.prefpane.sync;"
-						onpaneload="document.getElementById('sync-password').value = Zotero.Sync.Server.password; document.getElementById('storage-password').value = Zotero.Sync.Storage.password;"
+						onpaneload="document.getElementById('sync-password').value = Zotero.Sync.Server.password; var pass = Zotero.Sync.Storage.WebDAV.password; if (pass) { document.getElementById('storage-password').value = pass; }"
 						image="chrome://zotero/skin/prefs-sync.png"
 						helpTopic="sync">
 		<preferences>
@@ -283,7 +283,7 @@ To add a new preference:
 											preference="pref-storage-username"
 											onkeypress="if (Zotero.isMac &amp;&amp; event.keyCode == 13) { this.blur(); setTimeout(verifyStorageServer, 1); }"
 											onsynctopreference="unverifyStorageServer();"
-											onchange="var pass = document.getElementById('storage-password'); if (pass.value) { Zotero.Sync.Storage.Session.WebDAV.prototype.password = pass.value; }"/>
+											onchange="var pass = document.getElementById('storage-password'); if (pass.value) { Zotero.Sync.Storage.WebDAV.password = pass.value; }"/>
 									</hbox>
 								</row>
 								<row>
@@ -292,7 +292,7 @@ To add a new preference:
 										<textbox id="storage-password" flex="0" type="password"
 											onkeypress="if (Zotero.isMac &amp;&amp; event.keyCode == 13) { this.blur(); setTimeout(verifyStorageServer, 1); }"
 											oninput="unverifyStorageServer()"
-											onchange="Zotero.Sync.Storage.Session.WebDAV.prototype.password = this.value"/>
+											onchange="Zotero.Sync.Storage.WebDAV.password = this.value;"/>
 									</hbox>
 								</row>
 								<row>

chrome/content/zotero/xpcom/data/relations.js

@@ -252,9 +252,13 @@ Zotero.Relations = new function () {
 			}
 			relation.libraryID = parseInt(libraryID);
 		}
-		relation.subject = _getFirstChildContent(relationNode, 'subject');
+		
-		relation.predicate = _getFirstChildContent(relationNode, 'predicate');
+		var elems = Zotero.Utilities.xpath(relationNode, 'subject');
-		relation.object = _getFirstChildContent(relationNode, 'object');
+		relation.subject = elems.length ? elems[0].textContent : "";
+		var elems = Zotero.Utilities.xpath(relationNode, 'predicate');
+		relation.predicate = elems.length ? elems[0].textContent : "";
+		var elems = Zotero.Utilities.xpath(relationNode, 'object');
+		relation.object = elems.length ? elems[0].textContent : "";
 		return relation;
 	}
 	

chrome/content/zotero/xpcom/storage.js

@@ -87,41 +87,41 @@ Zotero.Sync.Storage = new function () {
 	//
 	// Public methods
 	//
-	this.sync = function (moduleName, observer) {
+	this.sync = function (modeName, observer) {
-		var module = getModuleFromName(moduleName);
+		var mode = getModeFromName(modeName);
 		
 		if (!observer) {
 			throw new Error("Observer not provided");
 		}
-		registerDefaultObserver(moduleName);
+		registerDefaultObserver(modeName);
-		Zotero.Sync.Storage.EventManager.registerObserver(observer, true, moduleName);
+		Zotero.Sync.Storage.EventManager.registerObserver(observer, true, modeName);
 		
-		if (!module.active) {
+		if (!mode.active) {
-			if (!module.enabled) {
+			if (!mode.enabled) {
-				Zotero.debug(module.name + " file sync is not enabled");
+				Zotero.debug(mode.name + " file sync is not enabled");
 				Zotero.Sync.Storage.EventManager.skip();
 				return;
 			}
 			
-			Zotero.debug(module.name + " file sync is not active");
+			Zotero.debug(mode.name + " file sync is not active");
 			
 			// Try to verify server now if it hasn't been
-			if (!module.verified) {
+			if (!mode.verified) {
-				module.checkServer(function (uri, status) {
+				mode.checkServer(function (uri, status) {
 					var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
 								   .getService(Components.interfaces.nsIWindowMediator);
 					var lastWin = wm.getMostRecentWindow("navigator:browser");
 					
-					var success = module.checkServerCallback(uri, status, lastWin, true);
+					var success = mode.checkServerCallback(uri, status, lastWin, true);
 					if (success) {
-						Zotero.debug(module.name + " file sync is successfully set up");
+						Zotero.debug(mode.name + " file sync is successfully set up");
-						Zotero.Sync.Storage.sync(module.name);
+						Zotero.Sync.Storage.sync(mode.name);
 					}
 					else {
-						Zotero.debug(module.name + " verification failed");
+						Zotero.debug(mode.name + " verification failed");
 						
 						var e = new Zotero.Error(
-							Zotero.getString('sync.storage.error.verificationFailed', module.name),
+							Zotero.getString('sync.storage.error.verificationFailed', mode.name),
 							0,
 							{
 								dialogButtonText: Zotero.getString('sync.openSyncPreferences'),
@@ -141,8 +141,8 @@ Zotero.Sync.Storage = new function () {
 			return;
 		}
 		
-		if (!module.includeUserFiles && !module.includeGroupFiles) {
+		if (!mode.includeUserFiles && !mode.includeGroupFiles) {
-			Zotero.debug("No libraries are enabled for " + module.name + " syncing");
+			Zotero.debug("No libraries are enabled for " + mode.name + " syncing");
 			Zotero.Sync.Storage.EventManager.skip();
 			return;
 		}
@@ -153,7 +153,7 @@ Zotero.Sync.Storage = new function () {
 			);
 		}
 		
-		Zotero.debug("Beginning " + module.name + " file sync");
+		Zotero.debug("Beginning " + mode.name + " file sync");
 		_syncInProgress = true;
 		_changesMade = false;
 		
@@ -161,8 +161,8 @@ Zotero.Sync.Storage = new function () {
 			Zotero.Sync.Storage.checkForUpdatedFiles(
 				null,
 				null,
-				module.includeUserFiles && Zotero.Sync.Storage.downloadOnSync(),
+				mode.includeUserFiles && Zotero.Sync.Storage.downloadOnSync(),
-				module.includeGroupFiles && Zotero.Sync.Storage.downloadOnSync('groups')
+				mode.includeGroupFiles && Zotero.Sync.Storage.downloadOnSync('groups')
 			);
 		}
 		catch (e) {
@@ -171,14 +171,14 @@ Zotero.Sync.Storage = new function () {
 		
 		var self = this;
 		
-		module.getLastSyncTime(function (lastSyncTime) {
+		mode.getLastSyncTime(function (lastSyncTime) {
 			// Register the observers again to make sure they're active when we
 			// start the queues. (They'll only be registered once.) Observers are
 			// cleared when all queues finish, so without this another sync
 			// process (e.g., on-demand download) could finish and clear all
 			// observers while getLastSyncTime() is running.
-			registerDefaultObserver(moduleName);
+			registerDefaultObserver(modeName);
-			Zotero.Sync.Storage.EventManager.registerObserver(observer, true, moduleName);
+			Zotero.Sync.Storage.EventManager.registerObserver(observer, true, modeName);
 			
 			var download = true;
 			
@@ -186,17 +186,17 @@ Zotero.Sync.Storage = new function () {
 			var force = !!Zotero.DB.valueQuery(sql, Zotero.Sync.Storage.SYNC_STATE_FORCE_DOWNLOAD);
 			
 			if (!force && lastSyncTime) {
-				var sql = "SELECT version FROM version WHERE schema='storage_" + moduleName + "'";
+				var sql = "SELECT version FROM version WHERE schema='storage_" + modeName + "'";
 				var version = Zotero.DB.valueQuery(sql);
 				if (version == lastSyncTime) {
-					Zotero.debug("Last " + module.name + " sync time hasn't changed -- skipping file download step");
+					Zotero.debug("Last " + mode.name + " sync time hasn't changed -- skipping file download step");
 					download = false;
 				}
 			}
 			
 			try {
-				var activeDown = download ? _downloadFiles(module) : false;
+				var activeDown = download ? _downloadFiles(mode) : false;
-				var activeUp = _uploadFiles(module);
+				var activeUp = _uploadFiles(mode);
 			}
 			catch (e) {
 				Zotero.Sync.Storage.EventManager.error(e);
@@ -620,9 +620,9 @@ Zotero.Sync.Storage = new function () {
 	 */
 	this.downloadFile = function (item, requestCallbacks) {
 		var itemID = item.id;
-		var module = getModuleFromLibrary(item.libraryID);
+		var mode = getModeFromLibrary(item.libraryID);
 		
-		if (!module || !module.active) {
+		if (!mode || !mode.active) {
 			Zotero.debug("File syncing is not active for item's library -- skipping download");
 			return false;
 		}
@@ -681,7 +681,7 @@ Zotero.Sync.Storage = new function () {
 					requestCallbacks = {};
 				}
 				var onStart = function (request) {
-					module.downloadFile(request);
+					mode.downloadFile(request);
 				};
 				requestCallbacks.onStart = requestCallbacks.onStart
 											? [onStart, requestCallbacks.onStart]
@@ -699,7 +699,7 @@ Zotero.Sync.Storage = new function () {
 		};
 		
 		setup();
-		module.cacheCredentials(function () {
+		mode.cacheCredentials(function () {
 			run();
 		});
 		
@@ -820,8 +820,7 @@ Zotero.Sync.Storage = new function () {
 	}
 	
 	
-	this.checkServer = function (moduleName, callback) {
+	this.checkServer = function (modeName, callback) {
-		var module = getModuleFromName(moduleName);
 		Zotero.Sync.Storage.EventManager.registerObserver({
 			onSuccess: function () {},
 			onError: function (e) {
@@ -833,47 +832,16 @@ Zotero.Sync.Storage = new function () {
 				return true;
 			}
 		}, false, "checkServer");
-		return module.checkServer(function (uri, status) {
+		
+		var mode = getModeFromName(modeName);
+		return mode.checkServer(function (uri, status) {
 			callback(uri, status, function () {
-				module.checkServerCallback(uri, status);
+				mode.checkServerCallback(uri, status);
 			});
 		});
 	}
 	
 	
-	this.purgeDeletedStorageFiles = function (moduleName, callback) {
-		var module = getModuleFromName(moduleName);
-		if (!module.active) {
-			return;
-		}
-		Zotero.Sync.Storage.EventManager.registerObserver({
-			onError: function (e) {
-				error(e);
-			}
-		}, false, "purgeDeletedStorageFiles");
-		module.purgeDeletedStorageFiles(callback);
-	}
-	
-	
-	this.purgeOrphanedStorageFiles = function (moduleName, callback) {
-		var module = getModuleFromName(moduleName);
-		if (!module.active) {
-			return;
-		}
-		Zotero.Sync.Storage.EventManager.registerObserver({
-			onError: function (e) {
-				error(e);
-			}
-		}, false, "purgeOrphanedStorageFiles");
-		module.purgeOrphanedStorageFiles(callback);
-	}
-	
-	
-	this.isActive = function (moduleName) {
-		return getModuleFromName(moduleName).active;
-	}
-	
-	
 	this.resetAllSyncStates = function (syncState, includeUserFiles, includeGroupFiles) {
 		if (!includeUserFiles && !includeGroupFiles) {
 			includeUserFiles = true;
@@ -922,12 +890,12 @@ Zotero.Sync.Storage = new function () {
 	//
 	// Private methods
 	//
-	function getModuleFromName(moduleName) {
+	function getModeFromName(modeName) {
-		return new Zotero.Sync.Storage.Module(moduleName);
+		return Zotero.Sync.Storage[modeName];
 	}
 	
 	
-	function getModuleFromLibrary(libraryID) {
+	function getModeFromLibrary(libraryID) {
 		if (libraryID === undefined) {
 			throw new Error("libraryID not provided");
 		}
@@ -942,10 +910,10 @@ Zotero.Sync.Storage = new function () {
 			var protocol = Zotero.Prefs.get('sync.storage.protocol');
 			switch (protocol) {
 				case 'zotero':
-					return getModuleFromName('ZFS');
+					return getModeFromName('ZFS');
 				
 				case 'webdav':
-					return getModuleFromName('WebDAV');
+					return getModeFromName('WebDAV');
 				
 				default:
 					throw new Error("Invalid storage protocol '" + protocol + "'");
@@ -958,7 +926,7 @@ Zotero.Sync.Storage = new function () {
 				return false;
 			}
 			
-			return getModuleFromName('ZFS');
+			return getModeFromName('ZFS');
 		}
 	}
 	
@@ -968,13 +936,13 @@ Zotero.Sync.Storage = new function () {
 	 *
 	 * @return	{Boolean}
 	 */
-	function _downloadFiles(module) {
+	function _downloadFiles(mode) {
 		if (!_syncInProgress) {
 			_syncInProgress = true;
 		}
 		
-		var includeUserFiles = module.includeUserFiles && Zotero.Sync.Storage.downloadOnSync();
+		var includeUserFiles = mode.includeUserFiles && Zotero.Sync.Storage.downloadOnSync();
-		var includeGroupFiles = module.includeGroupFiles && Zotero.Sync.Storage.downloadOnSync('groups');
+		var includeGroupFiles = mode.includeGroupFiles && Zotero.Sync.Storage.downloadOnSync('groups');
 		
 		if (!includeUserFiles && !includeGroupFiles) {
 			Zotero.debug("No libraries are enabled for on-sync downloading");
@@ -1005,7 +973,7 @@ Zotero.Sync.Storage = new function () {
 				item.libraryID + '/' + item.key,
 				{
 					onStart: function (request) {
-						module.downloadFile(request);
+						mode.downloadFile(request);
 					}
 				}
 			);
@@ -1021,12 +989,12 @@ Zotero.Sync.Storage = new function () {
 	 *
 	 * @return	{Boolean}
 	 */
-	function _uploadFiles(module) {
+	function _uploadFiles(mode) {
 		if (!_syncInProgress) {
 			_syncInProgress = true;
 		}
 		
-		var uploadFileIDs = _getFilesToUpload(module.includeUserFiles, module.includeGroupFiles);
+		var uploadFileIDs = _getFilesToUpload(mode.includeUserFiles, mode.includeGroupFiles);
 		if (!uploadFileIDs) {
 			Zotero.debug("No files to upload");
 			return false;
@@ -1044,7 +1012,7 @@ Zotero.Sync.Storage = new function () {
 				item.libraryID + '/' + item.key,
 				{
 					onStart: function (request) {
-						module.uploadFile(request);
+						mode.uploadFile(request);
 					}
 				}
 			);
@@ -1688,7 +1656,7 @@ Zotero.Sync.Storage = new function () {
 	}
 	
 	
-	function registerDefaultObserver(moduleName) {
+	function registerDefaultObserver(modeName) {
 		var finish = function (cancelled, skipSuccessFile) {
 			// Upload success file when done
 			if (!_resyncOnFinish && !skipSuccessFile) {
@@ -1698,20 +1666,20 @@ Zotero.Sync.Storage = new function () {
 				var uploadQueue = Zotero.Sync.Storage.QueueManager.get('upload', true);
 				var useLastSyncTime = !uploadQueue || (!cancelled && uploadQueue.lastTotalRequests == 0);
 				
-				getModuleFromName(moduleName).setLastSyncTime(function () {
+				getModeFromName(modeName).setLastSyncTime(function () {
 					finish(cancelled, true);
 				}, useLastSyncTime);
 				return false;
 			}
 			
-			Zotero.debug(moduleName + " sync is complete");
+			Zotero.debug(modeName + " sync is complete");
 			
 			_syncInProgress = false;
 			
 			if (_resyncOnFinish) {
 				Zotero.debug("Force-resyncing items in conflict");
 				_resyncOnFinish = false;
-				Zotero.Sync.Storage.sync(moduleName);
+				Zotero.Sync.Storage.sync(modeName);
 				return false;
 			}
 			

chrome/content/zotero/xpcom/storage/eventManager.js

@@ -130,7 +130,7 @@ Zotero.Sync.Storage.EventManager = (function () {
 			var queues = Zotero.Sync.Storage.QueueManager.getAll();
 			for each(var queue in queues) {
 				if (queue.isRunning()) {
-					Zotero.debug(queue[0].toUpperCase() + queue.substr(1)
+					Zotero.debug(queue.name[0].toUpperCase() + queue.name.substr(1)
 						+ " queue not empty -- not clearing storage sync event observers");
 					return;
 				}

chrome/content/zotero/xpcom/storage/mode.js

@@ -0,0 +1,184 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2009 Center for History and New Media
+                     George Mason University, Fairfax, Virginia, USA
+                     http://zotero.org
+    
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    ***** END LICENSE BLOCK *****
+*/
+
+
+Zotero.Sync.Storage.Mode = function () {};
+
+Zotero.Sync.Storage.Mode.prototype.__defineGetter__('enabled', function () {
+	try {
+		return this._enabled;
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+});
+
+Zotero.Sync.Storage.Mode.prototype.__defineGetter__('verified', function () {
+	try {
+		return this._verified;
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+});
+
+Zotero.Sync.Storage.Mode.prototype.__defineGetter__('active', function () {
+	try {
+		return this._enabled && this._verified && this._initFromPrefs();
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+});
+
+Zotero.Sync.Storage.Mode.prototype.__defineGetter__('username', function () {
+	try {
+		return this._username;
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+});
+
+Zotero.Sync.Storage.Mode.prototype.__defineGetter__('password', function () {
+	try {
+		return this._password;
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+});
+
+Zotero.Sync.Storage.Mode.prototype.__defineSetter__('password', function (val) {
+	try {
+		this._password = val;
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+});
+
+Zotero.Sync.Storage.Mode.prototype.init = function () {
+	try {
+		return this._init();
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.initFromPrefs = function () {
+	try {
+		return this._initFromPrefs();
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.sync = function (observer) {
+	Zotero.Sync.Storage.sync(this.name, observer);
+}
+
+Zotero.Sync.Storage.Mode.prototype.downloadFile = function (request) {
+	try {
+		this._downloadFile(request);
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.uploadFile = function (request) {
+	try {
+		this._uploadFile(request);
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.getLastSyncTime = function (callback) {
+	try {
+		this._getLastSyncTime(callback);
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.setLastSyncTime = function (callback, useLastSyncTime) {
+	try {
+		this._setLastSyncTime(callback, useLastSyncTime);
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.checkServer = function (callback) {
+	try {
+		return this._checkServer(callback);
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.checkServerCallback = function (uri, status, window, skipSuccessMessage) {
+	try {
+		return this._checkServerCallback(uri, status, window, skipSuccessMessage);
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.cacheCredentials = function (callback) {
+	try {
+		return this._cacheCredentials(callback);
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.purgeDeletedStorageFiles = function (callback) {
+	try {
+		this._purgeDeletedStorageFiles(callback);
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}
+
+Zotero.Sync.Storage.Mode.prototype.purgeOrphanedStorageFiles = function (callback) {
+	try {
+		this._purgeOrphanedStorageFiles(callback);
+	}
+	catch (e) {
+		Zotero.Sync.Storage.EventManager.error(e);
+	}
+}

chrome/content/zotero/xpcom/storage/module.js

@@ -1,198 +0,0 @@
-/*
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
-*/
-
-
-Zotero.Sync.Storage.Module = function (moduleName) {
-	switch (moduleName) {
-		case 'ZFS':
-			this._module = Zotero.Sync.Storage.Module.ZFS;
-			break;
-		
-		case 'WebDAV':
-			this._module = Zotero.Sync.Storage.Module.WebDAV;
-			break;
-			
-		default:
-			throw ("Invalid storage session module '" + moduleName + "'");
-	}
-};
-
-Zotero.Sync.Storage.Module.prototype.__defineGetter__('name', function () this._module.name);
-Zotero.Sync.Storage.Module.prototype.__defineGetter__('includeUserFiles', function () this._module.includeUserFiles);
-Zotero.Sync.Storage.Module.prototype.__defineGetter__('includeGroupFiles', function () this._module.includeGroupFiles);
-
-Zotero.Sync.Storage.Module.prototype.__defineGetter__('enabled', function () {
-	try {
-		return this._module.enabled;
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-});
-
-Zotero.Sync.Storage.Module.prototype.__defineGetter__('verified', function () {
-	try {
-		return this._module.verified;
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-});
-
-Zotero.Sync.Storage.Module.prototype.__defineGetter__('active', function () {
-	try {
-		return this._module.enabled && this._module.initFromPrefs() && this._module.verified;
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-});
-
-Zotero.Sync.Storage.Module.prototype.__defineGetter__('username', function () {
-	try {
-		return this._module.username;
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-});
-
-Zotero.Sync.Storage.Module.prototype.__defineGetter__('password', function () {
-	try {
-		return this._module.password;
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-});
-
-Zotero.Sync.Storage.Module.prototype.__defineSetter__('password', function (val) {
-	try {
-		this._module.password = val;
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-});
-
-
-Zotero.Sync.Storage.Module.prototype.init = function () {
-	try {
-		return this._module.init();
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.initFromPrefs = function () {
-	try {
-		return this._module.initFromPrefs();
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.downloadFile = function (request) {
-	try {
-		this._module.downloadFile(request);
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.uploadFile = function (request) {
-	try {
-		this._module.uploadFile(request);
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.getLastSyncTime = function (callback) {
-	try {
-		this._module.getLastSyncTime(callback);
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.setLastSyncTime = function (callback, useLastSyncTime) {
-	try {
-		this._module.setLastSyncTime(callback, useLastSyncTime);
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.checkServer = function (callback) {
-	try {
-		return this._module.checkServer(callback);
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.checkServerCallback = function (uri, status, window, skipSuccessMessage) {
-	try {
-		return this._module.checkServerCallback(uri, status, window, skipSuccessMessage);
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.cacheCredentials = function (callback) {
-	try {
-		return this._module.cacheCredentials(callback);
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.purgeDeletedStorageFiles = function (callback) {
-	try {
-		this._module.purgeDeletedStorageFiles(callback);
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}
-
-Zotero.Sync.Storage.Module.prototype.purgeOrphanedStorageFiles = function (callback) {
-	try {
-		this._module.purgeOrphanedStorageFiles(callback);
-	}
-	catch (e) {
-		Zotero.Sync.Storage.EventManager.error(e);
-	}
-}

chrome/content/zotero/xpcom/storage/webdav.js

@@ -24,7 +24,7 @@
 */
 
 
-Zotero.Sync.Storage.Module.WebDAV = (function () {
+Zotero.Sync.Storage.WebDAV = (function () {
 	// TEMP
 	// TODO: localize
 	var _defaultError = "A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.";
@@ -387,7 +387,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 	 * Create a Zotero directory on the storage server
 	 */
 	function createServerDirectory(callback) {
-		var uri = Zotero.Sync.Storage.Module.WebDAV.rootURI;
+		var uri = Zotero.Sync.Storage.WebDAV.rootURI;
 		Zotero.HTTP.WebDAV.doMkCol(uri, function (req) {
 			Zotero.debug(req.responseText);
 			Zotero.debug(req.status);
@@ -429,7 +429,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 	 * @return	{nsIURI}					URI of file on storage server
 	 */
 	function getItemURI(item) {
-		var uri = Zotero.Sync.Storage.Module.WebDAV.rootURI;
+		var uri = Zotero.Sync.Storage.WebDAV.rootURI;
 		uri.spec = uri.spec + item.key + '.zip';
 		return uri;
 	}
@@ -443,7 +443,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 	 * @return	{nsIURI}					URI of property file on storage server
 	 */
 	function getItemPropertyURI(item) {
-		var uri = Zotero.Sync.Storage.Module.WebDAV.rootURI;
+		var uri = Zotero.Sync.Storage.WebDAV.rootURI;
 		uri.spec = uri.spec + item.key + '.prop';
 		return uri;
 	}
@@ -670,31 +670,37 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 	}
 	
 	
-	return {
+	//
-		name: "WebDAV",
+	// Public methods (called via Zotero.Sync.Storage.WebDAV)
+	//
+	var obj = new Zotero.Sync.Storage.Mode;
+	obj.name = "WebDAV";
 	
-		get includeUserFiles() {
+	Object.defineProperty(obj, "includeUserFiles", {
+		get: function () {
 			return Zotero.Prefs.get("sync.storage.enabled") && Zotero.Prefs.get("sync.storage.protocol") == 'webdav';
-		},
+		}
-		includeGroupItems: false,
+	});
+	obj.includeGroupItems = false;
 		
-		get enabled() {
+	Object.defineProperty(obj, "_enabled", {
-			return this.includeUserFiles;
+		get: function () this.includeUserFiles
-		},
+	});
 	
-		get verified() {
+	Object.defineProperty(obj, "_verified", {
-			return Zotero.Prefs.get("sync.storage.verified");
+		get: function () Zotero.Prefs.get("sync.storage.verified")
-		},
+	});
 	
-		get username() {
+	Object.defineProperty(obj, "_username", {
-			return Zotero.Prefs.get('sync.storage.username');
+		get: function () Zotero.Prefs.get('sync.storage.username')
-		},
+	});
 	
-		get password() {
+	Object.defineProperty(obj, "_password", {
-			var username = this.username;
+		get: function () {
+			var username = this._username;
 			
 			if (!username) {
-				Zotero.debug('Username not set before getting Zotero.Sync.Storage.Module.WebDAV.password');
+				Zotero.debug('Username not set before getting Zotero.Sync.Storage.WebDAV.password');
 				return '';
 			}
 			
@@ -713,10 +719,10 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 			return '';
 		},
 		
-		set password(password) {
+		set: function (password) {
-			var username = this.username;
+			var username = this._username;
 			if (!username) {
-				Zotero.debug('Username not set before setting Zotero.Sync.Server.Module.WebDAV.password');
+				Zotero.debug('Username not set before setting Zotero.Sync.Server.Mode.WebDAV.password');
 				return;
 			}
 			
@@ -740,24 +746,28 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 					null, username, password, "", "");
 				loginManager.addLogin(loginInfo);
 			}
-		},
+		}
+	});
 	
-		get rootURI() {
+	Object.defineProperty(obj, "rootURI", {
+		get: function () {
 			if (!_rootURI) {
 				throw new Error("Root URI not initialized");
 			}
 			return _rootURI.clone();
-		},
+		}
+	});
 	
-		get parentURI() {
+	Object.defineProperty(obj, "parentURI", {
+		get: function () {
 			if (!_parentURI) {
 				throw new Error("Parent URI not initialized");
 			}
 			return _parentURI.clone();
-		},
+		}
+	});
 	
-		
+	obj._init = function (url, dir, username, password) {
-		init: function (url, dir, username, password) {
 		if (!url) {
 			var msg = "WebDAV URL not provided";
 			Zotero.debug(msg);
@@ -803,10 +813,10 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 		uri.spec += "zotero/";
 		_rootURI = uri;
 		return true;
-		},
+	};
 	
 	
-		initFromPrefs: function () {
+	obj._initFromPrefs = function () {
 		var scheme = Zotero.Prefs.get('sync.storage.scheme');
 		switch (scheme) {
 			case 'http':
@@ -824,11 +834,11 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 		
 		url = scheme + '://' + url;
 		var dir = "zotero";
-			var username = this.username;
+		var username = this._username;
-			var password = this.password;
+		var password = this._password;
 		
-			return this.init(url, dir, username, password);
+		return this._init(url, dir, username, password);
-		},
+	};
 	
 	
 	/**
@@ -836,7 +846,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 	 *
 	 * @param	{Zotero.Sync.Storage.Request}	[request]
 	 */
-		downloadFile: function (request) {
+	obj._downloadFile = function (request) {
 		var item = Zotero.Sync.Storage.getItemFromRequestName(request.name);
 		if (!item) {
 			throw new Error("Item '" + request.name + "' not found");
@@ -910,7 +920,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 							else if (status != 200) {
 								var msg = "Unexpected status code " + status
 									+ " for request " + data.request.name
-										+ " in Zotero.Sync.Storage.Module.WebDAV.downloadFile()";
+									+ " in Zotero.Sync.Storage.WebDAV.downloadFile()";
 								Zotero.debug(msg, 1);
 								Components.utils.reportError(msg);
 								Zotero.Sync.Storage.EventManager.error(_defaultError);
@@ -958,18 +968,18 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 				request.error(e);
 			}
 		});
-		},
+	};
 	
 	
-		uploadFile: function (request) {
+	obj._uploadFile = function (request) {
 		Zotero.Sync.Storage.createUploadFile(request, function (data) { processUploadFile(data); });
-		},
+	};
 	
 	
-		getLastSyncTime: function (callback) {
+	obj._getLastSyncTime = function (callback) {
 		// Cache the credentials at the root URI
 		var self = this;
-			this.cacheCredentials(function () {
+		this._cacheCredentials(function () {
 			try {
 				var uri = this.rootURI;
 				var successFileURI = uri.clone();
@@ -989,7 +999,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 						
 						if (req.status != 200 && req.status != 404) {
 							var msg = "Unexpected status code " + req.status + " for HEAD request "
-									+ "in Zotero.Sync.Storage.Module.WebDAV.getLastSyncTime()";
+								+ "in Zotero.Sync.Storage.WebDAV.getLastSyncTime()";
 							Zotero.debug(msg, 1);
 							Components.utils.reportError(msg);
 							Zotero.Sync.Storage.EventManager.error(_defaultError);
@@ -1021,10 +1031,10 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 				Zotero.Sync.Storage.EventManager.error(_defaultError);
 			}
 		});
-		},
+	};
 	
 	
-		setLastSyncTime: function (callback) {
+	obj._setLastSyncTime = function (callback) {
 		try {
 			var uri = this.rootURI;
 			var successFileURI = uri.clone();
@@ -1066,10 +1076,10 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 			}
 			return;
 		}
-		},
+	};
 	
 	
-		cacheCredentials: function (callback) {
+	obj._cacheCredentials = function (callback) {
 		if (_cachedCredentials) {
 			Zotero.debug("Credentials are already cached");
 			setTimeout(function () {
@@ -1083,7 +1093,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 			
 			if (req.status != 200) {
 				var msg = "Unexpected status code " + req.status + " for OPTIONS request "
-						+ "in Zotero.Sync.Storage.Module.WebDAV.getLastSyncTime()";
+					+ "in Zotero.Sync.Storage.WebDAV.getLastSyncTime()";
 				Zotero.debug(msg, 1);
 				Components.utils.reportError(msg);
 				Zotero.Sync.Storage.EventManager.error(_defaultErrorRestart);
@@ -1093,15 +1103,15 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 			callback();
 		});
 		return true;
-		},
+	};
 	
 	
 	/**
 	 * @param	{Function}	callback			Function to pass URI and result value to
 	 * @param	{Object}		errorCallbacks
 	 */
-		checkServer: function (callback) {
+	obj._checkServer = function (callback) {
-			this.initFromPrefs();
+		this._initFromPrefs();
 		
 		try {
 			var parentURI = this.parentURI;
@@ -1218,10 +1228,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 															switch (req.status) {
 																case 200: // IIS 5.1 and Sakai return 200
 																case 204:
-																		callback(
+																	callback(uri, Zotero.Sync.Storage.SUCCESS);
-																			uri,
-																			Zotero.Sync.Storage.SUCCESS
-																		);
 																	return;
 																
 																case 401:
@@ -1308,7 +1315,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 						
 						// Zotero directory wasn't found, so see if at least
 						// the parent directory exists
-							Zotero.HTTP.WebDAV.doProp("PROPFIND", this.parentURI, xmlstr,
+						Zotero.HTTP.WebDAV.doProp("PROPFIND", parentURI, xmlstr,
 							function (req) {
 								Zotero.debug(req.responseText);
 								Zotero.debug(req.status);
@@ -1356,10 +1363,10 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 		
 		requestHolder.request = request;
 		return requestHolder;
-		},
+	};
 	
 	
-		checkServerCallback: function (uri, status, window, skipSuccessMessage) {
+	obj._checkServerCallback = function (uri, status, window, skipSuccessMessage) {
 		var promptService =
 			Components.classes["@mozilla.org/embedcomp/prompt-service;1"].
 				createInstance(Components.interfaces.nsIPromptService);
@@ -1498,7 +1505,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 			promptService.alert(window, errorTitle, errorMessage);
 		}
 		return false;
-		},
+	};
 	
 	
 	/**
@@ -1507,8 +1514,8 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 	 *
 	 * @param	{Function}	callback		Passed number of files deleted
 	 */
-		purgeDeletedStorageFiles: function (callback) {
+	obj._purgeDeletedStorageFiles = function (callback) {
-			if (!this.active) {
+		if (!this._active) {
 			return;
 		}
 		
@@ -1554,7 +1561,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 			
 			Zotero.Sync.Storage.EventManager.success();
 		});
-		},
+	};
 	
 	
 	/**
@@ -1562,10 +1569,10 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 	 *
 	 * @param	{Function}	callback
 	 */
-		purgeOrphanedStorageFiles: function (callback) {
+	obj._purgeOrphanedStorageFiles = function (callback) {
 		const daysBeforeSyncTime = 1;
 		
-			if (!this.active) {
+		if (!this._active) {
 			Zotero.Sync.Storage.EventManager.skip();
 			return;
 		}
@@ -1689,6 +1696,7 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 				Zotero.Sync.Storage.EventManager.success();
 			});
 		}, { Depth: 1 });
-		}
 	};
+	
+	return obj;
 }());

chrome/content/zotero/xpcom/storage/zfs.js

@@ -24,7 +24,7 @@
 */
 
 
-Zotero.Sync.Storage.Module.ZFS = (function () {
+Zotero.Sync.Storage.ZFS = (function () {
 	var _rootURI;
 	var _userURI;
 	var _cachedCredentials = false;
@@ -40,7 +40,7 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 		var uri = getItemInfoURI(item);
 		
 		Zotero.HTTP.doGet(uri, function (req) {
-			var funcName = "Zotero.Sync.Storage.Module.ZFS.getStorageFileInfo()";
+			var funcName = "Zotero.Sync.Storage.ZFS.getStorageFileInfo()";
 			
 			if (req.status == 404) {
 				callback(item, false);
@@ -237,7 +237,7 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 		}
 		
 		Zotero.HTTP.doPost(uri, body, function (req) {
-			var funcName = "Zotero.Sync.Storage.Module.ZFS.getFileUploadParameters()";
+			var funcName = "Zotero.Sync.Storage.ZFS.getFileUploadParameters()";
 			
 			if (req.status == 413) {
 				var retry = req.getResponseHeader('Retry-After');
@@ -597,7 +597,7 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 	 * @return	{nsIURI}					URI of file on storage server
 	 */
 	function getItemURI(item) {
-		var uri = Zotero.Sync.Storage.Module.ZFS.rootURI;
+		var uri = Zotero.Sync.Storage.ZFS.rootURI;
 		// Be sure to mirror parameter changes to getItemInfoURI() below
 		uri.spec += Zotero.URI.getItemPath(item) + '/file?auth=1&iskey=1&version=1';
 		return uri;
@@ -612,7 +612,7 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 	 * @return	{nsIURI}					URI of file on storage server with info flag
 	 */
 	function getItemInfoURI(item) {
-		var uri = Zotero.Sync.Storage.Module.ZFS.rootURI;
+		var uri = Zotero.Sync.Storage.ZFS.rootURI;
 		uri.spec += Zotero.URI.getItemPath(item) + '/file?auth=1&iskey=1&version=1&info=1';
 		return uri;
 	}
@@ -631,41 +631,50 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 	}
 	
 	
-	return {
+	//
-		name: "ZFS",
+	// Public methods (called via Zotero.Sync.Storage.ZFS)
+	//
+	var obj = new Zotero.Sync.Storage.Mode;
+	obj.name = "ZFS";
 	
-		get includeUserFiles() {
+	Object.defineProperty(obj, "includeUserFiles", {
+		get: function () {
 			return Zotero.Prefs.get("sync.storage.enabled") && Zotero.Prefs.get("sync.storage.protocol") == 'zotero';
-		},
+		}
+	});
 	
-		get includeGroupFiles() {
+	Object.defineProperty(obj, "includeGroupFiles", {
+		get: function () {
 			return Zotero.Prefs.get("sync.storage.groups.enabled");
-		},
+		}
+	});
 	
-		get enabled() {
+	Object.defineProperty(obj, "_enabled", {
-			return this.includeUserFiles || this.includeGroupFiles;
+		get: function () this.includeUserFiles || this.includeGroupFiles
-		},
+	});
 	
-		get verified() {
+	obj._verified = true;
-			return true;
-		},
 	
-		get rootURI() {
+	Object.defineProperty(obj, "rootURI", {
+		get: function () {
 			if (!_rootURI) {
 				throw ("Root URI not initialized in Zotero.Sync.Storage.ZFS.rootURI");
 			}
 			return _rootURI.clone();
-		},
+		}
+	});
 	
-		get userURI() {
+	Object.defineProperty(obj, "userURI", {
+		get: function () {
 			if (!_userURI) {
 				throw ("User URI not initialized in Zotero.Sync.Storage.ZFS.userURI");
 			}
 			return _userURI.clone();
-		},
+		}
+	});
 	
 	
-		init: function (url, username, password) {
+	obj._init = function (url, username, password) {
 		var ios = Components.classes["@mozilla.org/network/io-service;1"].
 					getService(Components.interfaces.nsIIOService);
 		try {
@@ -687,15 +696,15 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 		_userURI = uri;
 		
 		return true;
-		},
+	};
 	
 	
-		initFromPrefs: function () {
+	obj._initFromPrefs = function () {
 		var url = ZOTERO_CONFIG.API_URL;
 		var username = Zotero.Sync.Server.username;
 		var password = Zotero.Sync.Server.password;
-			return this.init(url, username, password);
+		return this._init(url, username, password);
-		},
+	};
 	
 	
 	/**
@@ -703,7 +712,7 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 	 *
 	 * @param	{Zotero.Sync.Storage.Request}	[request]
 	 */
-		downloadFile: function (request) {
+	obj._downloadFile = function (request) {
 		var item = Zotero.Sync.Storage.getItemFromRequestName(request.name);
 		if (!item) {
 			throw new Error("Item '" + request.name + "' not found");
@@ -807,7 +816,7 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 							if (status != 200) {
 								var msg = "Unexpected status code " + status
 									+ " for request " + data.request.name
-										+ " in Zotero.Sync.Storage.Module.ZFS.downloadFile()";
+									+ " in Zotero.Sync.Storage.ZFS.downloadFile()";
 								Zotero.debug(msg, 1);
 								Components.utils.reportError(msg);
 								Zotero.Sync.Storage.EventManager.error(Zotero.Sync.Storage.defaultError);
@@ -858,10 +867,10 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 				Zotero.Sync.Storage.EventManager.error(e);
 			}
 		});
-		},
+	};
 	
 	
-		uploadFile: function (request) {
+	obj._uploadFile = function (request) {
 		var item = Zotero.Sync.Storage.getItemFromRequestName(request.name);
 		if (Zotero.Attachments.getNumFiles(item) > 1) {
 			Zotero.Sync.Storage.createUploadFile(request, function (data) { processUploadFile(data); });
@@ -869,17 +878,17 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 		else {
 			processUploadFile({ request: request });
 		}
-		},
+	};
 	
 	
-		getLastSyncTime: function (callback) {
+	obj._getLastSyncTime = function (callback) {
 		var uri = this.userURI;
 		var successFileURI = uri.clone();
 		successFileURI.spec += "laststoragesync?auth=1";
 		
 		// Cache the credentials at the root
 		var self = this;
-			this.cacheCredentials(function () {
+		this._cacheCredentials(function () {
 			Zotero.HTTP.doGet(successFileURI, function (req) {
 				if (req.responseText) {
 					Zotero.debug(req.responseText);
@@ -911,10 +920,10 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 				callback(ts);
 			});
 		});
-		},
+	};
 	
 	
-		setLastSyncTime: function (callback, useLastSyncTime) {
+	obj._setLastSyncTime = function (callback, useLastSyncTime) {
 		if (useLastSyncTime) {
 			if (!_lastSyncTime) {
 				if (callback) {
@@ -965,10 +974,10 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 				callback();
 			}
 		});
-		},
+	};
 	
 	
-		cacheCredentials: function (callback) {
+	obj._cacheCredentials = function (callback) {
 		if (_cachedCredentials) {
 			Zotero.debug("Credentials are already cached");
 			setTimeout(function () {
@@ -988,7 +997,7 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 			}
 			else if (req.status != 200) {
 				var msg = "Unexpected status code " + req.status + " caching "
-						+ "authentication credentials in Zotero.Sync.Storage.Module.ZFS.cacheCredentials()";
+					+ "authentication credentials in Zotero.Sync.Storage.ZFS.cacheCredentials()";
 				Zotero.debug(msg, 1);
 				Components.utils.reportError(msg);
 				Zotero.Sync.Storage.EventManager.error(Zotero.Sync.Storage.defaultErrorRestart);
@@ -998,13 +1007,13 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 			callback();
 		});
 		return true;
-		},
+	};
 	
 	
 	/**
 	 * Remove all synced files from the server
 	 */
-		purgeDeletedStorageFiles: function (callback) {
+	obj._purgeDeletedStorageFiles = function (callback) {
 		// If we don't have a user id we've never synced and don't need to bother
 		if (!Zotero.userID) {
 			Zotero.Sync.Storage.EventManager.skip();
@@ -1060,6 +1069,7 @@ Zotero.Sync.Storage.Module.ZFS = (function () {
 			
 			Zotero.Sync.Storage.EventManager.success();
 		});
-		}
+	};
-	}
+	
+	return obj;
 }());

chrome/content/zotero/xpcom/sync.js

@@ -421,7 +421,7 @@ Zotero.Sync.EventListener = new function () {
 			var sql = "REPLACE INTO syncDeleteLog VALUES (?, ?, ?, ?)";
 			var syncStatement = Zotero.DB.getStatement(sql);
 			
-			if (isItem && Zotero.Sync.Storage.isActive('WebDAV')) {
+			if (isItem && Zotero.Sync.Storage.WebDAV.active) {
 				var storageEnabled = true;
 				var sql = "INSERT INTO storageDeleteLog VALUES (?, ?, ?)";
 				var storageStatement = Zotero.DB.getStatement(sql);
@@ -559,7 +559,7 @@ Zotero.Sync.Runner = new function () {
 			Zotero.Sync.Runner.setSyncStatus(Zotero.getString('sync.status.syncingFiles'));
 			
 			var zfsSync = function (skipSyncNeeded) {
-				Zotero.Sync.Storage.sync('ZFS', {
+				Zotero.Sync.Storage.ZFS.sync({
 					// ZFS success
 					onSuccess: function () {
 						setTimeout(function () {
@@ -593,7 +593,7 @@ Zotero.Sync.Runner = new function () {
 				})
 			};
 			
-			Zotero.Sync.Storage.sync('WebDAV', {
+			Zotero.Sync.Storage.WebDAV.sync({
 				// WebDAV success
 				onSuccess: function () {
 					zfsSync(true);

chrome/content/zotero/xpcom/zotero.js

@@ -1801,12 +1801,12 @@ const ZOTERO_CONFIG = {
 		Zotero.Relations.purge();
 		
 		if (!skipStoragePurge && Math.random() < 1/10) {
-			Zotero.Sync.Storage.purgeDeletedStorageFiles('ZFS');
+			Zotero.Sync.Storage.ZFS.purgeDeletedStorageFiles();
-			Zotero.Sync.Storage.purgeDeletedStorageFiles('WebDAV');
+			Zotero.Sync.Storage.WebDAV.purgeDeletedStorageFiles();
 		}
 		
 		if (!skipStoragePurge) {
-			Zotero.Sync.Storage.purgeOrphanedStorageFiles('WebDAV');
+			Zotero.Sync.Storage.WebDAV.purgeOrphanedStorageFiles();
 		}
 	}
 	

components/zotero-service.js

@@ -100,7 +100,7 @@ const xpcomFilesLocal = [
 	'storage/queueManager',
 	'storage/queue',
 	'storage/request',
-	'storage/module',
+	'storage/mode',
 	'storage/zfs',
 	'storage/webdav',
 	'timeline',