From b2de76a9638a4c42b82a767ea0ae30eaf9be6c6d Mon Sep 17 00:00:00 2001
From: Felipe Martinez <pipernene@gmail.com>
Date: Wed, 26 Jun 2024 01:20:13 +0200
Subject: [PATCH] Create folders

---
 frontend/wasm/infiniemu.d.ts                 |  1 +
 frontend/wasm/src/common.ts                  |  4 +-
 frontend/wasm/src/components/FileBrowser.vue | 24 ++++++++-
 frontend/wasm/src/utils.ts                   |  4 ++
 frontend/wasm/src/worker.ts                  | 54 ++++++++++++++------
 src/CMakeLists.txt                           |  2 +-
 6 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/frontend/wasm/infiniemu.d.ts b/frontend/wasm/infiniemu.d.ts
index b851d60..f554ded 100644
--- a/frontend/wasm/infiniemu.d.ts
+++ b/frontend/wasm/infiniemu.d.ts
@@ -67,6 +67,7 @@ const module: EmscriptenModuleFactory<EmscriptenModule & {
     _lfs_info_name(info: LFSInfo): Pointer;
     _lfs_open_file(lfs: LFS, path: Pointer, flags: number): LFSFile;
     _lfs_file_read(lfs: LFS, file: LFSFile, buffer: Pointer, size: number): number;
+    _lfs_mkdir(lfs: LFS, path: Pointer): number;
 
     UTF8ToString(ptr: Pointer, maxBytes?: number): string;
     stringToNewUTF8(str: string): Pointer;
diff --git a/frontend/wasm/src/common.ts b/frontend/wasm/src/common.ts
index 73e7b38..06bd23b 100644
--- a/frontend/wasm/src/common.ts
+++ b/frontend/wasm/src/common.ts
@@ -15,13 +15,15 @@ export type MessageToWorkerType =
     { type: "releaseButton", data: void } |
     { type: "setProgram", data: ArrayBuffer } |
     { type: "readDir", data: string } |
-    { type: "readFile", data: string };
+    { type: "readFile", data: string } |
+    { type: "createDir", data: string };
 
 export type MessageFromWorkerType =
     { type: "ready", data: void } |
     { type: "error", data: { message: string | undefined, stack: string | undefined, string: string | undefined } } |
     { type: "dirFiles", data: FileInfo[] } |
     { type: "fileData", data: { path: string, data: ArrayBuffer } } |
+    { type: "createdDir", data: string } |
     { type: "running", data: boolean } |
     { type: "rttFound", data: void } |
     { type: "rttData", data: string } |
diff --git a/frontend/wasm/src/components/FileBrowser.vue b/frontend/wasm/src/components/FileBrowser.vue
index 6b500c8..a95c7be 100644
--- a/frontend/wasm/src/components/FileBrowser.vue
+++ b/frontend/wasm/src/components/FileBrowser.vue
@@ -16,7 +16,7 @@ div
 import { ref } from 'vue';
 
 import type { FileInfo, MessageFromWorkerType } from '@/common';
-import { downloadURL, sendMessage } from '@/utils';
+import { downloadURL, joinLFSPaths, sendMessage } from '@/utils';
 
 const props = defineProps<{
     worker: Worker,
@@ -61,6 +61,7 @@ function navigate(dir: FileInfo) {
         currentPath.value = currentPathParts.join("/");
     }
     else {
+        console.log(dir.fullPath);
         currentPath.value = dir.fullPath;
     }
 
@@ -89,6 +90,27 @@ function openFile(file: FileInfo) {
     props.worker.addEventListener("message", listener);
     sendMessage(props.worker, "readFile", file.fullPath);
 }
+
+function createFolder() {
+    const folderName = prompt("Enter folder name");
+
+    if (folderName) {
+        const path = joinLFSPaths(currentPath.value, folderName);
+
+        const listener = (event: MessageEvent) => {
+            const { type, data } = event.data as MessageFromWorkerType;
+
+            if (type == "createdDir" && data == path) {
+                props.worker.removeEventListener("message", listener);
+                emit("loadEnd");
+                refresh();
+            }
+        };
+
+        props.worker.addEventListener("message", listener);
+        sendMessage(props.worker, "createDir", path);
+    }
+}
 </script>
 
 <style lang="scss">
diff --git a/frontend/wasm/src/utils.ts b/frontend/wasm/src/utils.ts
index 36895b6..c2dda71 100644
--- a/frontend/wasm/src/utils.ts
+++ b/frontend/wasm/src/utils.ts
@@ -47,3 +47,7 @@ export function downloadURL(url: string, filename: string) {
     a.click();
     a.remove();
 }
+
+export function joinLFSPaths(...paths: string[]) {
+    return paths.join("/").replace(/^\//, "").replace(/\/+/g, "/");
+}
diff --git a/frontend/wasm/src/worker.ts b/frontend/wasm/src/worker.ts
index cf80c69..64484a2 100644
--- a/frontend/wasm/src/worker.ts
+++ b/frontend/wasm/src/worker.ts
@@ -1,6 +1,7 @@
 import type { CPU, CST816S, Commander, LFS, NRF52832, Pinetime, Pins, Pointer, RTT, SPINorFlash, ST7789 } from "../infiniemu.js"
 import createModule from "../infiniemu.js"
 import type { FileInfo, MessageFromWorkerType, MessageToWorkerType } from "./common";
+import { joinLFSPaths } from "./utils.js";
 
 const iterations = 700000;
 
@@ -165,6 +166,26 @@ class Emulator {
         }
     }
 
+    doTouch(gesture: number, x: number, y: number, duration?: number) {
+        this.readDir("");
+
+        this.Module._cst816s_do_touch(this.touch, gesture, x, y);
+
+        if (duration && duration > 0)
+            setTimeout(() => this.Module._cst816s_release_touch(this.touch), duration);
+    }
+
+    clearTouch() {
+        this.Module._cst816s_release_touch(this.touch);
+    }
+
+    changePin(pin: number, isSet: boolean) {
+        if (isSet)
+            this.Module._pins_set(this.pins, pin);
+        else
+            this.Module._pins_clear(this.pins, pin);
+    }
+
     private useLFS<T>(fn: (lfs: LFS) => T) {
         const bufferPtr = this.Module._spinorflash_get_buffer(this.spiFlash);
         const lfs = this.Module._lfs_init(pointerAdd(bufferPtr, 0x0B4000), 0x400000 - 0x0B4000);
@@ -199,7 +220,7 @@ class Emulator {
                     const name = this.Module.UTF8ToString(this.Module._lfs_info_name(info));
                     files.push({
                         name,
-                        fullPath: path == "" ? name : (path + "/" + name),
+                        fullPath: joinLFSPaths(path, name),
                         size: this.Module._lfs_info_size(info),
                         type: this.Module._lfs_info_type(info) == 1 ? "file" : "dir",
                     });
@@ -261,24 +282,16 @@ class Emulator {
         });
     }
 
-    doTouch(gesture: number, x: number, y: number, duration?: number) {
-        this.readDir("");
-
-        this.Module._cst816s_do_touch(this.touch, gesture, x, y);
-
-        if (duration && duration > 0)
-            setTimeout(() => this.Module._cst816s_release_touch(this.touch), duration);
-    }
+    createDir(path: string) {
+        return this.useLFS(lfs => {
+            const pathBytes = this.Module.stringToNewUTF8(path);
 
-    clearTouch() {
-        this.Module._cst816s_release_touch(this.touch);
-    }
+            const ret = this.Module._lfs_mkdir(lfs, pathBytes);
+            if (ret < 0)
+                throw new Error("Error creating dir: " + ret);
 
-    changePin(pin: number, isSet: boolean) {
-        if (isSet)
-            this.Module._pins_set(this.pins, pin);
-        else
-            this.Module._pins_clear(this.pins, pin);
+            this.Module._free(pointerToNumber(pathBytes));
+        });
     }
 };
 
@@ -363,6 +376,13 @@ function handleMessage(msg: MessageToWorkerType) {
             if (emulator)
                 sendMessage("fileData", { path: data, data: emulator.readFile(data) });
             break;
+
+        case "createDir":
+            if (emulator) {
+                emulator.createDir(data);
+                sendMessage("createdDir", data);
+            }
+            break;
     }
 }
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88f95c5..2204fd5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,7 +68,7 @@ set(WASM_EXPORTS
     program_new program_load_binary program_load_elf
     commander_new commander_set_output commander_run_command commander_output
     rtt_new rtt_find_control rtt_flush_buffers
-    lfs_init lfs_free_wasm lfs_open_dir lfs_dir_read
+    lfs_init lfs_mkdir lfs_free_wasm lfs_open_dir lfs_dir_read
     lfs_open_file lfs_file_read
     lfs_info_malloc lfs_info_type lfs_info_size lfs_info_name
 )