From 61452a835b0442c09a1c5743bfbc343e598de6b9 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 31 May 2017 00:42:17 -0400
Subject: [PATCH] Fix auto-restore of automatic backup on DB corruption error

---
 chrome/content/zotero/xpcom/db.js            | 38 +++++++++++++-------
 chrome/locale/en-US/zotero/zotero.properties |  6 ++--
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
index f98c76087..5938e8dfa 100644
--- a/chrome/content/zotero/xpcom/db.js
+++ b/chrome/content/zotero/xpcom/db.js
@@ -37,6 +37,7 @@ Zotero.DBConnection = function(dbName) {
 	}
 	
 	this.MAX_BOUND_PARAMETERS = 999;
+	this.DB_CORRUPTION_STRING = "2152857611";
 	
 	Components.utils.import("resource://gre/modules/Sqlite.jsm", this);
 	
@@ -893,7 +894,7 @@ Zotero.DBConnection.prototype.integrityCheck = Zotero.Promise.coroutine(function
 
 
 Zotero.DBConnection.prototype.checkException = function (e) {
-	if (e.name && e.name == 'NS_ERROR_FILE_CORRUPTED') {
+	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'));
 		Zotero.File.putContents(file, '');
@@ -1173,16 +1174,16 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun
 	catchBlock: try {
 		var corruptMarker = Zotero.File.pathToFile(Zotero.DataDirectory.getDatabase(this._dbName, 'is.corrupt'));
 		if (corruptMarker.exists()) {
-			throw {
-				name: 'NS_ERROR_FILE_CORRUPTED'
-			};
+			throw new Error(this.DB_CORRUPTION_STRING);
 		}
 		this._connection = yield Zotero.Promise.resolve(this.Sqlite.openConnection({
 			path: file.path
 		}));
 	}
 	catch (e) {
-		if (e.name=='NS_ERROR_FILE_CORRUPTED') {
+		Zotero.logError(e);
+		
+		if (e.message.includes(this.DB_CORRUPTION_STRING)) {
 			this._debug("Database file '" + file.leafName + "' corrupted", 1);
 			
 			// No backup file! Eek!
@@ -1204,7 +1205,11 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun
 					corruptMarker.remove(null);
 				}
 				
-				alert(Zotero.getString('db.dbCorruptedNoBackup', fileName));
+				Zotero.alert(
+					null,
+					Zotero.getString('startupError'),
+					Zotero.getString('db.dbCorruptedNoBackup', fileName)
+				);
 				break catchBlock;
 			}
 			
@@ -1230,7 +1235,11 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun
 					path: file.path
 				}));
 				
-				alert(Zotero.getString('db.dbRestoreFailed', fileName));
+				Zotero.alert(
+					null,
+					Zotero.getString('general.error'),
+					Zotero.getString('db.dbRestoreFailed', fileName)
+				);
 				
 				if (corruptMarker.exists()) {
 					corruptMarker.remove(null);
@@ -1257,12 +1266,15 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun
 				path: file
 			}));
 			this._debug('Database restored', 1);
-			var msg = Zotero.getString('db.dbRestored', [
-				fileName,
-				Zotero.Date.getFileDateString(backupFile),
-				Zotero.Date.getFileTimeString(backupFile)
-			]);
-			alert(msg);
+			Zotero.alert(
+				null,
+				Zotero.getString('general.warning'),
+				Zotero.getString('db.dbRestored', [
+					fileName,
+					Zotero.Date.getFileDateString(backupFile),
+					Zotero.Date.getFileTimeString(backupFile)
+				])
+			);
 			
 			if (corruptMarker.exists()) {
 				corruptMarker.remove(null);
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 3c97ed86e..ca969cbff 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -571,9 +571,9 @@ ingester.lookup.error			= An error occurred while performing lookup for this ite
 
 db.dbCorrupted					= The Zotero database '%S' appears to have become corrupted.
 db.dbCorrupted.restart			= Please restart %S to attempt an automatic restore from the last backup.
-db.dbCorruptedNoBackup			= The Zotero database '%S' appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
-db.dbRestored					= The Zotero database '%1$S' appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %2$S at %3$S. The damaged file was saved in your Zotero directory.
-db.dbRestoreFailed				= The Zotero database '%S' appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
+db.dbCorruptedNoBackup			= The Zotero database '%S' appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved to your Zotero data directory.
+db.dbRestored					= The Zotero database '%1$S' appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %2$S at %3$S. The damaged file was saved to your Zotero data directory.
+db.dbRestoreFailed				= The Zotero database '%S' appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved to your Zotero data directory.
 
 db.integrityCheck.passed		= No errors were found in the database.
 db.integrityCheck.failed		= Errors were found in your Zotero database.