Execution and file-save events

Author: murilopolese

micropython.js

@@ -39,9 +39,8 @@ gc.collect()`
 class SerialConnection extends EventEmitter {
 	constructor() {
 		super()
+		this.executing = false
 		this.rawRepl = false
-		this.loadingFile = false
-		this.loadingFileList = false
 	}
 	/**
 	* List all available serial ports (with vendor id)
@@ -91,13 +90,15 @@ class SerialConnection extends EventEmitter {
 	* @param {String} code String of code to be executed. Line breaks must be `\n`
 	*/
 	execute(code) {
+		this.emit('execution-started')
 		// TODO: break code in lines and `_execRaw` line by line
 		this.stop()
 		this._enterRawRepl()
 		this._executeRaw(code)
-		.then(() => {
-			this._exitRawRepl()
-		})
+			.then(() => {
+				this.emit('execution-finished')
+				this._exitRawRepl()
+			})
 	}
 	/**
 	* Evaluate a command/expression.
@@ -125,7 +126,6 @@ class SerialConnection extends EventEmitter {
 	*/
 	listFiles() {
 		this.data = ''
-		this.loadingFileList = true
 		this.execute(codeListFiles)
 	}
 	/**
@@ -134,7 +134,6 @@ class SerialConnection extends EventEmitter {
 	*/
 	loadFile(path) {
 		this.data = ''
-		this.loadingFile = true
 		this.execute(codeLoadFile(path))
 	}
 	/**
@@ -152,23 +151,23 @@ class SerialConnection extends EventEmitter {
 		pCode += codeCollectGarbage + '\n'
 		// `content` is what comes from the editor. We want to write it
 		// line one by one on a file so we split by `\n`
-		var lineCount = 0;
-		var lines = content.split('\r\n')
-		lines.forEach((line) => {
+		let lines = content.split('\r\n')
+		lines.forEach((line, lineCount) => {
 			if (line) {
-				var nlMarker = line.indexOf('\n');
-				var crMarker = line.indexOf('\r');
 				// TODO: Sanitize line replace """ with \"""
 				// To avoid the string escaping with weirdly we encode
 				// the line plus the `\n` that we just removed to base64
 				pCode += `f.write("""${line}""")`
 				if(lineCount != lines.length - 1){
 					pCode += `\nf.write('\\n')\n`
 				}
-				lineCount++;
 			}
 		})
 		pCode += `\nf.close()\n`
+
+		this.once('execution-finished', () => {
+			this.emit('file-saved')
+		})
 		this.execute(pCode)
 	}
 

preload.js

@@ -35,11 +35,15 @@ serialBus.on('connect', (p) => {
 	})
 	connection.on('execution-started', () => {
 		console.log('serialBus', 'execution-started')
-		serialBus.emit('running')
+		serialBus.emit('execution-started')
 	})
 	connection.on('execution-finished', () => {
 		console.log('serialBus', 'execution-finished')
-		serialBus.emit('stopped')
+		serialBus.emit('execution-finished')
+	})
+	connection.on('file-saved', () => {
+		console.log('serialBus', 'file-saved')
+		serialBus.emit('file-saved')
 	})
 	connection.open(p)
 })

ui/blank/store.js

@@ -1,5 +1,7 @@
 function store(state, emitter) {
   state.connected = false
+  state.executing = false
+
   state.isPortDialogOpen = false
   state.ports = []
   state.panel = 'terminal' // terminal | files
@@ -92,27 +94,23 @@ function store(state, emitter) {
 
   emitter.on('list-board-folder', () => {
     console.log('list-board-folder')
-
     let outputBuffer = ''
     function parseData(o) {
       outputBuffer += o
       rawMessage = extractREPLMessage(outputBuffer)
       if (rawMessage) {
+        // console.log('raw message', rawMessage, outputBuffer)
         // Prepare to parse JSON
-        // console.log('raw message', rawMessage)
         rawMessage = rawMessage.replace(/'/g, `"`)
         try {
           let jsonMessage = JSON.parse(rawMessage)
           state.boardFiles = jsonMessage
           emitter.emit('render')
-        } catch(e) {
-
-        }
+        } catch(e) {}
         window.serialBus.off('data', parseData)
       }
     }
     window.serialBus.on('data', parseData)
-
     window.serialBus.emit('list-files')
   })
   emitter.on('select-board-file', (file) => {
@@ -131,9 +129,7 @@ function store(state, emitter) {
       }
     }
     window.serialBus.on('data', parseData)
-
     window.serialBus.emit('load-file', file)
-
     emitter.emit('render')
   })
 
@@ -164,19 +160,15 @@ function store(state, emitter) {
     }
 
     if (state.selectedDevice === 'disk') {
-      window.diskBus.emit(
-        'save-file',
-        {
-          folder: state.diskFolder,
-          filename: state.selectedFile,
-          content: editor.getValue()
-        }
-      )
+      window.diskBus.emit( 'save-file', {
+        folder: state.diskFolder,
+        filename: state.selectedFile,
+        content: editor.getValue()
+      })
     }
 
     if (state.selectedDevice === 'board') {
       window.serialBus.emit('save-file', state.selectedFile, editor.getValue())
-      setTimeout(() => emitter.emit('list-board-folder'), 100)
     }
   })
   emitter.on('remove-file', () => {
@@ -252,10 +244,8 @@ function store(state, emitter) {
     console.log('send-file-to-board')
     let editor = state.cache(AceEditor, 'editor').editor
     window.serialBus.emit('save-file', state.selectedFile, editor.getValue())
-    emitter.emit('update-files')
   })
 
-
   window.serialBus.on('connected', (port) => {
     console.log('serialBus', 'connected', port)
     state.connected = true
@@ -264,11 +254,6 @@ function store(state, emitter) {
     emitter.emit('list-board-folder')
     emitter.emit('render')
   })
-  window.serialBus.on('serialBus', (port) => {
-    console.log('serialBus', 'disconnected', port)
-    state.connected = false
-    emitter.emit('render')
-  })
   window.serialBus.on('ports', (ports) => {
     console.log('serialBus', 'ports', ports)
     state.ports = ports
@@ -279,6 +264,9 @@ function store(state, emitter) {
     state.cache(XTerm, 'terminal').term.write(buffer)
     state.cache(XTerm, 'terminal').term.scrollToBottom()
   })
+  window.serialBus.on('file-saved', () => {
+    setTimeout(() => emitter.emit('update-files'), 100)
+  })
 
   window.diskBus.on('folder-opened', ({ folder, files }) => {
     console.log('diskBus', 'folder-opened', folder, files)