From 3a3f46530d9d8476664c66334a9c858b0dfdf0ef Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 3 May 2018 19:27:22 -0400 Subject: [PATCH 01/12] Adjust note header sizing/styling --- resource/tinymce/css/note-content.css | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/resource/tinymce/css/note-content.css b/resource/tinymce/css/note-content.css index d95964524..66a4c7475 100644 --- a/resource/tinymce/css/note-content.css +++ b/resource/tinymce/css/note-content.css @@ -1,3 +1,36 @@ +h1 { + font-size: 1.6em; + padding-bottom: .2em; +} + +h2 { + font-size: 1.4em; + font-weight: normal; + margin-top: 0; + padding-bottom: .2em; + border-bottom: 1px solid lightgray; +} + +h3 { + font-size: 1.1em; +} + +h4 { + font-size: 1em; + margin-bottom: 1em; +} + +h5 { + font-size: .9em; + margin-bottom: 1em; +} + +h6 { + font-size: .8em; + margin-top: 1.6em; + margin-bottom: 1.3em; +} + blockquote { margin-top: 1.5em; margin-bottom: 1.5em; From 78e87a351cfc9c845eace9b2dee9cdfaa261ebf7 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 20 Feb 2018 03:30:14 -0500 Subject: [PATCH 02/12] Handle relations property in collection fromJSON() --- chrome/content/zotero/xpcom/data/collection.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/collection.js b/chrome/content/zotero/xpcom/data/collection.js index 3a0f5bf75..ca81a6f78 100644 --- a/chrome/content/zotero/xpcom/data/collection.js +++ b/chrome/content/zotero/xpcom/data/collection.js @@ -698,8 +698,7 @@ Zotero.Collection.prototype.fromJSON = function (json) { this.name = json.name; this.parentKey = json.parentCollection ? json.parentCollection : false; - // TODO - //this.setRelations(json.relations); + this.setRelations(json.relations); } From a714f0667045207cef8ff0facc0f7b0c186b6326 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 20 Feb 2018 03:32:03 -0500 Subject: [PATCH 03/12] Use Zotero.warn() for item.setCreator() warning --- chrome/content/zotero/xpcom/data/item.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index 4aecb5ebe..52d1f9c53 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -1051,8 +1051,7 @@ Zotero.Item.prototype.setCreator = function (orderIndex, data) { var msg = "Creator type '" + Zotero.CreatorTypes.getName(data.creatorTypeID) + "' " + "isn't valid for " + Zotero.ItemTypes.getName(itemTypeID) + " -- changing to primary creator"; - Zotero.debug(msg, 2); - Components.utils.reportError(msg); + Zotero.warn(msg); data.creatorTypeID = Zotero.CreatorTypes.getPrimaryIDForType(itemTypeID); } From 44fd5986992cfe5178b3bb70ff7883aeaec93aaa Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 20 Feb 2018 03:33:00 -0500 Subject: [PATCH 04/12] Load creators if needed to update display title in Items._loadItemData() --- chrome/content/zotero/xpcom/data/items.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js index 7be2e13cd..c61192e21 100644 --- a/chrome/content/zotero/xpcom/data/items.js +++ b/chrome/content/zotero/xpcom/data/items.js @@ -315,7 +315,21 @@ Zotero.Items = function() { item._clearChanged('itemData'); // Display titles - item.updateDisplayTitle() + try { + item.updateDisplayTitle() + } + catch (e) { + // A few item types need creators to be loaded. Instead of making + // updateDisplayTitle() async and loading conditionally, just catch the error + // and load on demand + if (e instanceof Zotero.Exception.UnloadedDataException) { + yield item.loadDataType('creators'); + item.updateDisplayTitle() + } + else { + throw e; + } + } } }); From 6ff51103f50b12746e8b147d984e09c753d42c41 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 20 Feb 2018 03:39:46 -0500 Subject: [PATCH 05/12] Make Zotero.ItemFields.getFieldIDFromTypeAndBase() work on non-base fields This previously returned false if a non-base-mapped field was passed, even if the field was valid for the given item type. It now returns the passed field as long as the field is valid for the type, which matches the behavior for base fields. --- chrome/content/zotero/xpcom/data/itemFields.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/chrome/content/zotero/xpcom/data/itemFields.js b/chrome/content/zotero/xpcom/data/itemFields.js index 67bb7053f..c1ac1f126 100644 --- a/chrome/content/zotero/xpcom/data/itemFields.js +++ b/chrome/content/zotero/xpcom/data/itemFields.js @@ -260,6 +260,11 @@ Zotero.ItemFields = new function() { throw new Error("Invalid field '" + baseField + '" for base field'); } + // If field isn't a base field, return it if it's valid for the type + if (!this.isBaseField(baseFieldID)) { + return this.isValidForType(baseFieldID, itemTypeID) ? baseFieldID : false; + } + return _baseTypeFields[itemTypeID][baseFieldID]; } From 52737ec69431077c53f5a3aa843ba45c210d0580 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 20 Feb 2018 03:46:29 -0500 Subject: [PATCH 06/12] Set locking_mode=EXCLUSIVE only for main database in Zotero.DBConnection Otherwise attached databases are also exclusive --- chrome/content/zotero/xpcom/db.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js index 9450881d4..f2a095c4e 100644 --- a/chrome/content/zotero/xpcom/db.js +++ b/chrome/content/zotero/xpcom/db.js @@ -879,7 +879,7 @@ Zotero.DBConnection.prototype.vacuum = function () { // TEMP Zotero.DBConnection.prototype.info = Zotero.Promise.coroutine(function* () { var info = {}; - var pragmas = ['auto_vacuum', 'cache_size', 'locking_mode', 'page_size']; + var pragmas = ['auto_vacuum', 'cache_size', 'main.locking_mode', 'page_size']; for (let p of pragmas) { info[p] = yield Zotero.DB.valueQueryAsync(`PRAGMA ${p}`); } @@ -1038,7 +1038,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function // the lock is lost try { if (DB_LOCK_EXCLUSIVE) { - yield this.queryAsync("PRAGMA locking_mode=NORMAL", false, { inBackup: true }); + yield this.queryAsync("PRAGMA main.locking_mode=NORMAL", false, { inBackup: true }); } storageService.backupDatabaseFile(file, OS.Path.basename(tmpFile), file.parent); } @@ -1049,7 +1049,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function } finally { if (DB_LOCK_EXCLUSIVE) { - yield this.queryAsync("PRAGMA locking_mode=EXCLUSIVE", false, { inBackup: true }); + yield this.queryAsync("PRAGMA main.locking_mode=EXCLUSIVE", false, { inBackup: true }); } } @@ -1288,10 +1288,10 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun } if (DB_LOCK_EXCLUSIVE) { - yield this.queryAsync("PRAGMA locking_mode=EXCLUSIVE"); + yield this.queryAsync("PRAGMA main.locking_mode=EXCLUSIVE"); } else { - yield this.queryAsync("PRAGMA locking_mode=NORMAL"); + yield this.queryAsync("PRAGMA main.locking_mode=NORMAL"); } // Set page cache size to 8MB From 86b94ae713dc600927ac3949c07bdb83e063ea13 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 4 May 2018 19:52:14 -0400 Subject: [PATCH 07/12] Add optional 'db' parameter to Zotero.DB.tableExists() To check attached databases --- chrome/content/zotero/xpcom/db.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js index f2a095c4e..73c9ae182 100644 --- a/chrome/content/zotero/xpcom/db.js +++ b/chrome/content/zotero/xpcom/db.js @@ -818,9 +818,10 @@ Zotero.DBConnection.prototype.logQuery = function (sql, params = [], options) { } -Zotero.DBConnection.prototype.tableExists = Zotero.Promise.coroutine(function* (table) { +Zotero.DBConnection.prototype.tableExists = Zotero.Promise.coroutine(function* (table, db) { yield this._getConnectionAsync(); - var sql = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND tbl_name=?"; + var prefix = db ? db + '.' : ''; + var sql = `SELECT COUNT(*) FROM ${prefix}sqlite_master WHERE type='table' AND tbl_name=?`; var count = yield this.valueQueryAsync(sql, [table]); return !!count; }); From 7271fdf6b72d78329273229f9602806ad7b13b78 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 4 May 2018 19:53:54 -0400 Subject: [PATCH 08/12] Add Zotero.Sync.Runner.delayIndefinite() Delays syncing until the returned function is run --- .../content/zotero/xpcom/sync/syncRunner.js | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/chrome/content/zotero/xpcom/sync/syncRunner.js b/chrome/content/zotero/xpcom/sync/syncRunner.js index 1b4a5e48d..e6e3b5083 100644 --- a/chrome/content/zotero/xpcom/sync/syncRunner.js +++ b/chrome/content/zotero/xpcom/sync/syncRunner.js @@ -70,6 +70,7 @@ Zotero.Sync.Runner_Module = function (options = {}) { var _enabled = false; var _autoSyncTimer; var _delaySyncUntil; + var _delayPromises = []; var _firstInSession = true; var _syncInProgress = false; var _stopping = false; @@ -148,6 +149,21 @@ Zotero.Sync.Runner_Module = function (options = {}) { yield Zotero.Promise.delay(delay); } + // If paused, wait until we're done + while (true) { + if (_delayPromises.some(p => p.isPending())) { + this.setSyncStatus(Zotero.getString('sync.status.waiting')); + Zotero.debug("Syncing is paused -- waiting to sync"); + yield Zotero.Promise.all(_delayPromises); + // If more were added, continue + if (_delayPromises.some(p => p.isPending())) { + continue; + } + _delayPromises = []; + } + break; + } + // purgeDataObjects() starts a transaction, so if there's an active one then show a // nice message and wait until there's not. Another transaction could still start // before purgeDataObjects() and result in a wait timeout, but this should reduce the @@ -958,6 +974,21 @@ Zotero.Sync.Runner_Module = function (options = {}) { }; + /** + * Delay syncs until the returned function is called + * + * @return {Function} - Resolve function + */ + this.delayIndefinite = function () { + var resolve; + var promise = new Zotero.Promise(function () { + resolve = arguments[0]; + }); + _delayPromises.push(promise); + return resolve; + }; + + /** * Trigger updating of the main sync icon, the sync error icon, and * library-specific sync error icons across all windows From 9220b2d9c2270a91cedc59d7dd52894ddffe1134 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 5 May 2018 00:09:35 -0400 Subject: [PATCH 09/12] Fix inconsequential bug in Zotero.MIME.sniffForMIMEType() `undefined` was being passed as an argument to slice(), but 0 is the only offset that's used anyway, and that's what happens if you pass `undefined`. --- chrome/content/zotero/xpcom/mime.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/chrome/content/zotero/xpcom/mime.js b/chrome/content/zotero/xpcom/mime.js index 77419507c..15859e940 100644 --- a/chrome/content/zotero/xpcom/mime.js +++ b/chrome/content/zotero/xpcom/mime.js @@ -26,7 +26,6 @@ Zotero.MIME = new function(){ this.isTextType = isTextType; this.getPrimaryExtension = getPrimaryExtension; - this.sniffForMIMEType = sniffForMIMEType; this.sniffForBinary = sniffForBinary; this.hasNativeHandler = hasNativeHandler; this.hasInternalHandler = hasInternalHandler; @@ -228,12 +227,12 @@ Zotero.MIME = new function(){ /* * Searches string for magic numbers */ - function sniffForMIMEType(str){ - for (var i in _snifferEntries){ - var match = false; + this.sniffForMIMEType = function (str) { + for (let i in _snifferEntries) { + let match = false; // If an offset is defined, match only from there - if (typeof _snifferEntries[i][2] != 'undefined') { - if (str.substr(i[2]).indexOf(_snifferEntries[i][0]) == 0) { + if (_snifferEntries[i][2] != undefined) { + if (str.substr(_snifferEntries[i][2]).indexOf(_snifferEntries[i][0]) == 0) { match = true; } } @@ -274,7 +273,7 @@ Zotero.MIME = new function(){ * ext is an optional file extension hint if data sniffing is unsuccessful */ this.getMIMETypeFromData = function (str, ext){ - var mimeType = sniffForMIMEType(str); + var mimeType = this.sniffForMIMEType(str); if (mimeType){ Zotero.debug('Detected MIME type ' + mimeType); return mimeType; From 603388c79d0f0960848f89fe8308e8cd783b1d73 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 2 Jun 2018 02:26:27 -0400 Subject: [PATCH 10/12] Add missing quote to error --- chrome/content/zotero/xpcom/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/api.js b/chrome/content/zotero/xpcom/api.js index f3aa9b040..6d69991f9 100644 --- a/chrome/content/zotero/xpcom/api.js +++ b/chrome/content/zotero/xpcom/api.js @@ -154,7 +154,7 @@ Zotero.API = { return 'groups/' + Zotero.Groups.getGroupIDFromLibraryID(libraryID); default: - throw new Error(`Invalid type '${type}`); + throw new Error(`Invalid type '${type}'`); } } }; From f7e411d56149b2aacf9f1f93351c523bac16613c Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 2 Jun 2018 04:07:05 -0400 Subject: [PATCH 11/12] Add support for databases in other directories Previously you could use Zotero.DBConnection to open another database in the data directory, but not one stored elsewhere in the filesystem. This allows an absolute path to be passed instead. Various operations (backups, corrupt DB recovery, pragma commands) are disabled for external databases. --- chrome/content/zotero/xpcom/db.js | 208 +++++++++++++------------- chrome/content/zotero/xpcom/zotero.js | 3 + 2 files changed, 111 insertions(+), 100 deletions(-) diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js index 73c9ae182..b3886b622 100644 --- a/chrome/content/zotero/xpcom/db.js +++ b/chrome/content/zotero/xpcom/db.js @@ -31,8 +31,8 @@ // the same database is accessed simultaneously by multiple Zotero instances. const DB_LOCK_EXCLUSIVE = true; -Zotero.DBConnection = function(dbName) { - if (!dbName) { +Zotero.DBConnection = function(dbNameOrPath) { + if (!dbNameOrPath) { throw ('DB name not provided in Zotero.DBConnection()'); } @@ -70,8 +70,18 @@ Zotero.DBConnection = function(dbName) { return Zotero.Date.toUnixTimestamp(d); }); - // Private members - this._dbName = dbName; + // Absolute path to DB + if (dbNameOrPath.startsWith('/') || (Zotero.isWin && dbNameOrPath.includes('\\'))) { + this._dbName = OS.Path.basename(dbNameOrPath).replace(/\.sqlite$/, ''); + this._dbPath = dbNameOrPath; + this._externalDB = true; + } + // DB name in data directory + else { + this._dbName = dbNameOrPath; + this._dbPath = Zotero.DataDirectory.getDatabase(dbNameOrPath); + this._externalDB = false; + } this._shutdown = false; this._connection = null; this._transactionID = null; @@ -91,6 +101,14 @@ Zotero.DBConnection = function(dbName) { this._dbIsCorrupt = null this._transactionPromise = null; + + if (dbNameOrPath == 'zotero') { + this.IncompatibleVersionException = function (msg, dbClientVersion) { + this.message = msg; + this.dbClientVersion = dbClientVersion; + } + this.IncompatibleVersionException.prototype = Object.create(Error.prototype); + } } ///////////////////////////////////////////////////////////////// @@ -105,7 +123,7 @@ Zotero.DBConnection = function(dbName) { * @return void */ Zotero.DBConnection.prototype.test = function () { - return this._getConnectionAsync().return(); + return this._getConnectionAsync().then(() => {}); } Zotero.DBConnection.prototype.getAsyncStatement = Zotero.Promise.coroutine(function* (sql) { @@ -895,9 +913,13 @@ Zotero.DBConnection.prototype.integrityCheck = Zotero.Promise.coroutine(function Zotero.DBConnection.prototype.checkException = function (e) { + if (this._externalDB) { + return true; + } + if (e.message.includes(this.DB_CORRUPTION_STRING)) { // Write corrupt marker to data directory - var file = Zotero.File.pathToFile(Zotero.DataDirectory.getDatabase(this._dbName, 'is.corrupt')); + var file = Zotero.File.pathToFile(this._dbPath + '.is.corrupt'); Zotero.File.putContents(file, ''); this._dbIsCorrupt = true; @@ -948,6 +970,11 @@ Zotero.DBConnection.prototype.closeDatabase = Zotero.Promise.coroutine(function* Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function* (suffix, force) { + if (this.skipBackup || this._externalDB || Zotero.skipLoading) { + this._debug("Skipping backup of database '" + this._dbName + "'", 1); + return false; + } + var storageService = Components.classes["@mozilla.org/storage/service;1"] .getService(Components.interfaces.mozIStorageService); @@ -981,27 +1008,21 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function }); try { - var corruptMarker = Zotero.File.pathToFile( - Zotero.DataDirectory.getDatabase(this._dbName, 'is.corrupt') - ); + let corruptMarker = Zotero.File.pathToFile(this._dbPath + '.is.corrupt'); - if (this.skipBackup || Zotero.skipLoading) { - this._debug("Skipping backup of database '" + this._dbName + "'", 1); - return false; - } - else if (this._dbIsCorrupt || corruptMarker.exists()) { + if (this._dbIsCorrupt || corruptMarker.exists()) { this._debug("Database '" + this._dbName + "' is marked as corrupt -- skipping backup", 1); return false; } - var file = Zotero.File.pathToFile(Zotero.DataDirectory.getDatabase(this._dbName)); + let file = this._dbPath; // For standard backup, make sure last backup is old enough to replace if (!suffix && !force) { - var backupFile = Zotero.File.pathToFile(Zotero.DataDirectory.getDatabase(this._dbName, 'bak')); - if (yield OS.File.exists(backupFile.path)) { - var currentDBTime = (yield OS.File.stat(file.path)).lastModificationDate; - var lastBackupTime = (yield OS.File.stat(backupFile.path)).lastModificationDate; + let backupFile = this._dbPath + '.bak'; + if (yield OS.File.exists(backupFile)) { + let currentDBTime = (yield OS.File.stat(file.path)).lastModificationDate; + let lastBackupTime = (yield OS.File.stat(backupFile)).lastModificationDate; if (currentDBTime == lastBackupTime) { Zotero.debug("Database '" + this._dbName + "' hasn't changed -- skipping backup"); return; @@ -1022,7 +1043,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function // Copy via a temporary file so we don't run into disk space issues // after deleting the old backup file - var tmpFile = Zotero.DataDirectory.getDatabase(this._dbName, 'tmp'); + var tmpFile = this._dbPath + '.tmp'; if (yield OS.File.exists(tmpFile)) { try { yield OS.File.remove(tmpFile); @@ -1041,11 +1062,14 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function if (DB_LOCK_EXCLUSIVE) { yield this.queryAsync("PRAGMA main.locking_mode=NORMAL", false, { inBackup: true }); } - storageService.backupDatabaseFile(file, OS.Path.basename(tmpFile), file.parent); + storageService.backupDatabaseFile( + Zotero.File.pathToFile(file), + OS.Path.basename(tmpFile), + Zotero.File.pathToFile(file).parent + ); } catch (e) { - Zotero.debug(e); - Components.utils.reportError(e); + Zotero.logError(e); return false; } finally { @@ -1081,7 +1105,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function // Special backup if (!suffix && numBackups > 1) { // Remove oldest backup file - var targetFile = Zotero.DataDirectory.getDatabase(this._dbName, (numBackups - 1) + '.bak'); + let targetFile = this._dbPath + '.' + (numBackups - 1) + '.bak'; if (yield OS.File.exists(targetFile)) { yield OS.File.remove(targetFile); } @@ -1091,12 +1115,8 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function var targetNum = i; var sourceNum = targetNum - 1; - var targetFile = Zotero.DataDirectory.getDatabase( - this._dbName, targetNum + '.bak' - ); - var sourceFile = Zotero.DataDirectory.getDatabase( - this._dbName, sourceNum ? sourceNum + '.bak' : 'bak' - ); + let targetFile = this._dbPath + '.' + targetNum + '.bak'; + let sourceFile = this._dbPath + '.' + (sourceNum ? sourceNum + '.bak' : 'bak') if (!(yield OS.File.exists(sourceFile))) { continue; @@ -1108,9 +1128,7 @@ Zotero.DBConnection.prototype.backupDatabase = Zotero.Promise.coroutine(function } } - var backupFile = Zotero.DataDirectory.getDatabase( - this._dbName, (suffix ? suffix + '.' : '') + 'bak' - ); + let backupFile = this._dbPath + '.' + (suffix ? suffix + '.' : '') + 'bak'; // Remove old backup file if (yield OS.File.exists(backupFile)) { @@ -1147,11 +1165,11 @@ Zotero.DBConnection.prototype._getConnection = function (options) { /* * Retrieve a link to the data store asynchronously */ -Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(function* (options) { +Zotero.DBConnection.prototype._getConnectionAsync = async function (options) { // If a backup is in progress, wait until it's done if (this._backupPromise && this._backupPromise.isPending() && (!options || !options.inBackup)) { Zotero.debug("Waiting for database backup to complete", 2); - yield this._backupPromise; + await this._backupPromise; } if (this._connection) { @@ -1162,48 +1180,50 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun } this._debug("Asynchronously opening database '" + this._dbName + "'"); + Zotero.debug(this._dbPath); // Get the storage service var store = Components.classes["@mozilla.org/storage/service;1"]. getService(Components.interfaces.mozIStorageService); - var file = Zotero.File.pathToFile(Zotero.DataDirectory.getDatabase(this._dbName)); - var backupFile = Zotero.File.pathToFile(Zotero.DataDirectory.getDatabase(this._dbName, 'bak')); - - var fileName = this._dbName + '.sqlite'; + var file = this._dbPath; + var backupFile = this._dbPath + '.bak'; + var fileName = OS.Path.basename(file); + var corruptMarker = this._dbPath + '.is.corrupt'; catchBlock: try { - var corruptMarker = Zotero.File.pathToFile(Zotero.DataDirectory.getDatabase(this._dbName, 'is.corrupt')); - if (corruptMarker.exists()) { + if (await OS.File.exists(corruptMarker)) { throw new Error(this.DB_CORRUPTION_STRING); } - this._connection = yield Zotero.Promise.resolve(this.Sqlite.openConnection({ - path: file.path + this._connection = await Zotero.Promise.resolve(this.Sqlite.openConnection({ + path: file })); } catch (e) { + // Don't deal with corrupted external dbs + if (this._externalDB) { + throw e; + } + Zotero.logError(e); if (e.message.includes(this.DB_CORRUPTION_STRING)) { - this._debug("Database file '" + file.leafName + "' corrupted", 1); + this._debug(`Database file '${fileName}' corrupted`, 1); // No backup file! Eek! - if (!backupFile.exists()) { + if (!await OS.File.exists(backupFile)) { this._debug("No backup file for DB '" + this._dbName + "' exists", 1); // Save damaged filed this._debug('Saving damaged DB file with .damaged extension', 1); - var damagedFile = Zotero.File.pathToFile( - Zotero.DataDirectory.getDatabase(this._dbName, 'damaged') - ); + let damagedFile = this._dbPath + '.damaged'; Zotero.moveToUnique(file, damagedFile); // Create new main database - var file = Zotero.File.pathToFile(Zotero.DataDirectory.getDatabase(this._dbName)); this._connection = store.openDatabase(file); - if (corruptMarker.exists()) { - corruptMarker.remove(null); + if (await OS.File.exists(corruptMarker)) { + await OS.File.remove(corruptMarker); } Zotero.alert( @@ -1216,24 +1236,21 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun // Save damaged file this._debug('Saving damaged DB file with .damaged extension', 1); - var damagedFile = Zotero.File.pathToFile( - Zotero.DataDirectory.getDatabase(this._dbName, 'damaged') - ); + let damagedFile = this._dbPath + '.damaged'; Zotero.moveToUnique(file, damagedFile); // Test the backup file try { Zotero.debug("Asynchronously opening DB connection"); - this._connection = yield Zotero.Promise.resolve(this.Sqlite.openConnection({ - path: backupFile.path + this._connection = await Zotero.Promise.resolve(this.Sqlite.openConnection({ + path: backupFile })); } // Can't open backup either catch (e) { // Create new main database - var file = Zotero.File.pathToFile(Zotero.DataDirectory.getDatabase(this._dbName)); - this._connection = yield Zotero.Promise.resolve(this.Sqlite.openConnection({ - path: file.path + this._connection = await Zotero.Promise.resolve(this.Sqlite.openConnection({ + path: file })); Zotero.alert( @@ -1242,8 +1259,8 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun Zotero.getString('db.dbRestoreFailed', fileName) ); - if (corruptMarker.exists()) { - corruptMarker.remove(null); + if (await OS.File.exists(corruptMarker)) { + await OS.File.remove(corruptMarker); } break catchBlock; @@ -1254,7 +1271,7 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun // Copy backup file to main DB file this._debug("Restoring database '" + this._dbName + "' from backup file", 1); try { - backupFile.copyTo(backupFile.parent, fileName); + await OS.File.copy(backupFile, file); } catch (e) { // TODO: deal with low disk space @@ -1262,8 +1279,7 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun } // Open restored database - var file = OS.Path.join(Zotero.DataDirectory.dir, fileName); - this._connection = yield Zotero.Promise.resolve(this.Sqlite.openConnection({ + this._connection = await Zotero.Promise.resolve(this.Sqlite.openConnection({ path: file })); this._debug('Database restored', 1); @@ -1272,13 +1288,13 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun Zotero.getString('general.warning'), Zotero.getString('db.dbRestored', [ fileName, - Zotero.Date.getFileDateString(backupFile), - Zotero.Date.getFileTimeString(backupFile) + Zotero.Date.getFileDateString(Zotero.File.pathToFile(backupFile)), + Zotero.Date.getFileTimeString(Zotero.File.pathToFile(backupFile)) ]) ); - if (corruptMarker.exists()) { - corruptMarker.remove(null); + if (await OS.File.exists(corruptMarker)) { + await OS.File.remove(corruptMarker); } break catchBlock; @@ -1288,44 +1304,36 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun throw (e); } - if (DB_LOCK_EXCLUSIVE) { - yield this.queryAsync("PRAGMA main.locking_mode=EXCLUSIVE"); + if (!this._externalDB) { + if (DB_LOCK_EXCLUSIVE) { + await this.queryAsync("PRAGMA main.locking_mode=EXCLUSIVE"); + } + else { + await this.queryAsync("PRAGMA main.locking_mode=NORMAL"); + } + + // Set page cache size to 8MB + let pageSize = await this.valueQueryAsync("PRAGMA page_size"); + let cacheSize = 8192000 / pageSize; + await this.queryAsync("PRAGMA cache_size=" + cacheSize); + + // Enable foreign key checks + await this.queryAsync("PRAGMA foreign_keys=true"); + + // Register idle observer for DB backup + Zotero.Schema.schemaUpdatePromise.then(() => { + Zotero.debug("Initializing DB backup idle observer"); + var idleService = Components.classes["@mozilla.org/widget/idleservice;1"] + .getService(Components.interfaces.nsIIdleService); + idleService.addIdleObserver(this, 300); + }); } - else { - yield this.queryAsync("PRAGMA main.locking_mode=NORMAL"); - } - - // Set page cache size to 8MB - var pageSize = yield this.valueQueryAsync("PRAGMA page_size"); - var cacheSize = 8192000 / pageSize; - yield this.queryAsync("PRAGMA cache_size=" + cacheSize); - - // Enable foreign key checks - yield this.queryAsync("PRAGMA foreign_keys=true"); - - // Register idle observer for DB backup - Zotero.Schema.schemaUpdatePromise.then(() => { - Zotero.debug("Initializing DB backup idle observer"); - var idleService = Components.classes["@mozilla.org/widget/idleservice;1"] - .getService(Components.interfaces.nsIIdleService); - idleService.addIdleObserver(this, 300); - }); return this._connection; -}); +}; Zotero.DBConnection.prototype._debug = function (str, level) { var prefix = this._dbName == 'zotero' ? '' : '[' + this._dbName + '] '; Zotero.debug(prefix + str, level); } - - -// Initialize main database connection -Zotero.DB = new Zotero.DBConnection('zotero'); - -Zotero.DB.IncompatibleVersionException = function (msg, dbClientVersion) { - this.message = msg; - this.dbClientVersion = dbClientVersion; -} -Zotero.DB.IncompatibleVersionException.prototype = Object.create(Error.prototype); diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index e15ea10ca..a0947cf36 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -877,6 +877,9 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); * Initializes the DB connection */ var _initDB = Zotero.Promise.coroutine(function* (haveReleasedLock) { + // Initialize main database connection + Zotero.DB = new Zotero.DBConnection('zotero'); + try { // Test read access yield Zotero.DB.test(); From 0f4e5ef508fd3ee58bfe5f429ad3f491cbf73196 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 2 Jun 2018 04:10:49 -0400 Subject: [PATCH 12/12] Mendeley import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Accept Mendeley SQLite databases via File → Import… and perform a direct import, including collections, timestamps, notes, attachments, and extracted annotations. When a Mendeley database is present, File → Import… shows a wizard that lets you choose between a file and Mendeley for the source, and choosing the latter shows a list of available databases in the Mendeley data directory. Known fields that aren't valid for a type are stored in Extra. Files in the Mendeley 'Downloaded' folder are stored. Files elsewhere are linked. --- chrome/content/zotero/fileInterface.js | 301 +++++-- chrome/content/zotero/import/importWizard.js | 202 +++++ chrome/content/zotero/import/importWizard.xul | 62 ++ .../zotero/import/mendeley/mendeleyImport.js | 830 ++++++++++++++++++ .../import/mendeley/mendeleySchemaMap.js | 102 +++ .../content/zotero/xpcom/data/collection.js | 2 +- .../content/zotero/xpcom/data/dataObject.js | 4 +- chrome/content/zotero/xpcom/data/relations.js | 3 +- chrome/content/zotero/xpcom/mime.js | 5 +- chrome/content/zotero/zoteroPane.xul | 2 +- chrome/locale/en-US/zotero/zotero.dtd | 8 + chrome/locale/en-US/zotero/zotero.properties | 4 + chrome/skin/default/zotero/importWizard.css | 44 + 13 files changed, 1512 insertions(+), 57 deletions(-) create mode 100644 chrome/content/zotero/import/importWizard.js create mode 100644 chrome/content/zotero/import/importWizard.xul create mode 100644 chrome/content/zotero/import/mendeley/mendeleyImport.js create mode 100644 chrome/content/zotero/import/mendeley/mendeleySchemaMap.js create mode 100644 chrome/skin/default/zotero/importWizard.css diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js index b428e0e5e..a093d8b0e 100644 --- a/chrome/content/zotero/fileInterface.js +++ b/chrome/content/zotero/fileInterface.js @@ -23,6 +23,8 @@ ***** END LICENSE BLOCK ***** */ +Components.utils.import("resource://gre/modules/osfile.jsm") + /****Zotero_File_Exporter**** ** * A class to handle exporting of items, collections, or the entire library @@ -206,10 +208,117 @@ var Zotero_File_Interface = new function() { } } + + this.startImport = async function () { + // Show the wizard if a Mendeley database is found + var mendeleyDBs = await this.findMendeleyDatabases(); + var showWizard = !!mendeleyDBs.length; + if (showWizard) { + this.showImportWizard(); + } + // Otherwise just show the filepicker + else { + await this.importFile(null, true); + } + } + + + this.getMendeleyDirectory = function () { + Components.classes["@mozilla.org/net/osfileconstantsservice;1"] + .getService(Components.interfaces.nsIOSFileConstantsService) + .init(); + var path = OS.Constants.Path.homeDir; + if (Zotero.isMac) { + path = OS.Path.join(path, 'Library', 'Application Support', 'Mendeley Desktop'); + } + else if (Zotero.isWin) { + path = OS.Path.join(path, 'AppData', 'Local', 'Mendeley Ltd', 'Desktop'); + } + else if (Zotero.isLinux) { + path = OS.Path.join(path, '.local', 'share', 'data', 'Mendeley Ltd.', 'Mendeley Desktop'); + } + else { + throw new Error("Invalid platform"); + } + return path; + }; + + + this.findMendeleyDatabases = async function () { + var dbs = []; + try { + var dir = this.getMendeleyDirectory(); + if (!await OS.File.exists(dir)) { + Zotero.debug(`${dir} does not exist`); + return dbs; + } + await Zotero.File.iterateDirectory(dir, function* (iterator) { + while (true) { + let entry = yield iterator.next(); + if (entry.isDir) continue; + // online.sqlite, counterintuitively, is the default database before you sign in + if (entry.name == 'online.sqlite' || entry.name.endsWith('@www.mendeley.com.sqlite')) { + dbs.push({ + name: entry.name, + path: entry.path, + lastModified: null, + size: null + }); + } + } + }); + for (let i = 0; i < dbs.length; i++) { + let dbPath = OS.Path.join(dir, dbs[i].name); + let info = await OS.File.stat(dbPath); + dbs[i].size = info.size; + dbs[i].lastModified = info.lastModificationDate; + } + dbs.sort((a, b) => { + return b.lastModified - a.lastModified; + }); + } + catch (e) { + Zotero.logError(e); + } + return dbs; + }; + + + this.showImportWizard = function () { + try { + let win = Services.ww.openWindow(null, "chrome://zotero/content/import/importWizard.xul", + "importFile", "chrome,dialog=yes,centerscreen,width=600,height=400", null); + } + catch (e) { + Zotero.debug(e, 1); + throw e; + } + }; + + /** * Creates Zotero.Translate instance and shows file picker for file import + * + * @param {Object} options + * @param {nsIFile|string|null} [options.file=null] - File to import, or none to show a filepicker + * @param {Boolean} [options.createNewCollection=false] - Put items in a new collection + * @param {Function} [options.onBeforeImport] - Callback to receive translation object, useful + * for displaying progress in a different way. This also causes an error to be throw + * instead of shown in the main window. */ - this.importFile = Zotero.Promise.coroutine(function* (file, createNewCollection) { + this.importFile = Zotero.Promise.coroutine(function* (options = {}) { + if (!options) { + options = {}; + } + if (typeof options == 'string' || options instanceof Components.interfaces.nsIFile) { + Zotero.debug("WARNING: importFile() now takes a single options object -- update your code"); + options = { file: options }; + } + + var file = options.file ? Zotero.File.pathToFile(options.file) : null; + var createNewCollection = options.createNewCollection; + var onBeforeImport = options.onBeforeImport; + if(createNewCollection === undefined) { createNewCollection = true; } else if(!createNewCollection) { @@ -231,21 +340,51 @@ var Zotero_File_Interface = new function() { fp.appendFilters(nsIFilePicker.filterAll); var collation = Zotero.getLocaleCollation(); - translators.sort((a, b) => collation.compareString(1, a.label, b.label)) - for (let translator of translators) { - fp.appendFilter(translator.label, "*." + translator.target); + + // Add Mendeley DB, which isn't a translator + let mendeleyFilter = { + label: "Mendeley Database", // TODO: Localize + target: "*.sqlite" + }; + let filters = [...translators]; + filters.push(mendeleyFilter); + + filters.sort((a, b) => collation.compareString(1, a.label, b.label)); + for (let filter of filters) { + fp.appendFilter(filter.label, "*." + filter.target); } var rv = fp.show(); + Zotero.debug(rv); if (rv !== nsIFilePicker.returnOK && rv !== nsIFilePicker.returnReplace) { return false; } file = fp.file; + + Zotero.debug(`File is ${file.path}`); } - + + var defaultNewCollectionPrefix = Zotero.getString("fileInterface.imported"); + + // Check if the file is an SQLite database + var sample = yield Zotero.File.getSample(file.path); + if (Zotero.MIME.sniffForMIMEType(sample) == 'application/x-sqlite3' + // Blacklist the current Zotero database, which would cause a hang + && file.path != Zotero.DataDirectory.getDatabase()) { + // Mendeley import doesn't use the real translation architecture, but we create a + // translation object with the same interface + translation = yield _getMendeleyTranslation(); + defaultNewCollectionPrefix = "Mendeley Import"; + } + translation.setLocation(file); - yield _finishImport(translation, createNewCollection); + return _finishImport({ + translation, + createNewCollection, + defaultNewCollectionPrefix, + onBeforeImport + }); }); @@ -287,17 +426,31 @@ var Zotero_File_Interface = new function() { }); - var _finishImport = Zotero.Promise.coroutine(function* (translation, createNewCollection) { + var _finishImport = Zotero.Promise.coroutine(function* (options) { + var t = performance.now(); + + var translation = options.translation; + var createNewCollection = options.createNewCollection; + var defaultNewCollectionPrefix = options.defaultNewCollectionPrefix; + var onBeforeImport = options.onBeforeImport; + + var showProgressWindow = !onBeforeImport; + let translators = yield translation.getTranslators(); - - if(!translators.length) { - var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Components.interfaces.nsIPromptService); - var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_OK) - + (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_IS_STRING); - var index = ps.confirmEx( + + // Unrecognized file + if (!translators.length) { + if (onBeforeImport) { + yield onBeforeImport(false); + } + + let ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] + .getService(Components.interfaces.nsIPromptService); + let buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_OK + + ps.BUTTON_POS_1 * ps.BUTTON_TITLE_IS_STRING; + let index = ps.confirmEx( null, - "", + Zotero.getString('general.error'), Zotero.getString("fileInterface.unsupportedFormat"), buttonFlags, null, @@ -305,17 +458,17 @@ var Zotero_File_Interface = new function() { null, null, {} ); if (index == 1) { - ZoteroPane_Local.loadURI("http://zotero.org/support/kb/importing"); + Zotero.launchURL("https://www.zotero.org/support/kb/importing"); } - return; + return false; } - + let importCollection = null, libraryID = Zotero.Libraries.userLibraryID; try { libraryID = ZoteroPane.getSelectedLibraryID(); importCollection = ZoteroPane.getSelectedCollection(); } catch(e) {} - + if(createNewCollection) { // Create a new collection to take imported items let collectionName; @@ -330,8 +483,9 @@ var Zotero_File_Interface = new function() { break; } } - } else { - collectionName = Zotero.getString("fileInterface.imported")+" "+(new Date()).toLocaleString(); + } + else { + collectionName = defaultNewCollectionPrefix + " " + (new Date()).toLocaleString(); } importCollection = new Zotero.Collection; importCollection.libraryID = libraryID; @@ -342,22 +496,29 @@ var Zotero_File_Interface = new function() { translation.setTranslator(translators[0]); // Show progress popup - var progressWin = new Zotero.ProgressWindow({ - closeOnClick: false - }); - progressWin.changeHeadline(Zotero.getString('fileInterface.importing')); - var icon = 'chrome://zotero/skin/treesource-unfiled' + (Zotero.hiDPI ? "@2x" : "") + '.png'; - let progress = new progressWin.ItemProgress( - icon, translation.path ? OS.Path.basename(translation.path) : translators[0].label - ); - progressWin.show(); + var progressWin; + var progress; + if (showProgressWindow) { + progressWin = new Zotero.ProgressWindow({ + closeOnClick: false + }); + progressWin.changeHeadline(Zotero.getString('fileInterface.importing')); + let icon = 'chrome://zotero/skin/treesource-unfiled' + (Zotero.hiDPI ? "@2x" : "") + '.png'; + progress = new progressWin.ItemProgress( + icon, translation.path ? OS.Path.basename(translation.path) : translators[0].label + ); + progressWin.show(); + + translation.setHandler("itemDone", function () { + progress.setProgress(translation.getProgress()); + }); + + yield Zotero.Promise.delay(0); + } + else { + yield onBeforeImport(translation); + } - translation.setHandler("itemDone", function () { - progress.setProgress(translation.getProgress()); - }); - - yield Zotero.Promise.delay(0); - let failed = false; try { yield translation.translate({ @@ -365,6 +526,10 @@ var Zotero_File_Interface = new function() { collections: importCollection ? [importCollection.id] : null }); } catch(e) { + if (!showProgressWindow) { + throw e; + } + progressWin.close(); Zotero.logError(e); Zotero.alert( @@ -372,26 +537,62 @@ var Zotero_File_Interface = new function() { Zotero.getString('general.error'), Zotero.getString("fileInterface.importError") ); - return; + return false; } - // Show popup on completion var numItems = translation.newItems.length; - progressWin.changeHeadline(Zotero.getString('fileInterface.importComplete')); - if (numItems == 1) { - var icon = translation.newItems[0].getImageSrc(); + + // Show popup on completion + if (showProgressWindow) { + progressWin.changeHeadline(Zotero.getString('fileInterface.importComplete')); + let icon; + if (numItems == 1) { + icon = translation.newItems[0].getImageSrc(); + } + else { + icon = 'chrome://zotero/skin/treesource-unfiled' + (Zotero.hiDPI ? "@2x" : "") + '.png'; + } + let text = Zotero.getString(`fileInterface.itemsWereImported`, numItems, numItems); + progress.setIcon(icon); + progress.setText(text); + // For synchronous translators, which don't update progress + progress.setProgress(100); + progressWin.startCloseTimer(5000); } - else { - var icon = 'chrome://zotero/skin/treesource-unfiled' + (Zotero.hiDPI ? "@2x" : "") + '.png'; - } - var text = Zotero.getString(`fileInterface.itemsWereImported`, numItems, numItems); - progress.setIcon(icon); - progress.setText(text); - // For synchronous translators, which don't update progress - progress.setProgress(100); - progressWin.startCloseTimer(5000); + + Zotero.debug(`Imported ${numItems} item(s) in ${performance.now() - t} ms`); + + return true; }); + + var _getMendeleyTranslation = async function () { + if (true) { + Components.utils.import("chrome://zotero/content/import/mendeley/mendeleyImport.js"); + } + // TEMP: Load uncached from ~/zotero-client for development + else { + Components.utils.import("resource://gre/modules/FileUtils.jsm"); + let file = FileUtils.getDir("Home", []); + file = OS.Path.join( + file.path, + 'zotero-client', 'chrome', 'content', 'zotero', 'import', 'mendeley', 'mendeleyImport.js' + ); + let fileURI = OS.Path.toFileURI(file); + let xmlhttp = await Zotero.HTTP.request( + 'GET', + fileURI, + { + dontCache: true, + responseType: 'text' + } + ); + eval(xmlhttp.response); + } + return new Zotero_Import_Mendeley(); + } + + /** * Creates a bibliography from a collection or saved search */ diff --git a/chrome/content/zotero/import/importWizard.js b/chrome/content/zotero/import/importWizard.js new file mode 100644 index 000000000..cd45adcb2 --- /dev/null +++ b/chrome/content/zotero/import/importWizard.js @@ -0,0 +1,202 @@ +var Zotero_Import_Wizard = { + _wizard: null, + _dbs: null, + _file: null, + _translation: null, + + + init: function () { + this._wizard = document.getElementById('import-wizard'); + + Zotero.Translators.init(); // async + }, + + + onModeChosen: async function () { + var wizard = this._wizard; + + this._disableCancel(); + wizard.canRewind = false; + wizard.canAdvance = false; + + var mode = document.getElementById('import-source').selectedItem.id; + try { + switch (mode) { + case 'radio-import-source-file': + await this.doImport(); + break; + + case 'radio-import-source-mendeley': + this._dbs = await Zotero_File_Interface.findMendeleyDatabases(); + // This shouldn't happen, because we only show the wizard if there are databases + if (!this._dbs.length) { + throw new Error("No databases found"); + } + if (this._dbs.length > 1 || true) { + this._populateFileList(this._dbs); + document.getElementById('file-options-header').textContent + = Zotero.getString('fileInterface.chooseAppDatabaseToImport', 'Mendeley') + wizard.goTo('page-file-options'); + wizard.canRewind = true; + this._enableCancel(); + } + break; + + default: + throw new Error(`Unknown mode ${mode}`); + } + } + catch (e) { + this._onDone( + Zotero.getString('general.error'), + Zotero.getString('fileInterface.importError'), + true + ); + throw e; + } + }, + + + onFileSelected: async function () { + this._wizard.canAdvance = true; + }, + + + onFileChosen: async function () { + var index = document.getElementById('file-list').selectedIndex; + this._file = this._dbs[index].path; + this._disableCancel(); + this._wizard.canRewind = false; + this._wizard.canAdvance = false; + await this.doImport(); + }, + + + onBeforeImport: async function (translation) { + // Unrecognized translator + if (!translation) { + // Allow error dialog to be displayed, and then close window + setTimeout(function () { + window.close(); + }); + return; + } + + this._translation = translation; + + // Switch to progress pane + this._wizard.goTo('page-progress'); + var pm = document.getElementById('import-progressmeter'); + + translation.setHandler('itemDone', function () { + pm.value = translation.getProgress(); + }); + }, + + + doImport: async function () { + try { + let result = await Zotero_File_Interface.importFile({ + file: this._file, + onBeforeImport: this.onBeforeImport.bind(this) + }); + + // Cancelled by user or due to error + if (!result) { + window.close(); + return; + } + + let numItems = this._translation.newItems.length; + this._onDone( + Zotero.getString('fileInterface.importComplete'), + Zotero.getString(`fileInterface.itemsWereImported`, numItems, numItems) + ); + } + catch (e) { + this._onDone( + Zotero.getString('general.error'), + Zotero.getString('fileInterface.importError'), + true + ); + throw e; + } + }, + + + reportError: function () { + Zotero.getActiveZoteroPane().reportErrors(); + window.close(); + }, + + + _populateFileList: async function (files) { + var listbox = document.getElementById('file-list'); + + // Remove existing entries + var items = listbox.getElementsByTagName('listitem'); + for (let item of items) { + listbox.removeChild(item); + } + + for (let file of files) { + let li = document.createElement('listitem'); + + let name = document.createElement('listcell'); + // Simply filenames + let nameStr = file.name + .replace(/\.sqlite$/, '') + .replace(/@www\.mendeley\.com$/, ''); + if (nameStr == 'online') { + nameStr = Zotero.getString('dataDir.default', 'online.sqlite'); + } + name.setAttribute('label', nameStr + ' '); + li.appendChild(name); + + let lastModified = document.createElement('listcell'); + lastModified.setAttribute('label', file.lastModified.toLocaleString() + ' '); + li.appendChild(lastModified); + + let size = document.createElement('listcell'); + size.setAttribute( + 'label', + Zotero.getString('general.nMegabytes', (file.size / 1024 / 1024).toFixed(1)) + ' ' + ); + li.appendChild(size); + + listbox.appendChild(li); + } + + if (files.length == 1) { + listbox.selectedIndex = 0; + } + }, + + + _enableCancel: function () { + this._wizard.getButton('cancel').disabled = false; + }, + + + _disableCancel: function () { + this._wizard.getButton('cancel').disabled = true; + }, + + + _onDone: function (label, description, showReportErrorButton) { + var wizard = this._wizard; + wizard.getPageById('page-done').setAttribute('label', label); + document.getElementById('result-description').textContent = description; + + if (showReportErrorButton) { + let button = document.getElementById('result-report-error'); + button.setAttribute('label', Zotero.getString('errorReport.reportError')); + button.hidden = false; + } + + // When done, move to last page and allow closing + wizard.canAdvance = true; + wizard.goTo('page-done'); + wizard.canRewind = false; + } +}; diff --git a/chrome/content/zotero/import/importWizard.xul b/chrome/content/zotero/import/importWizard.xul new file mode 100644 index 000000000..6e6da62df --- /dev/null +++ b/chrome/content/zotero/import/importWizard.xul @@ -0,0 +1,62 @@ + + + + + + + + + +