mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More data dir fixes (after f2163b3433 and bc3386ff9d)

Browse source 
Fixes error creating a new Standalone profile
This commit is contained in:
Dan Stillman 2016-11-18 01:37:46 -05:00
parent 0f5d2fea82
commit ef2a403d7b
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -942,9 +942,11 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
return Zotero.File.pathToFile(_dataDirectory); return Zotero.File.pathToFile(_dataDirectory);
} }
var file = Components.classes["@mozilla.org/file/local;1"] var file;
.createInstance(Components.interfaces.nsILocalFile);
if (Zotero.Prefs.get('useDataDir')) { if (Zotero.Prefs.get('useDataDir')) {
file = Components.classes["@mozilla.org/file/local;1"]
.createInstance(Components.interfaces.nsILocalFile);
let prefVal = Zotero.Prefs.get('dataDir'); let prefVal = Zotero.Prefs.get('dataDir');
// Convert old persistent descriptor pref to string path and clear obsolete lastDataDir pref // Convert old persistent descriptor pref to string path and clear obsolete lastDataDir pref
// //
@ -997,15 +999,11 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
} }
} }
if (!file.exists()) { // If data directory from pref doesn't exist and it's not the default, throw to trigger
// If useDataDir is set to ~/Zotero and it doesn't exist, create it // not-found dialog
if (file.path == this.getDefaultDataDir()) { if (!file.exists() && file.path != this.getDefaultDataDir()) {
Zotero.File.createDirectoryIfMissing(file); let e = { name: "NS_ERROR_FILE_NOT_FOUND" };
} throw e;
else {
let e = { name: "NS_ERROR_FILE_NOT_FOUND" };
throw e;
}
} }
} }
else { else {
@ -1120,18 +1118,21 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
} }
} }
// If a custom data directory isn't now defined and there's a data directory in the // If there's a data directory in the default profile for the alternative app, use that
// default profile for the alternative app, use that
let zoteroDir = OS.Path.join(profileDir, ZOTERO_CONFIG.ID); let zoteroDir = OS.Path.join(profileDir, ZOTERO_CONFIG.ID);
if (!Zotero.Prefs.get("useDataDir") && Zotero.File.pathToFile(profileDir).exists()) { if (Zotero.File.pathToFile(zoteroDir).exists()) {
this.setDataDirectory(zoteroDir); this.setDataDirectory(zoteroDir);
file = Zotero.File.pathToFile(zoteroDir);
} }
file = Zotero.File.pathToFile(zoteroDir);
} }
Zotero.File.createDirectoryIfMissing(file); if (!file) {
file = dataDir;
}
} }
Zotero.debug("Using data directory " + file.path); Zotero.debug("Using data directory " + file.path);
Zotero.File.createDirectoryIfMissing(file);
this._cacheDataDirectory(file.path); this._cacheDataDirectory(file.path);
return file.clone(); return file.clone();
} }