Merge pull request #121 from arduino/bugfix/extra-resource

murilopolese · web-flow · commit abd8f7476e77 · 2024-04-26T09:37:41.000+02:00
Extra resource
diff --git a/backend/ipc.js b/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()
diff --git a/package.json b/package.json
@@ -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"
diff --git a/preload.js b/preload.js
@@ -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')
 }
 
 
diff --git a/ui/arduino/store.js b/ui/arduino/store.js
@@ -1490,7 +1490,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 +1522,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 +1550,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',
+      ''
+    )
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,9 @@ const Disk = {`
`145`	`145`	`},`
`146`	`146`	`fileExists: async (filePath) => {`
`147`	`147`	`return ipcRenderer.invoke('file-exists', filePath)`
	`148`	`+ },`
	`149`	`+ getAppPath: () => {`
	`150`	`+ return ipcRenderer.invoke('get-app-path')`
`148`	`151`	`}`
`149`	`152`	`}`
`150`	`153`
`@@ -153,7 +156,8 @@ const Window = {`
`153`	`156`	`ipcRenderer.invoke('set-window-size', minWidth, minHeight)`
`154`	`157`	`},`
`155`	`158`	`beforeClose: (callback) => ipcRenderer.on('check-before-close', callback),`
`156`		`- confirmClose: () => ipcRenderer.invoke('confirm-close')`
	`159`	`+ confirmClose: () => ipcRenderer.invoke('confirm-close'),`
	`160`	`+ isPackaged: () => ipcRenderer.invoke('is-packaged')`
`157`	`161`	`}`
`158`	`162`
`159`	`163`