From 1caae4239c851fca883e2d01ecd8a0f182602508 Mon Sep 17 00:00:00 2001 From: BurnyLlama Date: Thu, 4 Nov 2021 20:06:51 +0100 Subject: [PATCH] Small fixes. --- index.js | 2 +- libs/database/generate.js | 4 ++-- libs/database/init.js | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index f63cf69..8409864 100644 --- a/index.js +++ b/index.js @@ -21,7 +21,7 @@ const log = initLog("[ MAIN ]") // Read the .env file dotenv.config() -if (process.env.DOWNLOAD_FILES === "true") +if (process.env.DOWNLOAD_FILES === "enabled") await downloadEssentialData() dbInit() diff --git a/libs/database/generate.js b/libs/database/generate.js index f1704f4..8a24579 100644 --- a/libs/database/generate.js +++ b/libs/database/generate.js @@ -10,8 +10,8 @@ const log = initLog("DB Generation") * @module db/generateDB */ export function generateDB() { - if (process.env.GENERATE_DB !== "true") - return log("Won't generate the database since 'GENERATE_DB' is not set to \"true\" in '.env'!") + if (process.env.GENERATE_DB !== "enabled") + return log("Won't generate the database since 'GENERATE_DB' is not set to \"enabled\" in '.env'!") const exists = sqlite.prepare(`SELECT count(*) as a FROM sqlite_master WHERE type='table' AND name='points'`).get() if(!exists.a === 0) diff --git a/libs/database/init.js b/libs/database/init.js index 84f2098..0ec7408 100644 --- a/libs/database/init.js +++ b/libs/database/init.js @@ -1,8 +1,14 @@ import Database from 'better-sqlite3' import initLog from '../utils/log.js' -/* Export DB for use in other files */ +/** + * @type {Database.Database} + */ export let sqlite = undefined + +/** + * @type {Database.Database} + */ export let skinDB = undefined const log = initLog("Database") @@ -15,7 +21,7 @@ export function dbInit() { log("Starting up databases...") /* load in db using better-sqlite3 */ - sqlite = new Database(process.env.DDNET_SQLITE_PATH ?? 'data/ddnet.sqlite', { verbose: console.log }); + sqlite = new Database(process.env.DDNET_SQLITE_PATH ?? 'data/ddnet.sqlite', { }); skinDB = new Database(process.env.DDNSS_SQLITE_PATH ?? 'data/skindata.sqlite', { }); /* WAL mode */