mpytool 2.1.0__tar.gz → 2.2.0__tar.gz

{mpytool-2.1.0 → mpytool-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpytool
-Version: 2.1.0
+Version: 2.2.0
 Summary: MPY tool - manage files on devices running MicroPython
 Author-email: Pavel Revak <pavel.revak@gmail.com>
 License-Expression: MIT
@@ -83,27 +83,29 @@ $ mpytool --help
 
 list files:
 ```
-$ mpytool -p /dev/ttyACM0 ls
-$ mpytool -p /dev/ttyACM0 ls lib
+$ mpytool -p /dev/ttyACM0 ls         # list CWD (default)
+$ mpytool -p /dev/ttyACM0 ls :/lib   # list /lib
 ```
 
-tree files:
+tree:
 ```
-$ mpytool -p /dev/ttyACM0 tree
+$ mpytool -p /dev/ttyACM0 tree       # tree of CWD (default)
 ```
 
 copy files (: prefix = device path):
 ```
 $ mpytool cp main.py :/             # upload file to device root
 $ mpytool cp main.py lib.py :/lib/  # upload multiple files to directory
-$ mpytool cp myapp/ :/              # upload directory (creates /myapp/)
-$ mpytool cp myapp/ :/lib/          # upload directory into /lib/
+$ mpytool cp myapp :/               # upload directory (creates :/myapp/)
+$ mpytool cp myapp :/lib/           # upload directory into :/lib/ (creates :/lib/myapp/)
+$ mpytool cp myapp/ :/lib/          # upload directory contents into :/lib/
 $ mpytool cp :/main.py ./           # download file to current directory
 $ mpytool cp :/ ./backup/           # download entire device to backup/
 $ mpytool cp :/old.py :/new.py      # copy file on device
 $ mpytool cp -f main.py :/          # force upload even if unchanged
 ```
 
+Path semantics: `:` = device CWD, `:/` = device root. Trailing `/` on source = copy contents only.
 Unchanged files are automatically skipped (compares size and SHA256 hash).
 Use `-f` or `--force` to upload all files regardless.
 
@@ -124,29 +126,43 @@ $ mpytool mv :/file.py :/lib/       # move file to directory
 $ mpytool mv :/a.py :/b.py :/lib/   # move multiple files to directory
 ```
 
-legacy upload/download (still available):
+view file contents:
 ```
-$ mpytool put boot.py /
-$ mpytool get boot.py >> boot.py
+$ mpytool cat :boot.py            # print file from CWD
+$ mpytool cat :/lib/module.py     # print file with absolute path
 ```
 
-make directory, delete files:
+make directory, delete files (: prefix = device path):
 ```
-$ mpytool mkdir a/b/c/d xyz/abc   # create directories
-$ mpytool rm mydir                # delete directory and contents
-$ mpytool rm mydir/               # delete contents only, keep directory
-$ mpytool rm /                    # delete everything on device
+$ mpytool mkdir :lib :data        # create directories in CWD
+$ mpytool mkdir :/lib/subdir      # create with absolute path
+$ mpytool rm :old.py              # delete file in CWD
+$ mpytool rm :mydir               # delete directory and contents
+$ mpytool rm :mydir/              # delete contents only, keep directory
+$ mpytool rm :                    # delete everything in CWD
+$ mpytool rm :/                   # delete everything on device (root)
+```
+
+current working directory:
+```
+$ mpytool pwd                     # print current directory
+/
+$ mpytool cd :/lib                # change to /lib
+$ mpytool cd :subdir              # change to relative path (from CWD)
+$ mpytool cd :..                  # change to parent directory
+$ mpytool cd :/lib -- ls          # change directory and list files
 ```
 
 reset and REPL:
 ```
 $ mpytool reset              # soft reset (Ctrl-D, runs boot.py/main.py)
-$ mpytool sreset             # soft reset in raw REPL (clears RAM only)
-$ mpytool mreset             # MCU reset (machine.reset, auto-reconnect)
-$ mpytool rtsreset           # hardware reset via RTS signal (serial only)
-$ mpytool bootloader         # enter bootloader (machine.bootloader)
-$ mpytool dtrboot            # enter bootloader via DTR/RTS (ESP32 only)
-$ mpytool reset monitor      # reset and monitor output
+$ mpytool reset --raw        # soft reset in raw REPL (clears RAM only)
+$ mpytool reset --machine    # MCU reset (machine.reset, auto-reconnect)
+$ mpytool reset --machine -t 30  # MCU reset with 30s reconnect timeout
+$ mpytool reset --rts        # hardware reset via RTS signal (serial only)
+$ mpytool reset --boot       # enter bootloader (machine.bootloader)
+$ mpytool reset --dtr-boot   # enter bootloader via DTR/RTS (ESP32 only)
+$ mpytool reset -- monitor   # reset and monitor output
 $ mpytool repl               # enter REPL mode
 $ mpytool sleep 2            # sleep for 2 seconds (useful between commands)
 ```
@@ -214,13 +230,14 @@ $ mpytool flash erase vfs --full           # full erase partition
 OTA firmware update (ESP32):
 ```
 $ mpytool ota firmware.app-bin                    # flash to next OTA partition
-$ mpytool ota firmware.app-bin -- mreset          # flash and reboot
+$ mpytool ota firmware.app-bin -- reset --machine          # flash and reboot
+$ mpytool ota firmware.app-bin -- reset --machine -t 30    # flash and reboot with 30s timeout
 ```
 
 multiple commands separated by `--`:
 ```
-$ mpytool cp main.py boot.py :/ -- reset -- monitor
-$ mpytool delete old.py -- cp new.py :/ -- reset
+$ mpytool cp main.py boot.py : -- reset -- monitor
+$ mpytool rm :old.py -- cp new.py : -- reset
 ```
 
 auto-detect serial port (if only one device is connected):
@@ -265,12 +282,6 @@ show version:
 $ mpytool -V
 ```
 
-Command aliases:
-- `dir` = `ls`
-- `cat` = `get`
-- `del`, `rm` = `delete`
-- `follow` = `monitor`
-
 ## Python API
 
 ```python

{mpytool-2.1.0 → mpytool-2.2.0}/README.md

@@ -69,27 +69,29 @@ $ mpytool --help
 
 list files:
 ```
-$ mpytool -p /dev/ttyACM0 ls
-$ mpytool -p /dev/ttyACM0 ls lib
+$ mpytool -p /dev/ttyACM0 ls         # list CWD (default)
+$ mpytool -p /dev/ttyACM0 ls :/lib   # list /lib
 ```
 
-tree files:
+tree:
 ```
-$ mpytool -p /dev/ttyACM0 tree
+$ mpytool -p /dev/ttyACM0 tree       # tree of CWD (default)
 ```
 
 copy files (: prefix = device path):
 ```
 $ mpytool cp main.py :/             # upload file to device root
 $ mpytool cp main.py lib.py :/lib/  # upload multiple files to directory
-$ mpytool cp myapp/ :/              # upload directory (creates /myapp/)
-$ mpytool cp myapp/ :/lib/          # upload directory into /lib/
+$ mpytool cp myapp :/               # upload directory (creates :/myapp/)
+$ mpytool cp myapp :/lib/           # upload directory into :/lib/ (creates :/lib/myapp/)
+$ mpytool cp myapp/ :/lib/          # upload directory contents into :/lib/
 $ mpytool cp :/main.py ./           # download file to current directory
 $ mpytool cp :/ ./backup/           # download entire device to backup/
 $ mpytool cp :/old.py :/new.py      # copy file on device
 $ mpytool cp -f main.py :/          # force upload even if unchanged
 ```
 
+Path semantics: `:` = device CWD, `:/` = device root. Trailing `/` on source = copy contents only.
 Unchanged files are automatically skipped (compares size and SHA256 hash).
 Use `-f` or `--force` to upload all files regardless.
 
@@ -110,29 +112,43 @@ $ mpytool mv :/file.py :/lib/       # move file to directory
 $ mpytool mv :/a.py :/b.py :/lib/   # move multiple files to directory
 ```
 
-legacy upload/download (still available):
+view file contents:
 ```
-$ mpytool put boot.py /
-$ mpytool get boot.py >> boot.py
+$ mpytool cat :boot.py            # print file from CWD
+$ mpytool cat :/lib/module.py     # print file with absolute path
 ```
 
-make directory, delete files:
+make directory, delete files (: prefix = device path):
 ```
-$ mpytool mkdir a/b/c/d xyz/abc   # create directories
-$ mpytool rm mydir                # delete directory and contents
-$ mpytool rm mydir/               # delete contents only, keep directory
-$ mpytool rm /                    # delete everything on device
+$ mpytool mkdir :lib :data        # create directories in CWD
+$ mpytool mkdir :/lib/subdir      # create with absolute path
+$ mpytool rm :old.py              # delete file in CWD
+$ mpytool rm :mydir               # delete directory and contents
+$ mpytool rm :mydir/              # delete contents only, keep directory
+$ mpytool rm :                    # delete everything in CWD
+$ mpytool rm :/                   # delete everything on device (root)
+```
+
+current working directory:
+```
+$ mpytool pwd                     # print current directory
+/
+$ mpytool cd :/lib                # change to /lib
+$ mpytool cd :subdir              # change to relative path (from CWD)
+$ mpytool cd :..                  # change to parent directory
+$ mpytool cd :/lib -- ls          # change directory and list files
 ```
 
 reset and REPL:
 ```
 $ mpytool reset              # soft reset (Ctrl-D, runs boot.py/main.py)
-$ mpytool sreset             # soft reset in raw REPL (clears RAM only)
-$ mpytool mreset             # MCU reset (machine.reset, auto-reconnect)
-$ mpytool rtsreset           # hardware reset via RTS signal (serial only)
-$ mpytool bootloader         # enter bootloader (machine.bootloader)
-$ mpytool dtrboot            # enter bootloader via DTR/RTS (ESP32 only)
-$ mpytool reset monitor      # reset and monitor output
+$ mpytool reset --raw        # soft reset in raw REPL (clears RAM only)
+$ mpytool reset --machine    # MCU reset (machine.reset, auto-reconnect)
+$ mpytool reset --machine -t 30  # MCU reset with 30s reconnect timeout
+$ mpytool reset --rts        # hardware reset via RTS signal (serial only)
+$ mpytool reset --boot       # enter bootloader (machine.bootloader)
+$ mpytool reset --dtr-boot   # enter bootloader via DTR/RTS (ESP32 only)
+$ mpytool reset -- monitor   # reset and monitor output
 $ mpytool repl               # enter REPL mode
 $ mpytool sleep 2            # sleep for 2 seconds (useful between commands)
 ```
@@ -200,13 +216,14 @@ $ mpytool flash erase vfs --full           # full erase partition
 OTA firmware update (ESP32):
 ```
 $ mpytool ota firmware.app-bin                    # flash to next OTA partition
-$ mpytool ota firmware.app-bin -- mreset          # flash and reboot
+$ mpytool ota firmware.app-bin -- reset --machine          # flash and reboot
+$ mpytool ota firmware.app-bin -- reset --machine -t 30    # flash and reboot with 30s timeout
 ```
 
 multiple commands separated by `--`:
 ```
-$ mpytool cp main.py boot.py :/ -- reset -- monitor
-$ mpytool delete old.py -- cp new.py :/ -- reset
+$ mpytool cp main.py boot.py : -- reset -- monitor
+$ mpytool rm :old.py -- cp new.py : -- reset
 ```
 
 auto-detect serial port (if only one device is connected):
@@ -251,12 +268,6 @@ show version:
 $ mpytool -V
 ```
 
-Command aliases:
-- `dir` = `ls`
-- `cat` = `get`
-- `del`, `rm` = `delete`
-- `follow` = `monitor`
-
 ## Python API
 
 ```python

{mpytool-2.1.0 → mpytool-2.2.0}/mpytool/conn_serial.py

@@ -6,7 +6,7 @@ import mpytool.conn as _conn
 
 
 class ConnSerial(_conn.Conn):
-    RECONNECT_TIMEOUT = 5  # seconds
+    RECONNECT_TIMEOUT = 10  # seconds
 
     def __init__(self, log=None, **serial_config):
         super().__init__(log)
@@ -28,14 +28,24 @@ class ConnSerial(_conn.Conn):
 
     def _read_available(self):
         """Read available data from serial port"""
-        in_waiting = self._serial.in_waiting
-        if in_waiting > 0:
-            return self._serial.read(in_waiting)
-        return None
+        if self._serial is None:
+            raise _conn.ConnError("Not connected")
+        try:
+            in_waiting = self._serial.in_waiting
+            if in_waiting > 0:
+                return self._serial.read(in_waiting)
+            return None
+        except OSError as err:
+            raise _conn.ConnError(f"Connection lost: {err}") from err
 
     def _write_raw(self, data):
         """Write data to serial port"""
-        return self._serial.write(data)
+        if self._serial is None:
+            raise _conn.ConnError("Not connected")
+        try:
+            return self._serial.write(data)
+        except OSError as err:
+            raise _conn.ConnError(f"Connection lost: {err}") from err
 
     def _is_usb_cdc(self):
         """Check if this is a USB-CDC port (native USB on ESP32-S/C)"""

{mpytool-2.1.0 → mpytool-2.2.0}/mpytool/mpy.py

@@ -65,7 +65,8 @@ def _mt_tree(p):
 def _mt_mkdir(p):
     p=p.rstrip('/');c='';f=1
     for d in p.split('/'):
-        c+='/'+d if c else d
+        if not d:c='/';continue
+        c='/'+d if c=='/' else (c+'/'+d if c else d)
         if f:
             try:
                 if os.stat(c)[0]=={_ATTR_FILE}:return 1
@@ -295,6 +296,27 @@ def _mt_pfind(label):
         self.import_module('os')
         self._mpy_comm.exec(f"os.rename('{_escape_path(src)}', '{_escape_path(dst)}')")
 
+    def getcwd(self):
+        """Get current working directory
+
+        Returns:
+            current working directory path
+        """
+        self.import_module('os')
+        return self._mpy_comm.exec_eval("repr(os.getcwd())")
+
+    def chdir(self, path):
+        """Change current working directory
+
+        Arguments:
+            path: directory path to change to
+        """
+        self.import_module('os')
+        try:
+            self._mpy_comm.exec(f"os.chdir('{_escape_path(path)}')")
+        except _mpy_comm.CmdError as err:
+            raise DirNotFound(path) from err
+
     def hashfile(self, path):
         """Compute SHA256 hash of file
 
@@ -1124,11 +1146,12 @@ def _mt_pfind(label):
         self._mpy_comm.soft_reset_raw()
         self.reset_state()
 
-    def machine_reset(self, reconnect=True):
+    def machine_reset(self, reconnect=True, timeout=None):
         """MCU reset using machine.reset()
 
         Arguments:
             reconnect: if True, attempt to reconnect after reset
+            timeout: reconnect timeout in seconds (None = default)
 
         Returns:
             True if reconnected successfully, False otherwise
@@ -1139,7 +1162,7 @@ def _mt_pfind(label):
         self._conn.write(b"import machine; machine.reset()\x04")
         self.reset_state()
         if reconnect:
-            self._conn.reconnect()
+            self._conn.reconnect(timeout=timeout)
             return True
         return False