refactor: remove __int__ and __ext__ tests and mentions

Author: benallfree

meshtastic/node.py

@@ -1133,9 +1133,8 @@ def uploadFile(self, local_path: str, device_path: str,
 
         Args:
             local_path:   Path to the local file to upload.
-            device_path:  Destination path on the device.  Use ``/__ext__/`` or
-                          ``/__int__/`` prefixes to target external or internal
-                          flash respectively; bare ``/`` paths go to InternalFS.
+            device_path:  Absolute path on the device filesystem (what the firmware
+                          resolves for XModem open/write).
             on_progress:  Optional callback ``fn(bytes_sent, total_bytes)``.
             timeout_s:    Per-packet ACK timeout in seconds.
 
@@ -1144,7 +1143,7 @@ def uploadFile(self, local_path: str, device_path: str,
 
         Example::
 
-            iface.localNode.uploadFile("wordle.bin", "/__ext__/bbs/kb/wordle.bin")
+            iface.localNode.uploadFile("wordle.bin", "/bbs/kb/wordle.bin")
         """
         if self.noProto:
             logger.warning("uploadFile: protocol disabled (noProto)")
@@ -1242,8 +1241,7 @@ def downloadFile(self, device_path: str, local_path: str,
         """Download a file from the device via XModem.
 
         Args:
-            device_path:  Source path on the device (``/__ext__/``, ``/__int__/``,
-                          or bare ``/`` for InternalFS).
+            device_path:  Absolute path on the device (same path rules as ``uploadFile``).
             local_path:   Destination path on the local filesystem.
             on_progress:  Optional callback ``fn(bytes_received, total_bytes)``.
                           ``total_bytes`` is -1 (unknown) during transfer.
@@ -1254,7 +1252,7 @@ def downloadFile(self, device_path: str, local_path: str,
 
         Example::
 
-            iface.localNode.downloadFile("/__ext__/bbs/kb/wordle.bin", "wordle.bin")
+            iface.localNode.downloadFile("/bbs/kb/wordle.bin", "wordle.bin")
         """
         if self.noProto:
             logger.warning("downloadFile: protocol disabled (noProto)")
@@ -1325,7 +1323,7 @@ def listDir(self, device_path: str, depth: int = 0, timeout_s: float = _XMODEM_T
         """List files on the device under ``device_path`` via XMODEM ``MFLIST`` (matching firmware).
 
         Args:
-            device_path: Directory on the device (``/__ext__/``, ``/__int__/``, or bare ``/``).
+            device_path: Directory path on the device to list.
             depth: Recursion depth (0 = files in that directory only; each increment adds one tree level).
             timeout_s: Per-packet timeout.
 

meshtastic/tests/test_file_transfer_cli.py

@@ -19,8 +19,8 @@
 
 
 def test_device_posix_join():
-    assert device_posix_join("/__ext__/d", "a/b") == "/__ext__/d/a/b"
-    assert device_posix_join("/__ext__/d/", "a", "b") == "/__ext__/d/a/b"
+    assert device_posix_join("/mnt/d", "a/b") == "/mnt/d/a/b"
+    assert device_posix_join("/mnt/d/", "a", "b") == "/mnt/d/a/b"
     assert device_posix_join("/", "x") == "/x"
 
 
@@ -35,8 +35,8 @@ def test_plan_upload_single_plain_file():
         f = os.path.join(d, "one.bin")
         with open(f, "wb") as fp:
             fp.write(b"x")
-        pairs = plan_upload([f], "/__ext__/out.bin")
-        assert pairs == [(f, "/__ext__/out.bin")]
+        pairs = plan_upload([f], "/mnt/out.bin")
+        assert pairs == [(f, "/mnt/out.bin")]
 
 
 def test_plan_upload_glob_recursive():
@@ -48,10 +48,10 @@ def test_plan_upload_glob_recursive():
             with open(fp, "w") as fh:
                 fh.write("x")
         pat = os.path.join(d, "p", "**", "*.txt")
-        pairs = plan_upload([pat], "/__ext__/out")
+        pairs = plan_upload([pat], "/mnt/out")
         assert len(pairs) == 2
         devs = sorted(dev for _loc, dev in pairs)
-        assert devs == ["/__ext__/out/a.txt", "/__ext__/out/q/b.txt"]
+        assert devs == ["/mnt/out/a.txt", "/mnt/out/q/b.txt"]
 
 
 def test_plan_upload_directory_preserves_layout():
@@ -61,19 +61,19 @@ def test_plan_upload_directory_preserves_layout():
         f1 = os.path.join(sub, "f.txt")
         with open(f1, "w") as fp:
             fp.write("hi")
-        pairs = plan_upload([d], "/__ext__/dst")
+        pairs = plan_upload([d], "/mnt/dst")
         assert len(pairs) == 1
         loc, dev = pairs[0]
         assert loc == f1
-        assert dev == "/__ext__/dst/a/b/f.txt"
+        assert dev == "/mnt/dst/a/b/f.txt"
 
 
 def test_plan_upload_dedupe():
     with tempfile.TemporaryDirectory() as d:
         f = os.path.join(d, "x.bin")
         with open(f, "wb") as fp:
             fp.write(b"x")
-        pairs = plan_upload([f, f], "/__ext__/d")
+        pairs = plan_upload([f, f], "/mnt/d")
         assert len(pairs) == 1
 
 
@@ -88,7 +88,7 @@ def test_plan_upload_path_too_long():
 
 
 def test_split_remote_glob_pattern():
-    assert split_remote_glob_pattern("/__ext__/bbs/*.md") == ("/__ext__/bbs", "*.md")
+    assert split_remote_glob_pattern("/mnt/bbs/*.md") == ("/mnt/bbs", "*.md")
     base, rel = split_remote_glob_pattern("*.md")
     assert base == "/"
     assert rel == "*.md"
@@ -103,26 +103,26 @@ def test_remote_rel_glob_to_regex():
 
 def test_plan_download_tree():
     rows = [
-        ("/__ext__/d/a.txt", 3),
-        ("/__ext__/d/sub/b.bin", 2),
-        ("/__ext__/d/emptydir", 0),
+        ("/mnt/d/a.txt", 3),
+        ("/mnt/d/sub/b.bin", 2),
+        ("/mnt/d/emptydir", 0),
     ]
     with tempfile.TemporaryDirectory() as ld:
-        pairs = plan_download_tree("/__ext__/d", ld, rows)
+        pairs = plan_download_tree("/mnt/d", ld, rows)
         assert len(pairs) == 2
         by = {os.path.basename(lp): dp for dp, lp in pairs}
-        assert by["a.txt"] == "/__ext__/d/a.txt"
-        assert by["b.bin"] == "/__ext__/d/sub/b.bin"
+        assert by["a.txt"] == "/mnt/d/a.txt"
+        assert by["b.bin"] == "/mnt/d/sub/b.bin"
 
 
 def test_plan_download_glob():
     rows = [
-        ("/__ext__/bbs/kb/one.md", 10),
-        ("/__ext__/bbs/kb/two.txt", 5),
-        ("/__ext__/bbs/other/x.md", 3),
+        ("/mnt/bbs/kb/one.md", 10),
+        ("/mnt/bbs/kb/two.txt", 5),
+        ("/mnt/bbs/other/x.md", 3),
     ]
     with tempfile.TemporaryDirectory() as ld:
-        pairs = plan_download_glob("/__ext__/bbs/**/*.md", ld, rows)
+        pairs = plan_download_glob("/mnt/bbs/**/*.md", ld, rows)
         assert len(pairs) == 2
         locs = sorted(lp for _dp, lp in pairs)
         assert locs[0].endswith(os.path.join("kb", "one.md"))

meshtastic/tests/test_node.py

@@ -1625,7 +1625,7 @@ def test_node_upload_file_xmodem_happy_path(tmp_path):
     iface = MagicMock(autospec=MeshInterface)
     anode = Node(iface, 1234567890, noProto=False)
     XC = xmodem_pb2.XModem
-    device_path = "/__ext__/t.bin"
+    device_path = "/t.bin"
     payload = b"hello"
     src = tmp_path / "src.bin"
     src.write_bytes(payload)
@@ -1659,7 +1659,7 @@ def test_node_upload_file_xmodem_two_chunks(tmp_path):
     iface = MagicMock(autospec=MeshInterface)
     anode = Node(iface, 1234567890, noProto=False)
     XC = xmodem_pb2.XModem
-    device_path = "/__int__/big.bin"
+    device_path = "/big.bin"
     payload = b"Z" * 129
     c0, c1 = payload[:128], payload[128:]
     src = tmp_path / "src.bin"
@@ -1720,7 +1720,7 @@ def test_node_download_file_xmodem_happy_path(tmp_path):
     iface = MagicMock(autospec=MeshInterface)
     anode = Node(iface, 1234567890, noProto=False)
     XC = xmodem_pb2.XModem
-    device_path = "/__ext__/r.bin"
+    device_path = "/r.bin"
     payload = b"hi"
     dst = tmp_path / "out.bin"
     phase = 0
@@ -1856,7 +1856,7 @@ def fake_roundtrip(xm, timeout_s=5.0):
 
     with patch.object(anode, "_xmodem_roundtrip", side_effect=fake_roundtrip):
         with patch.object(anode, "_xmodem_send"):
-            rows = anode.listDir("/__ext__", depth=0)
+            rows = anode.listDir("/mnt", depth=0)
     assert rows == [("/ok.txt", 1), ("/good.bin", 99)]