Implement ls and cat to resolve with output and update examples

murilopolese · murilopolese · commit 8e5f4e7623d4 · 2022-08-05T17:20:35.000+02:00
diff --git a/examples/05_list_files.js b/examples/05_list_files.js
@@ -1,11 +1,28 @@
 const Board = require('../micropython.js')
 
 console.log('connect')
+
+function extractFileArray(output) {
+  output = output.replace(/'/g, '"');
+  output = output.split('OK')
+  let files = output[2] || ''
+  // let files = output.find((data) => {
+  //   if (data.indexOf('[') === 0 && data.indexOf(']') !== -1) {
+  //     return true
+  //   }
+  // })
+  files = files.slice(0, files.indexOf(']')+1)
+  files = JSON.parse(files)
+  return files
+}
+
 let board = new Board()
 board.open(process.env.PORT || '/dev/tty.usbmodem141101')
   .then(async () => {
     try {
-      await board.fs_ls()
+      let output = await board.fs_ls()
+      let files = extractFileArray(output)
+      console.log('files', files)
       console.log('disconnect')
     } catch(e) {
       console.log('error', e)
diff --git a/examples/06_get_file_contents.js b/examples/06_get_file_contents.js
@@ -5,7 +5,10 @@ let board = new Board()
 board.open(process.env.PORT || '/dev/tty.usbmodem141101')
   .then(async () => {
     try {
-      await board.fs_cat('test.py')
+      let output = await board.fs_cat('test.py')
+      output = output.split('OK')
+      console.log('file contents:')
+      console.log(output[2])
       console.log('disconnect')
     } catch(e) {
       console.log('error', e)
diff --git a/micropython.js b/micropython.js
@@ -189,8 +189,8 @@ class MicroPythonBoard {
     const output = await this.exec_raw({
       command: `import uos\nprint(uos.listdir())`
     })
-    console.log(output)
-    return this.exit_raw_repl()
+    await this.exit_raw_repl()
+    return Promise.resolve(output)
   }
 
   async fs_cat(filePath) {
@@ -199,30 +199,32 @@ class MicroPythonBoard {
       const output = await this.exec_raw({
         command: `with open('${filePath}') as f:\n while 1:\n  b=f.read(256)\n  if not b:break\n  print(b,end='')`
       })
-      console.log(output)
-      return this.exit_raw_repl()
+      await this.exit_raw_repl()
+      return Promise.resolve(output)
     }
-    return Promise.reject()
+    return Promise.reject(new Error(`Path to file was not specified`))
   }
 
   async fs_put(src, dest) {
-    if (src) {
+    if (src && dest) {
       const content = fs.readFileSync(path.resolve(src))
       await this.enter_raw_repl()
       let output = await this.exec_raw({
         command: `f=open('${dest}','w')\nw=f.write`
       })
       for (let i = 0; i < content.length; i+=64) {
         let slice = content.slice(i, i+64)
-        slice =  slice.toString()
+        slice = slice.toString()
         slice = slice.replace(/"""/g, `\\"\\"\\"`)
         await this.serial.write(`w("""${slice}""")`)
         await this.serial.write(`\x04`)
         await sleep(50)
       }
       return this.exit_raw_repl()
     }
-    return Promise.reject()
+    return Promise.reject(new Error(`Must specify source and destination paths`))
+  }
+
   }
 
   async fs_mkdir() {
