Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 11:26:15 +01:00
Code Issues Packages Projects Releases Activity

Revert "chore(dx/server): improve asset management for DB init"

Browse Source 
This reverts commit 42559364e4.
This commit is contained in:
Elian Doran
2025-08-31 20:31:51 +03:00
parent 42559364e4
commit 91ae9d75f7
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/server/src/services/assets.ts
View File

@@ -1,10 +0,0 @@
import { join } from "path";
const ASSET_ROOT_DIR = process.env.SERVER_ASSET_ROOT_DIR;
if (!ASSET_ROOT_DIR) {
console.error("Missing SERVER_ASSET_ROOT_DIR env.");
process.exit(1);
}
/** Contains database initialization data such as the demo database and the schema. */
export const DB_INIT_DIR = join(ASSET_ROOT_DIR, "db")

7
apps/server/src/services/resource_dir.ts
View File

@@ -6,8 +6,15 @@ export const RESOURCE_DIR = path.join(getResourceDir(), "assets");
// where the "trilium" executable is // where the "trilium" executable is
const ELECTRON_APP_ROOT_DIR = path.resolve(RESOURCE_DIR, "../.."); const ELECTRON_APP_ROOT_DIR = path.resolve(RESOURCE_DIR, "../..");
const DB_INIT_DIR = path.resolve(RESOURCE_DIR, "db");
if (!fs.existsSync(DB_INIT_DIR)) {
console.error(`Could not find DB initialization directory: ${DB_INIT_DIR}`);
process.exit(1);
}
export default { export default {
RESOURCE_DIR, RESOURCE_DIR,
DB_INIT_DIR,
ELECTRON_APP_ROOT_DIR ELECTRON_APP_ROOT_DIR
}; };

8
apps/server/src/services/sql_init.ts
View File

@@ -1,5 +1,6 @@
import log from "./log.js"; import log from "./log.js";
import fs from "fs"; import fs from "fs";
import resourceDir from "./resource_dir.js";
import sql from "./sql.js"; import sql from "./sql.js";
import { isElectron, deferred } from "./utils.js"; import { isElectron, deferred } from "./utils.js";
import optionService from "./options.js"; import optionService from "./options.js";
@@ -16,7 +17,6 @@ import zipImportService from "./import/zip.js";
import password from "./encryption/password.js"; import password from "./encryption/password.js";
import backup from "./backup.js"; import backup from "./backup.js";
import eventService from "./events.js"; import eventService from "./events.js";
import { DB_INIT_DIR } from "./assets.js";
export const dbReady = deferred<void>(); export const dbReady = deferred<void>();
@@ -75,8 +75,8 @@ async function createInitialDatabase(skipDemoDb?: boolean) {
throw new Error("DB is already initialized"); throw new Error("DB is already initialized");
} }
const schema = fs.readFileSync(`${DB_INIT_DIR}/schema.sql`, "utf-8"); const schema = fs.readFileSync(`${resourceDir.DB_INIT_DIR}/schema.sql`, "utf-8");
const demoFile = (!skipDemoDb ? fs.readFileSync(`${DB_INIT_DIR}/demo.zip`) : null); const demoFile = (!skipDemoDb ? fs.readFileSync(`${resourceDir.DB_INIT_DIR}/demo.zip`) : null);
let rootNote!: BNote; let rootNote!: BNote;
@@ -153,7 +153,7 @@ async function createDatabaseForSync(options: OptionRow[], syncServerHost = "",
throw new Error("DB is already initialized"); throw new Error("DB is already initialized");
} }
const schema = fs.readFileSync(`${DB_INIT_DIR}/schema.sql`, "utf8"); const schema = fs.readFileSync(`${resourceDir.DB_INIT_DIR}/schema.sql`, "utf8");
// We have to import async since options init requires keyboard actions which require translations. // We have to import async since options init requires keyboard actions which require translations.
const optionsInitService = (await import("./options_init.js")).default; const optionsInitService = (await import("./options_init.js")).default;