uwu dual fs

Author: novafurry

assets/code/apps.js

@@ -138,12 +138,14 @@ var app = {
         name: 'Files',
         icon: './assets/img/systemIcons/files.svg',
         init: async function () {
-            const win = tk.mbw(`Files`, '340px', 'auto', true, true, true);
+            const win = tk.mbw(`Files`, '340px', 'auto', true, true, true, undefined, app.files.icon);
             win.main.classList.add("fileman")
-            const mainPane = tk.c('div', win.main)
-            const navBar = tk.c('div', mainPane)
+            const lowerZone = tk.c('div', win.main)
+            lowerZone.classList.add("lowerZone")
+            const mainPane = tk.c('div', lowerZone)
+            const navBar = tk.c('div', win.main)
             navBar.classList.add("navbar")
-            const navPane = tk.c('div', win.main)
+            const navPane = tk.c('div', lowerZone)
             navPane.classList.add("navpane")
             const fm = tk.c('div', mainPane)
             fm.classList.add("fm")
@@ -153,45 +155,55 @@ var app = {
             const mkFolder = tk.cb('b1', '➕', function () {}, navBar);
             const breadcrumbs = tk.c('div', navBar);
             breadcrumbs.classList.add("bc");
-            breadcrumbs.classList.add("b1");
             const items = tk.c('div', fm);
             const navPaneDrives = tk.c('ul', navPane)
             const osDrive = tk.c("li", navPaneDrives)
-            osDrive.innerText = "/ Root"
-            async function navto(path, fs = "idb") {
+            osDrive.classList.add("flist", "width", "drive")
+            osDrive.innerText = "OPFS (NovaOS)"
+            const classicDrive = tk.c("li", navPaneDrives)
+            classicDrive.classList.add("flist", "width", "drive")
+            classicDrive.innerText = "IDBFS (Classic)"
+            async function navto(path, filesystem = "opfs") {
                 mkFolder.onclick = async function () {
-                    fs.write(`${path}${prompt("enter folder name here", "New Folder")}/.`, '');
-                    navto(path)
+                    if(filesystem == 'opfs'){
+                        fs.mkdir(`${path}${prompt("enter folder name here", "New Folder")}/.`, 'opfs');
+                    }
+                    else{
+                        fs.write(`${path}${prompt("enter folder name here", "New Folder")}/.`, '', 'idbfs');
+                    };
+                    navto(path, filesystem)
                 }
                 items.innerHTML = "";
                 breadcrumbs.innerHTML = "";
                 let crumbs = path.split('/').filter(Boolean);
                 let currentp = '/';
-                tk.cb('flist', 'Root', () => navto('/'), breadcrumbs);
+                tk.cb('flist', 'Root', () => navto('/', filesystem), breadcrumbs);
                 crumbs.forEach((crumb, index) => {
                     currentp += crumb + '/';
                     tk.cb('flists', '/', undefined, breadcrumbs);
                     tk.cb('flist', crumb, () => {
                         let newPath = crumbs.slice(0, index + 1).join('/');
-                        navto('/' + newPath + "/");
+                        navto('/' + newPath + "/", filesystem);
                     }, breadcrumbs);
                 });
-                const thing = await fs.ls(path, fs);
+                const thing = await fs.ls(path, filesystem);
                 thing.items.forEach(function (thing) {
-                    if (thing.type === "folder") {
-                        tk.cb('flist width', "Folder: " + thing.name, () => navto(thing.path + "/"), items);
+                    if (thing.type === "folder" || thing.type === "directory") {
+                        tk.cb('flist width', "📁 " + thing.name, () => navto(thing.path + "/", filesystem), items);
                     } else if (thing.name.startsWith('.')) {
                         void (0)
                     } else {
-                        tk.cb('flist width', "File: " + thing.name, async function () { const yeah = await fs.read(thing.path); wm.wal(yeah); }, items);
+                        tk.cb('flist width', "📄 " + thing.name, async function () { const yeah = await fs.read(thing.path); wm.wal(yeah); }, items);
                     }
                 });
             }
             osDrive.addEventListener("click", await function (){
-                navto("/", "idbfs")
+                navto("/", "opfs")
             })
-
-            navto('/');
+            classicDrive.addEventListener("click", await function (){
+                navto("/", "idbfs")
+            });
+            navto('/', 'opfs');
         }
     },
     about: {

assets/code/core.js

@@ -213,7 +213,10 @@ var wd = {
         return formattedTime;
     },
     finishsetup: function (name, div1, div2) {
-        ui.sw2(div1, div2); ui.masschange('name', name); fs.write('/user/info/name', name);
+        ui.sw2(div1, div2); ui.masschange('name', name); 
+        fs.mkdir('/user')
+        fs.mkdir('/user/info')
+        fs.write('/user/info/name', name);
     },
     reboot: function () {
         window.location.reload();

assets/code/fs.js

@@ -25,6 +25,9 @@ var fs = {
     send: function (message, transferList) {
         wfs.postMessage(message, transferList);
     },
+    sendopfs: function (message, transferList) {
+        wfs.postMessage(message, transferList);
+    },
     askwfs: function (operation, params, opt) {
         const requestId = requestIdCounter++;
         return new Promise((resolve, reject) => {
@@ -36,21 +39,62 @@ var fs = {
             }
         });
     },
-    read: function (path) {
-        return this.askwfs('read', path);
+    askwfsOPFS: function (operation, params, opt) {
+        const requestId = requestIdCounter++;
+        return new Promise((resolve, reject) => {
+            pendingRequests[requestId] = { resolve, reject };
+            if (operation === 'write' && opt instanceof ArrayBuffer) {
+                fs.sendopfs({ type: 'opfs', operation, params, opt, requestId }, [p2]);
+            } else {
+                fs.sendopfs({ type: 'opfs', operation, params, opt, requestId });
+            }
+        });
+    },
+    read: function (path, filesystem = "opfs") {
+        if(filesystem == "opfs") {
+            return this.askwfsOPFS('read', path);
+        }
+        else if(filesystem == "idbfs") {
+                return this.askwfs('read', path);
+        }
     },
-    write: function (path, data) {
-        return this.askwfs('write', path, data);
+    write: function (path, data, filesystem = "opfs") {
+        if(filesystem == "opfs") {
+            return this.askwfsOPFS('write', path, data);
+        }
+        else if(filesystem == "idbfs") {
+            return this.askwfs('write', path, data);
+        }
     },
-    del: function (path) {
-        return this.askwfs('delete', path);
+    del: function (path, filesystem = "opfs") {
+        if(filesystem == "opfs") {
+            return this.askwfsOPFS('delete', path);
+        }
+        else if(filesystem == "idbfs") {
+            return this.askwfs('delete', path);
+        }
     },
-    erase: function (path) {
-        return this.askwfs('erase', path);
+    erase: function (filesystem = "idbfs") {
+        if(filesystem == "opfs") {
+            return this.askwfsOPFS('erase', path);
+        } else if(filesystem == "idbfs") {
+            return this.askwfs('erase', path);
+        }
     },
-    ls: function (path, fs = "idbfs") {
-        return this.askwfs('ls', path);
+    ls: function (path, filesystem = "opfs") {
+        if(filesystem == "opfs") {
+            return this.askwfsOPFS('ls', path);
+        } else if(filesystem == "idbfs") {
+            return this.askwfs('ls', path);
+        }
     },
+    mkdir: function (path, filesystem = "opfs") {
+        if(filesystem == "opfs") {
+            return this.askwfsOPFS('mkdir', path);
+        } else if(filesystem == "idbfs") {
+            fs.write("/user/Documents/.", '', "idbfs");
+        }
+    }
 };
 setTimeout(function () {
     fs.ls("/user/info/name").then(async (namefile) => {