From b6badb3cec69e0a40b0bc875a633ee9b1ba9b1b7 Mon Sep 17 00:00:00 2001 From: Rizky Date: Wed, 7 Feb 2024 18:31:06 +0700 Subject: [PATCH] wip fix --- pkgs/core/index.ts | 4 +--- pkgs/core/utils/dir.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/core/index.ts b/pkgs/core/index.ts index acbb3e77..dd7a0559 100644 --- a/pkgs/core/index.ts +++ b/pkgs/core/index.ts @@ -30,9 +30,7 @@ if (!g.Y) { await createLogger(); g._api = {}; g.mode = process.argv.includes("dev") ? "dev" : "prod"; - g.datadir = dir.path(g.mode == "prod" ? "../data" : "data"); - console.log(`DataDir: ${g.datadir}`); - + g.datadir = dir.path(g.mode === "prod" ? "../data" : "data", false); g.port = parseInt(process.env.PORT || "4550"); g.log.info(g.mode === "dev" ? "DEVELOPMENT" : "PRODUCTION"); diff --git a/pkgs/core/utils/dir.ts b/pkgs/core/utils/dir.ts index d95046b7..1ab29937 100644 --- a/pkgs/core/utils/dir.ts +++ b/pkgs/core/utils/dir.ts @@ -1,8 +1,12 @@ import { join } from "path"; export const dir = { - path: (path: string) => { - const final_path = path.split("/").filter((e) => e !== "..").join('/'); + path: (path: string, safe?: boolean) => { + if (safe === false) return join(process.cwd(), path); + const final_path = path + .split("/") + .filter((e) => e !== "..") + .join("/"); return join(process.cwd(), final_path); }, };