Merge branch 'development' into feature/show-filename-transfer

Author: murilopolese

README.md

@@ -62,7 +62,7 @@ In order for the UI code to be independent of Electron code, there is an API def
 
 There are 3 main operation "channels": Serial communication, local filesystem and window operations. These channels offer methods that should always return promises and are used mostly through [`async`/`await`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/async_function).
 
-While the serial communication is mediated by `/micropython.js`, the local filesystem and window operations are done through Electron's `ipcRenderer` calls. The handlers for these calls are defined at `/index.js`
+While the serial communication is mediated by [`micropython.js`](https://github.com/arduino/micropython.js), the local filesystem and window operations are done through Electron's `ipcRenderer` calls. The handlers for these calls are defined at [`backend`](https://github.com/arduino/lab-micropython-editor/tree/main/backend) folder.
 
 ## Running Arduino Lab for MicroPython from source code
 

backend/ipc.js

@@ -113,6 +113,15 @@ module.exports = function registerIPCHandlers(win, ipcMain, app) {
     app.exit()
   })
 
+  ipcMain.handle('is-packaged', () => {
+    return app.isPackaged
+  })
+
+  ipcMain.handle('get-app-path', () => {
+    console.log('ipcMain', 'get-app-path')
+    return app.getAppPath()
+  })
+
   win.on('close', (event) => {
     console.log('BrowserWindow', 'close')
     event.preventDefault()

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "arduino-lab-micropython-ide",
   "productName": "Arduino Lab for MicroPython",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "Arduino Lab for MicroPython is a project sponsored by Arduino, based on original work by Murilo Polese.\nThis is an experimental pre-release software, please direct any questions exclusively to Github issues.",
   "main": "index.js",
   "scripts": {
@@ -21,6 +21,7 @@
   "build": {
     "appId": "cc.arduino.micropython-lab",
     "artifactName": "${productName}-${os}_${arch}.${ext}",
+    "extraResources": "./ui/arduino/helpers.py",
     "mac": {
       "target": "zip",
       "icon": "build_resources/icon.icns"

package.json

@@ -145,6 +145,9 @@ const Disk = {
   },
   fileExists: async (filePath) => {
     return ipcRenderer.invoke('file-exists', filePath)
+  },
+  getAppPath: () => {
+    return ipcRenderer.invoke('get-app-path')
   }
 }
 
@@ -153,7 +156,8 @@ const Window = {
     ipcRenderer.invoke('set-window-size', minWidth, minHeight)
   },
   beforeClose: (callback) => ipcRenderer.on('check-before-close', callback),
-  confirmClose: () => ipcRenderer.invoke('confirm-close')
+  confirmClose: () => ipcRenderer.invoke('confirm-close'),
+  isPackaged: () => ipcRenderer.invoke('is-packaged')
 }
 
 

preload.js

@@ -117,10 +117,6 @@ async function store(state, emitter) {
     // Recover from getting stuck in raw repl
     await serial.getPrompt()
 
-    // Make sure there is a lib folder
-    log('creating lib folder')
-    await serial.createFolder('/lib')
-
     // Connected and ready
     state.isConnecting = false
     state.isConnected = true
@@ -406,24 +402,36 @@ async function store(state, emitter) {
     emitter.emit('render')
 
     if (state.isConnected) {
-      state.boardFiles = await getBoardFiles(
-        serial.getFullPath(
-          state.boardNavigationRoot,
-          state.boardNavigationPath,
-          ''
+      try {
+        state.boardFiles = await getBoardFiles(
+          serial.getFullPath(
+            state.boardNavigationRoot,
+            state.boardNavigationPath,
+            ''
+          )
         )
-      )
+      } catch (e) {
+        state.boardFiles = []
+      }
     } else {
       state.boardFiles = []
     }
 
-    state.diskFiles = await getDiskFiles(
-      disk.getFullPath(
-        state.diskNavigationRoot,
-        state.diskNavigationPath,
-        ''
+    try {
+      state.diskFiles = await getDiskFiles(
+        disk.getFullPath(
+          state.diskNavigationRoot,
+          state.diskNavigationPath,
+          ''
+        )
       )
-    )
+    } catch (e) {
+      state.diskNavigationRoot = null
+      state.diskNavigationPath = '/'
+      state.isLoadingFiles = false
+      emitter.emit('render')
+      return
+    }
 
     emitter.emit('refresh-selected-files')
     state.isLoadingFiles = false
@@ -1490,7 +1498,7 @@ function canEdit({ selectedFiles }) {
 
 async function removeBoardFolder(fullPath) {
   // TODO: Replace with getting the file tree from the board and deleting one by one
-  let output = await serial.execFile('./ui/arduino/helpers.py')
+  let output = await serial.execFile(await getHelperFullPath())
   await serial.run(`delete_folder('${fullPath}')`)
 }
 
@@ -1522,7 +1530,7 @@ async function uploadFolder(srcPath, destPath, dataConsumer) {
 async function downloadFolder(srcPath, destPath, dataConsumer) {
   dataConsumer = dataConsumer || function() {}
   await disk.createFolder(destPath)
-  let output = await serial.execFile('./ui/arduino/helpers.py')
+  let output = await serial.execFile(await getHelperFullPath())
   output = await serial.run(`ilist_all('${srcPath}')`)
   let files = []
   try {
@@ -1550,3 +1558,20 @@ async function downloadFolder(srcPath, destPath, dataConsumer) {
     }
   }
 }
+
+async function getHelperFullPath() {
+  const appPath = await disk.getAppPath()
+  if (await win.isPackaged()) {
+    return disk.getFullPath(
+      appPath,
+      '..',
+      'ui/arduino/helpers.py'
+    )
+  } else {
+    return disk.getFullPath(
+      appPath,
+      'ui/arduino/helpers.py',
+      ''
+    )
+  }
+}