pinetime/wasp-os
1
0
Fork 0
Code Activity

Merge pull request #337 from fgaz/upload-base64

Browse source 
Use base64 encoding for binary upload
This commit is contained in:
Daniel Thompson 2022-08-15 15:56:08 +01:00 committed by GitHub
commit 3a57bee8b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/wasptool
View file

@ -4,6 +4,7 @@
# Copyright (c) 2020 Daniel Thompson # Copyright (c) 2020 Daniel Thompson
import argparse import argparse
import binascii
import io import io
import random import random
import os import os
@ -315,12 +316,17 @@ def handle_binary_upload(c, fname, tname):
c.sendline(f'os.mkdir("{dname}")') c.sendline(f'os.mkdir("{dname}")')
c.run_command('del os') c.run_command('del os')
c.run_command('import ubinascii')
c.run_command(f'f = open("{tname}", "wb")') c.run_command(f'f = open("{tname}", "wb")')
# We define a function with a short name to reduce the constant per-chunk
# overhead.
# We use a lambda to avoid the "..." prompt triggered by def.
c.run_command(f'w = lambda d: f.write(ubinascii.a2b_base64(d))')
# Absorb the file to be uploaded # Absorb the file to be uploaded
with open(fname, 'rb') as f: with open(fname, 'rb') as f:
data = f.read() data = f.read()
chunksz = 24 chunksz = 64
nchunks = len(data) // chunksz nchunks = len(data) // chunksz
lastchunk = len(data) % chunksz lastchunk = len(data) % chunksz
@ -329,11 +335,13 @@ def handle_binary_upload(c, fname, tname):
# Send the data # Send the data
for i in pbar(range(0, chunksz*nchunks, chunksz), verbose): for i in pbar(range(0, chunksz*nchunks, chunksz), verbose):
c.run_command(f'f.write({repr(data[i:i+chunksz])})') c.run_command(f'w({repr(binascii.b2a_base64(data[i:i+chunksz]))})')
if lastchunk: if lastchunk:
c.run_command(f'f.write({repr(data[-lastchunk:])})') c.run_command(f'w({repr(binascii.b2a_base64(data[-lastchunk:]))})')
c.run_command('f.close()') c.run_command('f.close()')
c.run_command('del w')
c.run_command('del ubinascii')
def handle_upload(c, fname, tname): def handle_upload(c, fname, tname):
verbose = bool(c.logfile) verbose = bool(c.logfile)