suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create database when new data dir location is set in pref

Browse Source 
Regression from new data directory handling
This commit is contained in:
Dan Stillman 2016-11-16 00:37:24 -05:00
parent d88cfc6c5f
commit 06ad369368
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
chrome/content/zotero/xpcom/zotero.js
View File

@ -271,6 +271,8 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
// Make sure that Zotero Standalone is not running as root // Make sure that Zotero Standalone is not running as root
if(Zotero.isStandalone && !Zotero.isWin) _checkRoot(); if(Zotero.isStandalone && !Zotero.isWin) _checkRoot();
_addToolbarIcon();
try { try {
var dataDir = Zotero.getZoteroDirectory(); var dataDir = Zotero.getZoteroDirectory();
} }
@ -955,10 +957,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
throw (e); throw (e);
} }
this.setDataDirectory(file.path); this.setDataDirectory(file.path);
if (!file.exists()) {
var e = { name: "NS_ERROR_FILE_NOT_FOUND" };
throw (e);
}
} }
else { else {
// If there's a migration marker in this directory and no database, migration was // If there's a migration marker in this directory and no database, migration was
@ -991,6 +989,17 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
} }
} }
} }
if (!file.exists()) {
// If useDataDir is set to ~/Zotero and it doesn't exist, create it
if (file.path == this.getDefaultDataDir()) {
Zotero.File.createDirectoryIfMissing(file);
}
else {
let e = { name: "NS_ERROR_FILE_NOT_FOUND" };
throw e;
}
}
} }
else { else {
let dataDir = this.getDefaultDataDir(); let dataDir = this.getDefaultDataDir();