mpytool 2.3.1__tar.gz → 2.3.3__tar.gz

{mpytool-2.3.1 → mpytool-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpytool
-Version: 2.3.1
+Version: 2.3.3
 Summary: MPY tool - manage files on devices running MicroPython
 Author-email: Pavel Revak <pavel.revak@gmail.com>
 License-Expression: MIT
@@ -608,11 +608,12 @@ Scanning...
 
 ## Debug output
 
-- `-d` print warnings (yellow)
-- `-dd` print info messages (purple)
-- `-ddd` print debug messages (blue)
+By default, errors and warnings are shown.
 
-For reporting bugs, please include `-ddd` output in the issue.
+- `-d` also print info messages (purple)
+- `-dd` also print debug messages (blue)
+
+For reporting bugs, please include `-dd` output in the issue.
 
 ## Performance
 
@@ -692,6 +693,38 @@ exec bash
 - Support for `--` command separator
 - Works with both relative and absolute paths
 
+## Development
+
+### Running tests
+
+```bash
+# Unit tests (no device needed)
+python -m unittest discover tests/ -v
+
+# Read-only integration tests (safe on production device)
+MPYTOOL_TEST_PORT=/dev/ttyACM0 python -m unittest tests.test_integration -v
+
+# All integration tests (dedicated test device)
+MPYTOOL_TEST_PORT_RW=/dev/ttyACM0 python -m unittest tests.test_integration -v
+
+# CLI tests (no device needed for basic tests)
+python -m unittest tests.test_cli -v
+
+# All CLI tests with device
+MPYTOOL_TEST_PORT_RW=/dev/ttyACM0 python -m unittest tests.test_cli -v
+```
+
+Test categories:
+- **Unit tests** (`test_*.py` except `test_integration.py`, `test_cli.py`) - no device needed
+- **Read-only tests** (`MPYTOOL_TEST_PORT`) - safe on any device, no filesystem changes
+- **All tests** (`MPYTOOL_TEST_PORT_RW`) - includes write and flash operations, use dedicated test device
+
+### Install from source
+
+```bash
+pip install -e .
+```
+
 ## Requirements
 
 Working only with MicroPython boards, not with CircuitPython

{mpytool-2.3.1 → mpytool-2.3.3}/README.md

@@ -594,11 +594,12 @@ Scanning...
 
 ## Debug output
 
-- `-d` print warnings (yellow)
-- `-dd` print info messages (purple)
-- `-ddd` print debug messages (blue)
+By default, errors and warnings are shown.
 
-For reporting bugs, please include `-ddd` output in the issue.
+- `-d` also print info messages (purple)
+- `-dd` also print debug messages (blue)
+
+For reporting bugs, please include `-dd` output in the issue.
 
 ## Performance
 
@@ -678,6 +679,38 @@ exec bash
 - Support for `--` command separator
 - Works with both relative and absolute paths
 
+## Development
+
+### Running tests
+
+```bash
+# Unit tests (no device needed)
+python -m unittest discover tests/ -v
+
+# Read-only integration tests (safe on production device)
+MPYTOOL_TEST_PORT=/dev/ttyACM0 python -m unittest tests.test_integration -v
+
+# All integration tests (dedicated test device)
+MPYTOOL_TEST_PORT_RW=/dev/ttyACM0 python -m unittest tests.test_integration -v
+
+# CLI tests (no device needed for basic tests)
+python -m unittest tests.test_cli -v
+
+# All CLI tests with device
+MPYTOOL_TEST_PORT_RW=/dev/ttyACM0 python -m unittest tests.test_cli -v
+```
+
+Test categories:
+- **Unit tests** (`test_*.py` except `test_integration.py`, `test_cli.py`) - no device needed
+- **Read-only tests** (`MPYTOOL_TEST_PORT`) - safe on any device, no filesystem changes
+- **All tests** (`MPYTOOL_TEST_PORT_RW`) - includes write and flash operations, use dedicated test device
+
+### Install from source
+
+```bash
+pip install -e .
+```
+
 ## Requirements
 
 Working only with MicroPython boards, not with CircuitPython

{mpytool-2.3.1 → mpytool-2.3.3}/mpytool/cmd_cp.py

@@ -79,8 +79,8 @@ class CopyCommand:
         # Cache
         self._remote_file_cache = {}
 
-        # Debug mode
-        self._is_debug = getattr(self._log, 'loglevel', 1) >= 4
+        # Info mode disables progress overwrite (each update on new line)
+        self._is_info = self._log.is_info
 
     @property
     def _verbose(self):
@@ -196,7 +196,7 @@ class CopyCommand:
             line = self._format_progress_line(percent, total)
         else:
             line = self._format_compact_progress(f"{percent:3d}%", total)
-        if self._is_debug:
+        if self._is_info:
             self.verbose(line, color='cyan')
         else:
             self.verbose(line, color='cyan', end='', overwrite=True)
@@ -207,7 +207,7 @@ class CopyCommand:
             line = self._format_progress_line(100, total, encodings)
         else:
             line = self._format_compact_complete(total)
-        self.verbose(line, color='cyan', overwrite=not self._is_debug)
+        self.verbose(line, color='cyan', overwrite=not self._is_info)
 
     def _set_progress_info(self, src, dst, is_src_remote, is_dst_remote):
         """Set progress source and destination paths"""
@@ -673,7 +673,7 @@ class CopyCommand:
         self._force = force
         self._compress = compress
         if mpy:
-            self._mpy_cross = MpyCross(self._log, self.verbose)
+            self._mpy_cross = MpyCross(self._log)
 
         try:
             self._run_impl(paths)
@@ -831,7 +831,7 @@ class CopyCommand:
 
     def print_transfer_info(self):
         """Print transfer settings (chunk size and compression)"""
-        chunk = self.mpy.detect_chunk_size()
+        chunk = self.mpy.chunk_size
         chunk_str = f"{chunk // 1024}K" if chunk >= 1024 else str(chunk)
         if self._compress is None:
             compress = self.mpy.detect_deflate()

{mpytool-2.3.1 → mpytool-2.3.3}/mpytool/conn.py

@@ -3,6 +3,8 @@
 import time as _time
 import select as _select
 
+from mpytool.logger import SimpleColorLogger as _SimpleColorLogger
+
 # VFS escape byte - signals start of VFS command from device
 ESCAPE = 0x18
 
@@ -17,7 +19,7 @@ class Timeout(ConnError):
 
 class Conn():
     def __init__(self, log=None):
-        self._log = log
+        self._log = log if log is not None else _SimpleColorLogger()
         self._buffer = bytearray()
         self._escape_handlers = {}  # {escape_byte: handler}
         self._active_handler = None  # Currently processing handler

{mpytool-2.3.1 → mpytool-2.3.3}/mpytool/conn_serial.py

@@ -3,6 +3,7 @@
 import time as _time
 import serial as _serial
 import mpytool.conn as _conn
+import mpytool.utils as _utils
 
 
 class ConnSerial(_conn.Conn):
@@ -11,6 +12,7 @@ class ConnSerial(_conn.Conn):
     def __init__(self, log=None, **serial_config):
         super().__init__(log)
         self._serial_config = serial_config
+        self._port_info = _utils.get_port_info(serial_config.get('port', ''))
         try:
             self._serial = _serial.Serial(**serial_config)
         except _serial.serialutil.SerialException as err:
@@ -20,9 +22,27 @@ class ConnSerial(_conn.Conn):
         # Windows: pyserial has no fd, select() works only with sockets
         if not hasattr(self._serial, 'fd'):
             self._has_data = self._has_data_polling
+        # Debug info about port type
+        port = serial_config.get('port', '')
+        if self._port_info and self._port_info.vid:
+            vid = self._port_info.vid
+            pid = self._port_info.pid
+            self._log.info(
+                "Connected to %s [%04X:%04X %s]",
+                port, vid, pid, self.port_type)
+        else:
+            self._log.info("Connected to %s [unknown serial port]", port)
 
     def close(self):
         if self._serial:
+            # Prevent ESP32 reset when driver clears DTR/RTS on close
+            # Only for USB-UART bridges (CP2102, CH340, etc.), not USB-CDC
+            if self._is_usb_uart():
+                try:
+                    self._serial.rts = False
+                    self._serial.dtr = False
+                except OSError:
+                    pass
             self._serial.close()
             self._serial = None
 
@@ -56,7 +76,7 @@ class ConnSerial(_conn.Conn):
             in_waiting = self._serial.in_waiting
             if in_waiting > 0:
                 data = self._serial.read(in_waiting)
-                if data and self._log:
+                if data:
                     self._log.debug("RX: %r", data)
                 return data
             return None
@@ -67,20 +87,43 @@ class ConnSerial(_conn.Conn):
         """Write data to serial port"""
         if self._serial is None:
             raise _conn.ConnError("Not connected")
-        if self._log:
-            self._log.debug("TX: %r", data)
+        self._log.debug("TX: %r", data)
         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)"""
-        port = self._serial.port or ''
-        return 'ACM' in port or 'usbmodem' in port
+    @property
+    def vid(self):
+        """USB Vendor ID or None if not available"""
+        return self._port_info.vid if self._port_info else None
+
+    @property
+    def pid(self):
+        """USB Product ID or None if not available"""
+        return self._port_info.pid if self._port_info else None
+
+    @property
+    def port_type(self):
+        """Return port type string for debug info"""
+        if self._is_usb_uart():
+            return "USB-UART"
+        if self.vid in _utils._MICROPYTHON_VIDS:
+            return "USB-CDC"
+        if self.vid:
+            return "USB (unknown)"
+        return "unknown"
+
+    def _is_usb_uart(self):
+        """Check if this is a USB-UART bridge (CP210x, CH340, FTDI, etc.)"""
+        return self.vid in _utils._USB_UART_VIDS
 
     def hard_reset(self):
-        """Hardware reset using DTR/RTS signals"""
+        """Hardware reset using DTR/RTS signals (USB-UART only)"""
+        if not self._is_usb_uart():
+            raise _conn.ConnError(
+                f"Hardware reset not supported on {self.port_type}")
+        self._log.info("hard_reset: using DTR/RTS")
         self._serial.setDTR(False)  # GPIO0 high (normal boot)
         self._serial.setRTS(True)   # Assert reset
         _time.sleep(0.1)
@@ -117,28 +160,11 @@ class ConnSerial(_conn.Conn):
         raise _conn.ConnError(f"Could not reconnect to {port} within {timeout}s")
 
     def reset_to_bootloader(self):
-        """Reset into bootloader mode (auto-detects USB-CDC vs USB-UART)"""
-        if self._is_usb_cdc():
-            self._reset_to_bootloader_usb_jtag()
-        else:
-            self._reset_to_bootloader_classic()
-
-    def _reset_to_bootloader_usb_jtag(self):
-        """Bootloader reset for USB-JTAG-Serial (esptool sequence)"""
-        self._serial.setRTS(False)
-        self._serial.setDTR(False)
-        _time.sleep(0.1)
-        self._serial.setDTR(True)
-        self._serial.setRTS(True)
-        _time.sleep(0.1)
-        self._serial.setDTR(False)
-        self._serial.setRTS(True)
-        _time.sleep(0.1)
-        self._serial.setDTR(False)
-        self._serial.setRTS(False)
-
-    def _reset_to_bootloader_classic(self):
-        """Bootloader reset for USB-UART (classic DTR/RTS circuit)"""
+        """Reset into bootloader mode (USB-UART only)"""
+        if not self._is_usb_uart():
+            raise _conn.ConnError(
+                f"Bootloader reset not supported on {self.port_type}")
+        self._log.info("reset_to_bootloader: using DTR/RTS")
         self._serial.setDTR(False)  # GPIO0 high
         self._serial.setRTS(True)   # Assert reset
         _time.sleep(0.1)

{mpytool-2.3.1 → mpytool-2.3.3}/mpytool/conn_socket.py

@@ -49,8 +49,7 @@ class ConnSocket(_conn.Conn):
         try:
             data = self._socket.recv(4096)
             if data:
-                if self._log:
-                    self._log.debug("RX: %r", data)
+                self._log.debug("RX: %r", data)
                 return data
         except BlockingIOError:
             pass
@@ -62,8 +61,7 @@ class ConnSocket(_conn.Conn):
         """Write data to socket"""
         if self._socket is None:
             raise _conn.ConnError("Not connected")
-        if self._log:
-            self._log.debug("TX: %r", data)
+        self._log.debug("TX: %r", data)
         try:
             return self._socket.send(data)
         except OSError as err:

{mpytool-2.3.1 → mpytool-2.3.3}/mpytool/logger.py

@@ -4,6 +4,12 @@ import os as _os
 import sys as _sys
 
 
+# Log levels (compatible with Python logging)
+DEBUG = 10
+INFO = 20
+WARNING = 30
+ERROR = 40
+
 class SimpleColorLogger():
     # ANSI color codes
     _RESET = '\033[0m'
@@ -25,7 +31,7 @@ class SimpleColorLogger():
         'cyan': _BOLD_CYAN,
     }
 
-    def __init__(self, loglevel=1, verbose_level=0):
+    def __init__(self, loglevel=WARNING, verbose_level=0):
         self._loglevel = loglevel
         self._verbose_level = verbose_level
         self._is_tty = _sys.stderr.isatty()
@@ -40,9 +46,24 @@ class SimpleColorLogger():
 
     @property
     def loglevel(self):
-        """Return current log level (1=error, 2=warning, 3=info, 4=debug)"""
+        """Return current log level (DEBUG=10, INFO=20, WARNING=30, ERROR=40)"""
         return self._loglevel
 
+    @property
+    def is_debug(self):
+        """True if debug messages are enabled"""
+        return self._loglevel <= DEBUG
+
+    @property
+    def is_info(self):
+        """True if info messages are enabled"""
+        return self._loglevel <= INFO
+
+    @property
+    def is_warning(self):
+        """True if warning messages are enabled"""
+        return self._loglevel <= WARNING
+
     def colorize(self, text, color):
         """Return text wrapped in color codes if colors are enabled"""
         if not self._color:
@@ -67,7 +88,7 @@ class SimpleColorLogger():
     def error(self, msg, *args):
         if args:
             msg = msg % args
-        if self._loglevel >= 1:
+        if self._loglevel <= ERROR:
             if self._color:
                 self.log(f"{self._BOLD_RED}{msg}{self._RESET}")
             else:
@@ -76,7 +97,7 @@ class SimpleColorLogger():
     def warning(self, msg, *args):
         if args:
             msg = msg % args
-        if self._loglevel >= 2:
+        if self._loglevel <= WARNING:
             if self._color:
                 self.log(f"{self._BOLD_YELLOW}{msg}{self._RESET}")
             else:
@@ -85,7 +106,7 @@ class SimpleColorLogger():
     def info(self, msg, *args):
         if args:
             msg = msg % args
-        if self._loglevel >= 3:
+        if self._loglevel <= INFO:
             if self._color:
                 self.log(f"{self._BOLD_MAGENTA}{msg}{self._RESET}")
             else:
@@ -94,7 +115,7 @@ class SimpleColorLogger():
     def debug(self, msg, *args):
         if args:
             msg = msg % args
-        if self._loglevel >= 4:
+        if self._loglevel <= DEBUG:
             if self._color:
                 self.log(f"{self._BOLD_BLUE}{msg}{self._RESET}")
             else: