fix: clean up errors, exit codes, and ls directory display

- Remove leftover debug print("here we are") from reset command
- reset --safe/--bootloader now exits 1 when unsupported on MicroPython
- run with a missing local file now exits 1 instead of silently succeeding
- Add AmypGroup (custom Click Group) to catch RuntimeError and
  DirectoryExistsError at the top level — users see a clean "Error: ..."
  message instead of a raw Python traceback
- Fix rm error handling: conditions used != 1 instead of != -1, and
  ENOTEMPTY was checked as errno 13 (wrong) instead of 39; now parses
  the errno number from the OSError message for accurate messages
- ls -l and ls -r -l now show "<dir>" for directories instead of a
  meaningless block-size byte count from MicroPython's os.stat
- Add import re to files.py (needed by the new errno parsing)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: curiouswala

ampy/cli.py

@@ -42,6 +42,21 @@
 _board = None
 
 
+class AmypGroup(click.Group):
+    """Custom Click group that converts RuntimeError / DirectoryExistsError into
+    clean error messages instead of raw Python tracebacks."""
+
+    def invoke(self, ctx):
+        try:
+            return super().invoke(ctx)
+        except files.DirectoryExistsError as e:
+            click.echo("Error: {}".format(e), err=True)
+            raise SystemExit(1)
+        except RuntimeError as e:
+            click.echo("Error: {}".format(e), err=True)
+            raise SystemExit(1)
+
+
 def windows_full_port_name(portname):
     # Helper function to generate proper Windows COM port paths.  Apparently
     # Windows requires COM ports above 9 to have a special path, where ports below
@@ -55,7 +70,7 @@ def windows_full_port_name(portname):
         return "\\\\.\\{0}".format(portname)
 
 
-@click.group()
+@click.group(cls=AmypGroup)
 @click.option(
     "--port",
     "-p",
@@ -357,6 +372,7 @@ def run(local_file, no_output):
         click.echo(
             "Failed to find or read input file: {0}".format(local_file), err=True
         )
+        raise SystemExit(1)
 
 
 @cli.command()
@@ -417,10 +433,9 @@ def reset():
     """
     )
     r = _board.eval("on_next_reset({})".format(repr(mode)))
-    print("here we are", repr(r))
     if r:
-        click.echo(r, err=True)
-        return
+        click.echo(r.decode("utf-8"), err=True)
+        raise SystemExit(1)
 
     try:
         _board.exec_raw_no_follow("reset()")

ampy/files.py

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 import ast
+import re
 import textwrap
 import binascii
 
@@ -153,8 +154,11 @@ def listdir(directory):
             command += """
                 r = []
                 for f in listdir('{0}'):
-                    size = os.stat(f)[6]                    
-                    r.append('{{0}} - {{1}} bytes'.format(f, size))
+                    st = os.stat(f)
+                    if st[0] & 0x4000:
+                        r.append('{{0}} - <dir>'.format(f))
+                    else:
+                        r.append('{{0}} - {{1}} bytes'.format(f, st[6]))
                 print(r)
             """.format(
                 directory
@@ -243,15 +247,20 @@ def rm(self, filename):
             out = self._pyboard.exec_(textwrap.dedent(command))
         except PyboardError as ex:
             message = ex.args[2].decode("utf-8")
-            # Check if this is an OSError #2, i.e. file/directory doesn't exist
-            # and rethrow it as something more descriptive.
-            if message.find("OSError") != -1 and message.find("2") != 1:
-                raise RuntimeError("No such file/directory: {0}".format(filename))
-            # Check for OSError #13, the directory isn't empty.
-            if message.find("OSError") != -1 and message.find("13") != 1:
-                raise RuntimeError("Directory is not empty: {0}".format(filename))
-            else:
-                raise ex
+            if "OSError" in message:
+                # Extract errno number — MicroPython formats as either
+                # "OSError: 2" or "OSError: [Errno 2] ENOENT"
+                errno_match = re.search(r"OSError:.*?(\d+)", message)
+                errno_val = int(errno_match.group(1)) if errno_match else None
+                if errno_val == 2:  # ENOENT
+                    raise RuntimeError("No such file/directory: {0}".format(filename))
+                elif errno_val == 21:  # EISDIR
+                    raise RuntimeError(
+                        "Is a directory (use rmdir to remove): {0}".format(filename)
+                    )
+                elif errno_val == 39:  # ENOTEMPTY
+                    raise RuntimeError("Directory is not empty: {0}".format(filename))
+            raise ex
         self._pyboard.exit_raw_repl()
 
     def rmdir(self, directory, missing_okay=False):