alihan/jupyter_micropython_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binary file transfers from disk now possible

Browse Source
This commit is contained in:
Julian Todd
2017-10-03 19:52:35 +01:00
parent 2204ce0187
commit f9c535e7ac
2 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
jupyter_micropython_kernel/deviceconnector.py
View File

@@ -1,4 +1,4 @@
import logging, sys, time, os, re
import logging, sys, time, os, re, base64
import serial, socket, serial.tools.list_ports, select
serialtimeout = 0.5
@@ -151,6 +151,7 @@ class DeviceConnector:
self.workingserialchunk = yieldserialchunk(self.workingserial or self.workingsocket)
indexprevgreaterthansign = -1
index04line = -1
for i, rline in enumerate(self.workingserialchunk):
assert rline is not None
@@ -167,6 +168,7 @@ class DeviceConnector:
# one of 2 Ctrl-Ds in the return from execute in paste mode
elif rline == b'\x04':
n04count += 1
index04line = i
# leaving condition where OK...x04...x04...> has been found in paste mode
elif rline == b'>' and n04count >= 2 and not bseekokay:
@@ -202,7 +204,8 @@ class DeviceConnector:
except UnicodeDecodeError:
ur = str(rline)
if not wifimessageignore.match(ur):
if n04count == 1:
if n04count == 1 and (i == index04line+1):
self.sres("\n")
self.sres(ur, 1)
else:
self.sres(ur)
@@ -215,20 +218,40 @@ class DeviceConnector:
break # out of the for loop
def sendtofile(self, destinationfilename, bappend, cellcontents):
def sendtofile(self, destinationfilename, bappend, bbinary, filecontents):
if self.workingserial:
self.workingserial.write("O=open({}, '{}')\r\n".format(repr(destinationfilename), ("a" if bappend else "w")).encode())
for i, line in enumerate(cellcontents.splitlines(True)):
self.workingserial.write("O.write({})\r\n".format(repr(line)).encode())
if (i%10) == 9:
self.workingserial.write(b'\r\x04') # intermediate executions
self.receivestream(bseekokay=True)
self.sres("{} lines sent so far\n".format(i+1))
fmodifier = ("a" if bappend else "w")+("b" if bbinary else "")
if bbinary:
self.workingserial.write(b"import ubinascii; O6 = ubinascii.a2b_base64\r\n")
self.workingserial.write("O=open({}, '{}')\r\n".format(repr(destinationfilename), fmodifier).encode())
if bbinary:
chunksize = 30
for i in range(int(len(filecontents)/chunksize)+1):
bchunk = filecontents[i*chunksize:(i+1)*chunksize]
self.workingserial.write(b'O.write(O6("')
self.workingserial.write(base64.encodebytes(bchunk)[:-1])
self.workingserial.write(b'"))\r\n')
if (i%10) == 9:
self.workingserial.write(b'\r\x04') # intermediate executions
self.receivestream(bseekokay=True)
self.sres("{} chunks sent so far\n".format(i+1))
self.sres("{} chunks sent done".format(i+1))
else:
for i, line in enumerate(filecontents.splitlines(True)):
self.workingserial.write("O.write({})\r\n".format(repr(line)).encode())
if (i%10) == 9:
self.workingserial.write(b'\r\x04') # intermediate executions
self.receivestream(bseekokay=True)
self.sres("{} lines sent so far\n".format(i+1))
self.sres("{} lines sent done".format(i+1))
self.workingserial.write("O.close()\r\n".encode())
self.workingserial.write(b'\r\x04')
self.receivestream(bseekokay=True)
self.sres("{} lines sent done".format(i+1))
else:
self.sres("File transfers implemented for sockets\n")
def enterpastemode(self):
# now sort out connection situation

16
jupyter_micropython_kernel/kernel.py
View File

@@ -28,7 +28,9 @@ ap_writebytes.add_argument('stringtosend', type=str)
ap_sendtofile = argparse.ArgumentParser(prog="%sendtofile", description="send a file to the microcontroller's file system", add_help=False)
ap_sendtofile.add_argument('-a', help='append', action='store_true')
ap_sendtofile.add_argument('-b', help='binary', action='store_true')
ap_sendtofile.add_argument('destinationfilename', type=str)
ap_sendtofile.add_argument('--source', help="source file", type=str, default="<<cellcontents>>", nargs="?")
def parseap(ap, percentstringargs1):
try:
@@ -97,7 +99,7 @@ class MicroPythonKernel(Kernel):
self.sres("%readbytes\n does serial.read_all()\n\n")
self.sres("%rebootdevice\n reboots device\n\n")
self.sres(re.sub("usage: ", "", ap_sendtofile.format_usage()))
self.sres(" send cell contents or file to device file\n\n")
self.sres(" send cell contents or file from disk to device file\n\n")
self.sres(re.sub("usage: ", "", ap_serialconnect.format_usage()))
self.sres(" connects to a device over USB wire\n\n")
self.sres(re.sub("usage: ", "", ap_socketconnect.format_usage()))
@@ -145,8 +147,12 @@ class MicroPythonKernel(Kernel):
if percentcommand == ap_sendtofile.prog:
apargs = parseap(ap_sendtofile, percentstringargs[1:])
cellcontents = re.sub("^\s*%sendtofile.*\n(?:[ \r]*\n)?", "", cellcontents)
self.dc.sendtofile(apargs.destinationfilename, apargs.a, cellcontents)
if apargs.source == "<<cellcontents>>":
filecontents = re.sub("^\s*%sendtofile.*\n(?:[ \r]*\n)?", "", cellcontents)
else:
fname = apargs.source or apargs.destinationfilename
filecontents = open(fname, ("rb" if apargs.b else "r")).read()
self.dc.sendtofile(apargs.destinationfilename, apargs.a, apargs.b, filecontents)
return None
self.sres("Unrecognized percentline {}\n".format([percentline]), 31)
@@ -186,7 +192,7 @@ class MicroPythonKernel(Kernel):
return
if not self.dc.serialexists():
self.sres("No serial connected\n", 1)
self.sres("No serial connected\n", 31)
self.sres(" %serialconnect to connect\n")
self.sres(" %lsmagic to list commands")
return
@@ -217,7 +223,7 @@ class MicroPythonKernel(Kernel):
interrupted = True
except OSError as e:
priorbuffer = []
self.sres("\n\n***Connecton broken [%s]\n" % str(e.strerror))
self.sres("\n\n***Connecton broken [%s]\n" % str(e.strerror), 31)
self.sres("You may need to reconnect")
if priorbuffer: