Merge pull request #21 from arduino/develop

Product name change and bugfixes

Author: murilopolese

README.md

@@ -81,10 +81,5 @@ Some changes on the Electron code will require reopening the app but all UI chan
 
 ## Disclaimer
 
-This software is provided “as is” and we make no express or implied warranties whatsoever with respect to its functionality, 
-operability, or use, including, without limitation, any implied warranties of merchantability, fitness for a particular purpose, 
-or infringement. We expressly disclaim any liability whatsoever for any direct, indirect, consequential, incidental or special damages, 
-including, without limitation, lost revenues, lost profits, losses resulting from business interruption or loss of data, 
-regardless of the form of action or legal theory under which the liability may be asserted, even if advised of the possibility 
-or likelihood of such damages.
+This software is provided “as is” and we make no express or implied warranties whatsoever with respect to its functionality, operability, or use, including, without limitation, any implied warranties of merchantability, fitness for a particular purpose, or infringement. We expressly disclaim any liability whatsoever for any direct, indirect, consequential, incidental or special damages, including, without limitation, lost revenues, lost profits, losses resulting from business interruption or loss of data, regardless of the form of action or legal theory under which the liability may be asserted, even if advised of the possibility or likelihood of such damages.
 

index.js

@@ -1,7 +1,6 @@
 const { app, BrowserWindow, Menu, ipcMain, dialog } = require('electron')
 const path = require('path')
 const fs = require('fs')
-const join = require('path').join
 const openAboutWindow = require('about-window').default
 
 let win = null // main window
@@ -20,6 +19,8 @@ function listFolder(folder) {
     let filePath = path.resolve(folder, f)
     return !fs.lstatSync(filePath).isDirectory()
   })
+  // Filter out dot files
+  files = files.filter(f => f.indexOf('.') !== 0)
   return files
 }
 
@@ -160,7 +161,7 @@ const template = [
       { role: 'togglefullscreen' },
       ...(isDev ? [
         { type: 'separator' },
-        { role: 'toggleDevTools' }, 
+        { role: 'toggleDevTools' },
       ]:[
       ])
     ]
@@ -201,8 +202,8 @@ const template = [
         label:'Info about this app',
         click: () => {
             openAboutWindow({
-                icon_path: join(__dirname, 'ui/arduino/assets/about_image.png'),
-                css_path: join(__dirname, 'ui/arduino/about.css'),
+                icon_path: path.join(__dirname, 'ui/arduino/assets/about_image.png'),
+                css_path: path.join(__dirname, 'ui/arduino/about.css'),
                 copyright: '© Arduino SA 2022',
                 package_json_dir: __dirname,
                 bug_report_url: "https://github.com/arduino/lab-micropython-editor/issues",

micropython.js

@@ -11,6 +11,13 @@ function sleep(millis) {
   })
 }
 
+function escape_string(string) {
+  string = string.replace(/"""/g, `\\"\\"\\"`)
+  string = string.replace(/\'/g, `\\'`)
+  string = string.replace(/\"/g, `\\"`)
+  return string
+}
+
 class MicroPythonBoard {
   constructor() {
     this.device = null
@@ -221,7 +228,7 @@ class MicroPythonBoard {
       for (let i = 0; i < content.length; i+=128) {
         let slice = content.slice(i, i+128)
         slice = slice.toString()
-        slice = slice.replace(/"""/g, `\\"\\"\\"`)
+        slice = escape_string(slice)
         await this.serial.write(`w("""${slice}""")`)
         await this.serial.write(`\x04`)
         await sleep(100)
@@ -243,8 +250,7 @@ class MicroPythonBoard {
       for (let i = 0; i < content.length; i+=64) {
         let slice = content.slice(i, i+64)
         slice = slice.toString()
-        slice = slice.replace(/"""/g, `\\"\\"\\"`)
-        // slice = slice.replace(//g, ``)
+        slice = escape_string(slice)
         await this.serial.write(`w("""${slice}""")\n`)
         await this.serial.write(`\x04`)
         await sleep(50)