From 6335cea98b8c4893ca4a9f9ed492d0853a9ca34e Mon Sep 17 00:00:00 2001 From: Maki Date: Sat, 10 Jan 2026 23:26:05 +0800 Subject: [PATCH] Remove updateInfo imports from old version and add to gitignore --- .gitignore | 7 ++++++- src/pages/login.ts | 1 - src/pages/register.ts | 1 - src/pages/root.ts | 1 - src/util/index.ts | 38 ++++++++++++++++++++------------------ 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index fdb021d..3028538 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,9 @@ package-lock.json /uploads files.db -users.db \ No newline at end of file +users.db + +/pvfiles +/staticfiles + +.env \ No newline at end of file diff --git a/src/pages/login.ts b/src/pages/login.ts index dacfc5d..a2b081d 100644 --- a/src/pages/login.ts +++ b/src/pages/login.ts @@ -1,6 +1,5 @@ import { Express, Request, Response } from "express"; import Logger from "../util/Logger"; -import "../updateInfo"; import bcrypt from "bcrypt"; import { db } from "../util/database"; diff --git a/src/pages/register.ts b/src/pages/register.ts index f72125a..72c5ef2 100644 --- a/src/pages/register.ts +++ b/src/pages/register.ts @@ -1,6 +1,5 @@ import { Express, Request, Response } from "express"; import Logger from "../util/Logger"; -import "../updateInfo"; import bcrypt from "bcrypt"; import { db } from "../util/database"; diff --git a/src/pages/root.ts b/src/pages/root.ts index ae981f0..1bfde64 100644 --- a/src/pages/root.ts +++ b/src/pages/root.ts @@ -1,6 +1,5 @@ import { Express, Request, Response, json } from "express"; import Logger from '../util/Logger' -import '../updateInfo' var c = new Logger("Server(Pages)", "gray") import dotenv from "dotenv"; diff --git a/src/util/index.ts b/src/util/index.ts index 6a781d0..04da7d9 100644 --- a/src/util/index.ts +++ b/src/util/index.ts @@ -43,19 +43,19 @@ export function bytesToSize(bytes: number, decimals = 2) { )} ${sizes[index]}`; } -function waitUntil(conditionFn: () => boolean, interval = 100): Promise { - return new Promise((resolve) => { - const timer = setInterval(() => { - try { - if (conditionFn()) { - clearInterval(timer); - resolve(); - } - } catch (err) { - clearInterval(timer); - } - }, interval); - }); +export function waitUntil(conditionFn: () => boolean, interval = 100): Promise { + return new Promise((resolve) => { + const timer = setInterval(() => { + try { + if (conditionFn()) { + clearInterval(timer); + resolve(); + } + } catch (err) { + clearInterval(timer); + } + }, interval); + }); } import fs from 'fs' @@ -74,13 +74,15 @@ export async function mkDirsManIfNotExists(paths: string[]): Promise { try { var pass = false - for (const path in paths) { - await waitUntil(() => pass = true) - + paths.forEach((path: string) => { + //await waitUntil(() => pass = true) + pass = false - if (!fs.existsSync(path)) + if (!fs.existsSync(path)) { + console.log("Path does not exist: " + path) fs.mkdir(path, () => pass = true); - } + } + }) return true } catch { return false