Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-27 10:01:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(data_dir): use path.join for safer joins

Browse Source 
https://nodejs.org/api/path.html#pathjoinpaths
This commit is contained in:
Panagiotis Papadopoulos 2025-01-03 15:45:41 +01:00
parent 8826021c63
commit 3481c8ba84
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/services/data_dir.ts
View File

@ -10,7 +10,7 @@
import os from "os"; import os from "os";
import fs from "fs"; import fs from "fs";
import path from "path"; import { join as pathJoin} from "path";
function getAppDataDir() { function getAppDataDir() {
let appDataDir = os.homedir(); // fallback if OS is not recognized let appDataDir = os.homedir(); // fallback if OS is not recognized
@ -46,27 +46,24 @@ function getTriliumDataDir() {
return process.env.TRILIUM_DATA_DIR; return process.env.TRILIUM_DATA_DIR;
} }
const homePath = os.homedir() + path.sep + DIR_NAME; const homePath = pathJoin(os.homedir(), DIR_NAME);
if (fs.existsSync(homePath)) { if (fs.existsSync(homePath)) {
return homePath; return homePath;
} }
const appDataPath = getAppDataDir() + path.sep + DIR_NAME; const appDataPath = pathJoin(getAppDataDir(), DIR_NAME);
createDirIfNotExisting(appDataPath); createDirIfNotExisting(appDataPath);
return appDataPath; return appDataPath;
} }
const TRILIUM_DATA_DIR = getTriliumDataDir(); const TRILIUM_DATA_DIR = getTriliumDataDir();
const DIR_SEP = TRILIUM_DATA_DIR + path.sep;
const DOCUMENT_PATH = process.env.TRILIUM_DOCUMENT_PATH || `${DIR_SEP}document.db`; const DOCUMENT_PATH = process.env.TRILIUM_DOCUMENT_PATH || pathJoin(TRILIUM_DATA_DIR, "document.db");
const BACKUP_DIR = process.env.TRILIUM_BACKUP_DIR || `${DIR_SEP}backup`; const BACKUP_DIR = process.env.TRILIUM_BACKUP_DIR || pathJoin(TRILIUM_DATA_DIR, "backup");
const LOG_DIR = process.env.TRILIUM_LOG_DIR || `${DIR_SEP}log`; const LOG_DIR = process.env.TRILIUM_LOG_DIR || pathJoin(TRILIUM_DATA_DIR, "log");
const ANONYMIZED_DB_DIR = process.env.TRILIUM_ANONYMIZED_DB_DIR || `${DIR_SEP}anonymized-db`; const ANONYMIZED_DB_DIR = process.env.TRILIUM_ANONYMIZED_DB_DIR || pathJoin(TRILIUM_DATA_DIR, "anonymized-db");
const CONFIG_INI_PATH = process.env.TRILIUM_CONFIG_INI_PATH || `${DIR_SEP}config.ini`; const CONFIG_INI_PATH = process.env.TRILIUM_CONFIG_INI_PATH || pathJoin(TRILIUM_DATA_DIR, "config.ini");
export default { export default {
TRILIUM_DATA_DIR, TRILIUM_DATA_DIR,