PeterCxy/wasp-os
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wasptool: Allow files to be renamed during an upload

Browse source 
For example:

    ./tools/wasptool --upload docs/main/chrono.py --as main.py

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
This commit is contained in:
Daniel Thompson 2021-01-10 14:49:36 +00:00
parent 6de86a64ed
commit e79625685d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/wasptool
View file

@ -207,10 +207,13 @@ def check_rtc(c):
c.expect('>>> ') c.expect('>>> ')
def handle_binary_upload(c, fname): def handle_binary_upload(c, fname, tname):
verbose = bool(c.logfile) verbose = bool(c.logfile)
c.sendline(f'f = open("{os.path.basename(fname)}", "wb")') if not tname:
tname = os.path.basename(fname)
c.sendline(f'f = open("{tname}", "wb")')
c.expect('>>> ') c.expect('>>> ')
# Absorb the file to be uploaded # Absorb the file to be uploaded
@ -234,9 +237,12 @@ def handle_binary_upload(c, fname):
c.sendline('f.close()') c.sendline('f.close()')
c.expect('>>> ') c.expect('>>> ')
def handle_upload(c, fname): def handle_upload(c, fname, tname):
verbose = bool(c.logfile) verbose = bool(c.logfile)
if not tname:
tname = os.path.basename(fname)
c.sendline('from shell import upload') c.sendline('from shell import upload')
c.expect('>>> ') c.expect('>>> ')
@ -244,7 +250,7 @@ def handle_upload(c, fname):
if not verbose: if not verbose:
print(f'Uploading {fname}:') print(f'Uploading {fname}:')
c.sendline(f'upload("{os.path.basename(fname)}")') c.sendline(f'upload("{tname}")')
c.expect('=== ') c.expect('=== ')
paste(c, f, verbose) paste(c, f, verbose)
c.send('\x04') c.send('\x04')
@ -254,6 +260,8 @@ def handle_upload(c, fname):
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='Wasp-os command and control client') description='Wasp-os command and control client')
parser.add_argument('--as', dest='upload_as', default=None,
help="Filename to use on the target (e.g. wasptool --upload docs/main/chrono.py --as main.py")
parser.add_argument('--bootloader', action='store_true', parser.add_argument('--bootloader', action='store_true',
help="Reboot into the bootloader mode for OTA update") help="Reboot into the bootloader mode for OTA update")
parser.add_argument('--binary', action='store_true', parser.add_argument('--binary', action='store_true',
@ -326,9 +334,9 @@ if __name__ == '__main__':
if args.upload: if args.upload:
if args.binary: if args.binary:
handle_binary_upload(console, args.upload) handle_binary_upload(console, args.upload, args.upload_as)
else: else:
handle_upload(console, args.upload) handle_upload(console, args.upload, args.upload_as)
if args.console: if args.console:
console.close() console.close()