added path saving #19

noel-friedrich · Jan 29, 2024 · 2b3dd28 · 2b3dd28
1 parent 32d404a
commit 2b3dd28
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 9 deletions.
diff --git a/gui/cd/index.html b/gui/cd/index.html
@@ -55,7 +55,7 @@ <h1>
         <script src="../../js/terminal.js"></script>
 
         <script>
-            const command_data = {"helpVisible": true, "args": {"directory": "the directory relative to your current path"}, "description": "change current directory", "name": "cd"}
+            const command_data = {"helpVisible": true, "args": {"directory:s": "the directory relative to your current path"}, "description": "change current directory", "name": "cd"}
         </script>
 
         <script src="../main.js"></script>

diff --git a/gui/edit/index.html b/gui/edit/index.html
@@ -55,7 +55,7 @@ <h1>
         <script src="../../js/terminal.js"></script>
 
         <script>
-            const command_data = {"description": "edit a file of the current directory", "args": {"?file": "the file to open"}, "name": "edit"}
+            const command_data = {"description": "edit a file of the current directory", "args": {"?file:f": "the file to open"}, "name": "edit"}
         </script>
 
         <script src="../main.js"></script>

diff --git a/gui/mv/index.html b/gui/mv/index.html
@@ -55,7 +55,7 @@ <h1>
         <script src="../../js/terminal.js"></script>
 
         <script>
-            const command_data = {"description": "move a file", "args": ["file", "directory"], "name": "mv"}
+            const command_data = {"description": "move a file", "args": ["file:f", "directory:f"], "name": "mv"}
         </script>
 
         <script src="../main.js"></script>

diff --git a/gui/rm/index.html b/gui/rm/index.html
@@ -55,7 +55,7 @@ <h1>
         <script src="../../js/terminal.js"></script>
 
         <script>
-            const command_data = {"description": "remove a file", "args": ["*file"], "name": "rm"}
+            const command_data = {"description": "remove a file", "args": ["*file:f"], "name": "rm"}
         </script>
 
         <script src="../main.js"></script>

diff --git a/gui/rmdir/index.html b/gui/rmdir/index.html
@@ -55,7 +55,7 @@ <h1>
         <script src="../../js/terminal.js"></script>
 
         <script>
-            const command_data = {"description": "remove a directory", "args": ["directory"], "name": "rmdir"}
+            const command_data = {"description": "remove a directory", "args": ["directory:f"], "name": "rmdir"}
         </script>
 
         <script src="../main.js"></script>

diff --git a/gui/wc/index.html b/gui/wc/index.html
@@ -55,7 +55,7 @@ <h1>
         <script src="../../js/terminal.js"></script>
 
         <script>
-            const command_data = {"description": "display word and line count of file", "args": {"?f=file": "file to open", "?s": "string to count instead of file"}, "name": "wc"}
+            const command_data = {"description": "display word and line count of file", "args": {"?f=file:f": "file to open", "?s": "string to count instead of file"}, "name": "wc"}
         </script>
 
         <script src="../main.js"></script>

diff --git a/js/commands/cd.js b/js/commands/cd.js
@@ -1,7 +1,9 @@
 terminal.addCommand("cd", function(args) {
+    console.log(args)
     if (["-", ".."].includes(args.directory)) {
         if (terminal.fileSystem.currPath.length > 0) {
             terminal.fileSystem.currPath.pop()
+            terminal.updatePath()
             return
         } else {
             throw new Error("You are already at ground level")
@@ -22,7 +24,7 @@ terminal.addCommand("cd", function(args) {
 }, {
     helpVisible: true,
     args: {
-        "directory": "the directory relative to your current path"
+        "directory:s": "the directory relative to your current path"
     },
     description: "change current directory",
 })
diff --git a/js/load-commands.js b/js/load-commands.js
diff --git a/js/terminal.js b/js/terminal.js
@@ -384,6 +384,7 @@ class TerminalData {
         "mobile": "2",
         "easterEggs": "[]",
         "sidepanel": "true",
+        "path": "[]",
         "aliases": '{"tree": "ls -r","github": "href -f root/github.url","hugeturtlo": "turtlo --size 2","hugehugeturtlo": "turtlo --size 3","panik": "time -ms"}'
     }
 
@@ -465,6 +466,14 @@ class TerminalData {
         this.set("history", JSON.stringify(history))
     }
 
+    get path() {
+        return JSON.parse(this.get("path"))
+    }
+
+    set path(path) {
+        this.set("path", JSON.stringify(path))
+    }
+
     get easterEggs() {
         let arr = JSON.parse(this.get("easterEggs"))
         return new Set(arr)
@@ -1694,7 +1703,7 @@ class Terminal {
     }
 
     updatePath() {
-        // legacy
+        this.data.path = this.fileSystem.currPath
     }
 
     isValidFileName(name) {
@@ -2978,6 +2987,9 @@ class Terminal {
                 for (let startupCommand of this.data.startupCommands) {
                     await this.input(startupCommand, true)
                 }
+
+                // load path from localstorage
+                this.fileSystem.currPath = this.data.path
             }
 
             if (!ignoreMobile) {