Listing folders

Author: murilopolese

index.js

@@ -22,6 +22,25 @@ function listFolder(folder) {
   return files
 }
 
+function ilistFolder(folder, filesOnly) {
+  let files = fs.readdirSync(path.resolve(folder))
+  files = files.map(f => {
+    let filePath = path.resolve(folder, f)
+    return {
+      path: f,
+      type: fs.lstatSync(filePath).isDirectory() ? 'folder' : 'file'
+    }
+  })
+  // Filter out directories
+  if (filesOnly) {
+    files = files.filter(f => f.type === 'file')
+  }
+  // Filter out dot files
+  files = files.filter(f => f.path.indexOf('.') !== 0)
+  return files
+}
+
+
 // LOCAL FILE SYSTEM ACCESS
 ipcMain.handle('open-folder', async (event) => {
   console.log('ipcMain', 'open-folder')
@@ -39,6 +58,12 @@ ipcMain.handle('list-files', async (event, folder) => {
   return listFolder(folder)
 })
 
+ipcMain.handle('ilist-files', async (event, folder) => {
+  console.log('ipcMain', 'ilist-files', folder)
+  if (!folder) return []
+  return ilistFolder(folder)
+})
+
 ipcMain.handle('load-file', (event, folder, filename) => {
   console.log('ipcMain', 'load-file', folder, filename )
   let filePath = path.resolve(folder, filename)

preload.js

@@ -49,8 +49,10 @@ const Serial = {
     board.serial.on('data', fn)
   },
   listFiles: async () => {
-    const output = await board.fs_ls()
-    return output
+    return await board.fs_ls()
+  },
+  ilistFiles: async () => {
+    return await board.fs_ils()
   },
   loadFile: async (file) => {
     const output = await board.fs_cat(file)
@@ -86,6 +88,9 @@ const Disk = {
   listFiles: async (folder) => {
     return ipcRenderer.invoke('list-files', folder)
   },
+  ilistFiles: async (folder) => {
+    return ipcRenderer.invoke('ilist-files', folder)
+  },
   loadFile: async (folder, file) => {
     let content = await ipcRenderer.invoke('load-file', folder, file)
     return new TextDecoder().decode(content)

ui/arduino/components/panel_files.js

@@ -1,15 +1,23 @@
 function PanelFiles(state, emit) {
   function ListItem(device, file) {
     let selectedClass = ''
-    if (device === state.selectedDevice && file === state.selectedFile) {
+    if (device === state.selectedDevice && file.path === state.selectedFile) {
       selectedClass = 'selected'
     }
+    function onClick() {
+      if (file.type === 'folder') {
+        console.log('clicked on a folder')
+      } else {
+        emit('select-file', device, file.path)
+      }
+    }
     return html`
       <li
-        onclick=${() => emit('select-file', device, file)}
+        onclick=${onClick}
         class=${selectedClass}
         >
-        ${file}
+        ${file.type === 'folder' ? '📁' : '📄'}
+        ${file.path}
       </li>
     `
   }

ui/arduino/store.js

@@ -63,6 +63,7 @@ function store(state, emitter) {
 
     if (state.selectedDevice === 'serial') {
       state.selectedDevice = 'disk'
+      state.selectedFile = null
     }
 
     emitter.emit('render')
@@ -208,33 +209,38 @@ function store(state, emitter) {
     if (state.isConnected) {
       await serial.stop()
       try {
-        state.serialFiles = await serial.listFiles()
-        state.serialFiles = state.serialFiles.filter(
-          f => f.indexOf('.') !== -1 // Only files with extensions
-        )
+        const files = await serial.ilistFiles()
+        state.serialFiles = files.map(f => ({
+          path: f[0],
+          type: f[1] === 0x4000 ? 'folder' : 'file'
+        }))
         // Filter out dot files
         state.serialFiles = state.serialFiles.filter(
-          f => f.indexOf('.') !== 0
+          f => f.path.indexOf('.') !== 0
         )
         // Sort alphabetically in case-insensitive fashion
         state.serialFiles = state.serialFiles.sort(
-          (a, b) => a.localeCompare(b)
+          (a, b) => a.path.localeCompare(b.path)
         )
       } catch (e) {
+        state.serialPath = null
+        state.serialFiles = []
         console.log('error', e)
       }
     }
     if (state.diskPath) {
       try {
-        state.diskFiles = await disk.listFiles(state.diskPath)
+        state.diskFiles = await disk.ilistFiles(state.diskPath)
         // Filter out dot files
-        state.diskFiles = state.diskFiles.filter(f => f.indexOf('.') !== 0)
+        state.diskFiles = state.diskFiles.filter(f => f.path.indexOf('.') !== 0)
         // Sort alphabetically in case-insensitive fashion
         state.diskFiles = state.diskFiles.sort(
-          (a, b) => a.localeCompare(b)
+          (a, b) => a.path.localeCompare(b.path)
         )
       } catch (e) {
         state.diskPath = null
+        state.diskFiles = []
+        localStorage.setItem('diskPath', null)
         console.log('error', e)
       }
     }