From cf1e745c14b4a157014fc44d394ebeff3c5785ad Mon Sep 17 00:00:00 2001 From: Clansty Date: Tue, 7 Jan 2025 06:08:25 +0800 Subject: [PATCH] [O] Support option folder in root --- AquaNet/src/libs/userbox/userbox.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AquaNet/src/libs/userbox/userbox.ts b/AquaNet/src/libs/userbox/userbox.ts index 6162105d..67539089 100644 --- a/AquaNet/src/libs/userbox/userbox.ts +++ b/AquaNet/src/libs/userbox/userbox.ts @@ -163,11 +163,11 @@ export function initializeDb() : Promise { export async function userboxFileProcess(folder: FileSystemEntry, progressUpdate: (progress: number, progressString: string) => void): Promise { if (!isDirectory(folder)) return t("userbox.new.error.invalidFolder") - if (!(await validateDirectories(folder, "bin/option")) && !(await validateDirectories(folder, "data/A000"))) + if (!(await validateDirectories(folder, "bin/option") || await validateDirectories(folder, "option")) && !(await validateDirectories(folder, "data/A000"))) return t("userbox.new.error.invalidFolder"); initializeDb(); - const optionFolder = await getDirectoryFromPath(folder, "bin/option"); + const optionFolder = await getDirectoryFromPath(folder, "bin/option") ?? await getDirectoryFromPath(folder, "option"); if (optionFolder) await scanOptionFolder(optionFolder, progressUpdate); const dataFolder = await getDirectoryFromPath(folder, "data");