scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-08-28 05:25:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Offer to reset data directory on SQLite I/O error at startup

Browse source 
When a custom data directory is on a network share or in a cloud storage
folder, SQLite can fail to open with NS_ERROR_STORAGE_IOERR and the user
previously had to manually edit prefs.js to recover. Show a "Use Default
Location" button in the startup error dialog that resets the data
directory pref and restarts.

Addresses #4860
This commit is contained in:
Dan Stillman 2026-04-22 13:29:03 -04:00
parent e7ed0b2881
commit 0b15b794e6
2 changed files with 45 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
chrome/content/zotero/xpcom/zotero.js
View file

@ -848,6 +848,7 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
}
catch (e) {
if (_checkDataDirAccessError(e)) {}
else if (_checkDataDirStorageIOError(e)) {}
// Storage busy
else if (e.message.includes('2153971713')) {
Zotero.startupError = Zotero.getString('startupError.databaseInUse');
@ -899,8 +900,49 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
Zotero.startupError = msg;
return true;
}
/**
* Check for an SQLite I/O error when using a custom data directory, which typically means
* the data directory is on a network share or in a cloud storage folder, and offer the user
* a way to reset the data directory to the default location so they can start up without having
* to edit prefs.js manually.
*/
function _checkDataDirStorageIOError(e) {
// NS_ERROR_STORAGE_IOERR (0x80630002)
if (e.name != 'NS_ERROR_STORAGE_IOERR' && !e.message.includes('2153971714')) {
return false;
}
// Only handle the case where a custom data directory is in use -- in the default
// location, an I/O error is more likely something else (disk issue, antivirus, etc.)
// and swapping locations probably won't help.
if (Zotero.DataDirectory.dir == Zotero.DataDirectory.defaultDir) {
return false;
}
Zotero.startupError = Zotero.getString('dataDir.databaseCannotBeOpened', Zotero.clientName)
+ "\n\n"
+ Zotero.getString('data-dir-unsupported-storage')
+ "\n\n"
+ Zotero.getString('dataDir.location', Zotero.DataDirectory.dir);
_startupErrorHandler = async function () {
let index = Zotero.Prompt.confirm({
title: Zotero.getString('general.error'),
text: Zotero.startupError,
button0: Zotero.getString('dataDir.useDefaultLocation'),
button1: Zotero.getString('general.quit'),
});
// Revert to default location
if (index == 0) {
Zotero.DataDirectory.set(Zotero.DataDirectory.defaultDir);
Zotero.Utilities.Internal.quit(true);
}
};
return true;
}
this.shutdown = async function () {
Zotero.debug("Shutting down Zotero");

1
chrome/locale/en-US/zotero/zotero.ftl
View file

@ -899,3 +899,4 @@ banner-close-button =
plugins-blocked-plugin =
.message = This plugin has been disabled by { -app-name }.
data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.