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

Use system temp directory by default

Browse source 
Might help for something like
https://forums.zotero.org/discussion/106337/zotero-7-sync-error
This commit is contained in:
Dan Stillman 2023-07-20 05:34:09 -04:00
parent 75c46e1e5c
commit 51c70eb925
1 changed files with 49 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,10 @@ Components.classes["@mozilla.org/net/osfileconstantsservice;1"]
.getService(Components.interfaces.nsIOSFileConstantsService)
.init();
XPCOMUtils.defineLazyModuleGetters(globalThis, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
});
Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
/*
@ -872,9 +876,6 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
}
yield Promise.all(shutdownPromises);
// remove temp directory
yield Zotero.removeTempDirectory();
if (Zotero.DB) {
// close DB
yield Zotero.DB.closeDatabase(true)
@ -911,13 +912,52 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
this.getTranslatorsDirectory = function () {
return Zotero.File.pathToFile(Zotero.DataDirectory.getSubdirectory('translators', true));
}
this.getTempDirectory = function () {
return Zotero.File.pathToFile(Zotero.DataDirectory.getSubdirectory('tmp', true));
}
this.removeTempDirectory = function () {
return Zotero.DataDirectory.removeSubdirectory('tmp');
var _tmpDir;
this.getTempDirectory = function () {
if (_tmpDir) {
return Zotero.File.pathToFile(_tmpDir);
}
var dir;
try {
dir = Services.dirsvc.get("TmpD", Ci.nsIFile);
let relDir;
if (Zotero.isWin) {
relDir = 'Zotero';
}
else if (Zotero.isMac) {
relDir = 'org.zotero.zotero';
}
else {
relDir = 'zotero';
}
dir.append(relDir);
Zotero.File.createDirectoryIfMissing(dir);
}
// If we can't use the system temp dir, fall back to 'tmp' in the data dir
catch (e) {
Zotero.warn(e);
dir = Zotero.File.pathToFile(Zotero.DataDirectory.getSubdirectory('tmp', true));
}
AsyncShutdown.profileBeforeChange.addBlocker(
"Zotero: Removing temp directory",
() => this.removeTempDirectory()
);
_tmpDir = dir.path;
return dir;
};
this.removeTempDirectory = async function () {
if (!_tmpDir) return;
try {
Zotero.debug("Removing " + _tmpDir);
return IOUtils.remove(_tmpDir, { recursive: true });
}
catch (e) {
Zotero.logError(e);
}
}