lzc256
/
AquaDX
mirror of https://github.com/hykilpikonna/AquaDX
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: scan for option data correctly

pull/132/head
Raymond 2025-03-22 03:45:49 -04:00
parent 8549a5caae
commit 5961cf86e6
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
AquaNet/src/libs/userbox/userbox.ts
View File

@ -5,6 +5,7 @@ const isDirectory = (e: FileSystemEntry): e is FileSystemDirectoryEntry => e.isD
const isFile = (e: FileSystemEntry): e is FileSystemFileEntry => e.isFile const isFile = (e: FileSystemEntry): e is FileSystemFileEntry => e.isFile
const getDirectory = (directory: FileSystemDirectoryEntry, path: string): Promise<FileSystemEntry> => new Promise((res, rej) => directory.getDirectory(path, {}, d => res(d), e => rej())); const getDirectory = (directory: FileSystemDirectoryEntry, path: string): Promise<FileSystemEntry> => new Promise((res, rej) => directory.getDirectory(path, {}, d => res(d), e => rej()));
const getParent = (directory: FileSystemDirectoryEntry): Promise<FileSystemEntry> => new Promise((res, rej) => directory.getParent(d => res(d), e => rej()));
const getFile = (directory: FileSystemDirectoryEntry, path: string): Promise<FileSystemEntry> => new Promise((res, rej) => directory.getFile(path, {}, d => res(d), e => rej())); const getFile = (directory: FileSystemDirectoryEntry, path: string): Promise<FileSystemEntry> => new Promise((res, rej) => directory.getFile(path, {}, d => res(d), e => rej()));
const getFiles = async (directory: FileSystemDirectoryEntry): Promise<Array<FileSystemEntry>> => { const getFiles = async (directory: FileSystemDirectoryEntry): Promise<Array<FileSystemEntry>> => {
let reader = directory.createReader(); let reader = directory.createReader();
@ -44,6 +45,26 @@ const getDirectoryFromPath = async (base: FileSystemDirectoryEntry, path: string
return directory; return directory;
} }
const scanRecursive = async (root: FileSystemDirectoryEntry, target: string): Promise<FileSystemDirectoryEntry | undefined> => {
let directories: FileSystemEntry[] = [root];
while (directories.length > 0) {
const directory = directories[0] as FileSystemDirectoryEntry;
if (directory.isDirectory) {
if (directory.name == target)
return directory;
let children: FileSystemEntry[] = await new Promise(r => directory.createReader().readEntries(d => r(d)));
directories = [
...directories,
...(children.filter(v => v.isDirectory))
];
}
directories.shift();
}
return;
}
export let ddsDB: IDBDatabase | undefined ; export let ddsDB: IDBDatabase | undefined ;
/* Technically, processName should be in the translation file but I figured it was such a small thing that it didn't REALLY matter... */ /* Technically, processName should be in the translation file but I figured it was such a small thing that it didn't REALLY matter... */
@ -169,12 +190,13 @@ export async function userboxFileProcess(folder: FileSystemEntry, progressUpdate
return t("userbox.new.error.invalidFolder"); return t("userbox.new.error.invalidFolder");
initializeDb(); initializeDb();
const optionFolder = await getDirectoryFromPath(folder, "bin/option") ?? await getDirectoryFromPath(folder, "option"); const optionFolder = await scanRecursive(folder, "A001");
console.log(optionFolder);
if (optionFolder) if (optionFolder)
await scanOptionFolder(optionFolder, progressUpdate); await scanOptionFolder((await getParent(optionFolder)) as FileSystemDirectoryEntry, progressUpdate);
const dataFolder = await getDirectoryFromPath(folder, "data"); const dataFolder = await scanRecursive(folder, "A000");
if (dataFolder) if (dataFolder)
await scanOptionFolder(dataFolder, progressUpdate); await scanOptionFolder((await getParent(dataFolder)) as FileSystemDirectoryEntry, progressUpdate);
useLocalStorage("userboxURL", "").value = ""; useLocalStorage("userboxURL", "").value = "";
useLocalStorage("userboxNew", false).value = true; useLocalStorage("userboxNew", false).value = true;
useLocalStorage("userboxNewProfile", false).value = true; useLocalStorage("userboxNewProfile", false).value = true;