Merge pull request #166 from arduino/development

ubidefeo · web-flow · commit 5c42aeb7d4ff · 2024-12-18T21:04:50.000+01:00
Fixing file save bug &gt; 0.11.1
diff --git a/backend/ipc.js b/backend/ipc.js
@@ -145,7 +145,7 @@ module.exports = function registerIPCHandlers(win, ipcMain, app, dialog) {
   })
 
   ipcMain.handle('serial', (event, command, ...args) => {
-    console.debug('Handling IPC serial command:', command, ...args)
+    // console.debug('Handling IPC serial command:', command, ...args)
     return serial[command](...args)
   })
 }
diff --git a/backend/serial/serial-bridge.js b/backend/serial/serial-bridge.js
@@ -53,10 +53,23 @@ const SerialBridge = {
     return await ipcRenderer.invoke('serial', 'removeFile', file)
   },
   saveFileContent: async (filename, content, dataConsumer) => {
-    return await ipcRenderer.invoke('serial', 'saveFileContent', filename, content, dataConsumer)
+    if (ipcRenderer.listeners("serial-on-file-save-progress").length > 0) {
+      ipcRenderer.removeAllListeners("serial-on-file-save-progress")
+    }
+    ipcRenderer.on('serial-on-file-save-progress', (event, progress) => {
+      dataConsumer(progress)
+    })
+    return await ipcRenderer.invoke('serial', 'saveFileContent', filename, content)
   },
   uploadFile: async (src, dest, dataConsumer) => {
-    return await ipcRenderer.invoke('serial', 'uploadFile', src, dest, dataConsumer)
+    if (ipcRenderer.listeners("serial-on-upload-progress").length > 0) {
+      ipcRenderer.removeAllListeners("serial-on-upload-progress")
+    }
+
+    ipcRenderer.on('serial-on-upload-progress', (event, progress) => {
+      dataConsumer(progress)
+    })
+    return await ipcRenderer.invoke('serial', 'uploadFile', src, dest)
   },
   downloadFile: async (src, dest) => {
     let contents = await ipcRenderer.invoke('serial', 'loadFile', src)
diff --git a/backend/serial/serial.js b/backend/serial/serial.js
@@ -1,4 +1,5 @@
 const MicroPython = require('micropython.js')
+const path = require('path')
 
 class Serial {
     constructor(win = null) {
@@ -79,12 +80,16 @@ class Serial {
         return await this.board.fs_rm(file)
     }
 
-    async saveFileContent(filename, content, dataConsumer) {
-        return await this.board.fs_save(content || ' ', filename, dataConsumer)
+    async saveFileContent(filename, content) {
+        return await this.board.fs_save(content || ' ', filename, (progress) => {
+            this.win.webContents.send('serial-on-file-save-progress', progress)
+        })
     }
 
-    async uploadFile(src, dest, dataConsumer) {
-        return await this.board.fs_put(src, dest.replaceAll(path.win32.sep, path.posix.sep), dataConsumer)
+    async uploadFile(src, dest) {
+        return await this.board.fs_put(src, dest.replaceAll(path.win32.sep, path.posix.sep), (progress) => {
+            this.win.webContents.send('serial-on-upload-progress', progress)
+        })
     }
 
     async renameFile(oldName, newName) {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "arduino-lab-micropython-ide",
   "productName": "Arduino Lab for MicroPython",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "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": {

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ module.exports = function registerIPCHandlers(win, ipcMain, app, dialog) {`
`145`	`145`	`})`
`146`	`146`
`147`	`147`	`ipcMain.handle('serial', (event, command, ...args) => {`
`148`		`- console.debug('Handling IPC serial command:', command, ...args)`
	`148`	`+ // console.debug('Handling IPC serial command:', command, ...args)`
`149`	`149`	`return serial[command](...args)`
`150`	`150`	`})`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "arduino-lab-micropython-ide",`
`3`	`3`	`"productName": "Arduino Lab for MicroPython",`
`4`		`- "version": "0.11.0",`
	`4`	`+ "version": "0.11.1",`
`5`	`5`	`"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.",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"scripts": {`