From ed0c680790950354f15fb5835e1d7b213efa1bf8 Mon Sep 17 00:00:00 2001 From: Christophe Besson Date: Thu, 8 Oct 2026 01:11:38 +0200 Subject: fix(node): name a root after its drive when its basename is taken Two drives with a folder of the same name made the second add fail, and no screen could supply another name. add_root now names it "Name (H)" or "Name (parent)"; a name the operator typed is still refused on a clash. Co-Authored-By: Claude Opus 5.5 --- .../tests/test_root_ops_reach_the_live_set.py | 31 ++++++++++++++++++++++ packages/meshbay-node/tests/test_roots.py | 16 +++++++++++ 2 files changed, 47 insertions(+) (limited to 'packages/meshbay-node/tests') diff --git a/packages/meshbay-node/tests/test_root_ops_reach_the_live_set.py b/packages/meshbay-node/tests/test_root_ops_reach_the_live_set.py index b2b3650..1a0d9f1 100644 --- a/packages/meshbay-node/tests/test_root_ops_reach_the_live_set.py +++ b/packages/meshbay-node/tests/test_root_ops_reach_the_live_set.py @@ -235,6 +235,37 @@ async def test_adding_the_same_directory_twice_is_still_refused(tmp_path): await roster.close() +@pytest.mark.parametrize("sent_name", ["", "Archives"]) +async def test_the_same_folder_name_on_two_drives_gets_a_name_of_its_own(tmp_path, sent_name): + """The picker sends the basename; the second folder must not be refused for it.""" + state, roster = await _state(tmp_path) + for drive in ("g", "h"): + (tmp_path / drive / "Archives").mkdir(parents=True) + try: + first = await ops.add_root(state, GROUP, str(tmp_path / "g" / "Archives"), + name=sent_name) + second = await ops.add_root(state, GROUP, str(tmp_path / "h" / "Archives"), + name=sent_name) + assert first["name"] == "Archives" + assert second["name"] == "Archives (h)" + assert {"Archives", "Archives (h)"} <= set(_rebuilt(state).names), ( + "the name given to the second folder did not reach node.toml") + assert 'name = "Archives (h)"' in Path(state["config_path"]).read_text( + encoding="utf-8") + finally: + await roster.close() + + +async def test_a_name_somebody_chose_is_still_refused_on_a_clash(tmp_path): + state, roster = await _state(tmp_path) + (tmp_path / "other").mkdir() + try: + with pytest.raises(ops.OpError, match="both be called"): + await ops.add_root(state, GROUP, str(tmp_path / "other"), name="one") + finally: + await roster.close() + + async def test_a_second_different_root_still_lands(tmp_path): state, roster = await _state(tmp_path) (tmp_path / "uploads").mkdir() diff --git a/packages/meshbay-node/tests/test_roots.py b/packages/meshbay-node/tests/test_roots.py index 9a403ff..0fe9f03 100644 --- a/packages/meshbay-node/tests/test_roots.py +++ b/packages/meshbay-node/tests/test_roots.py @@ -8,13 +8,17 @@ copy breaks the other". """ +from pathlib import PurePosixPath, PureWindowsPath + import pytest +from meshbay_common.paths import fold from meshbay_common.protocol import IndexEntry from meshbay_node.roots import ( SAFE_UPLOAD_NAME, RootError, RootSet, _free_name, + distinct_name, entry_abs_path, safe_subdir, ) @@ -51,6 +55,18 @@ def test_two_roots_cannot_share_a_name(tmp_path): _spec(tmp_path / "b" / "Films")]) +def test_a_distinct_name_says_where_the_folder_is(): + taken = {fold("Archives")} + assert distinct_name(PureWindowsPath(r"H:\Archives"), taken) == "Archives (H)" + assert distinct_name(PurePosixPath("/mnt/b/Films"), {fold("Films")}) == "Films (b)" + assert distinct_name(PurePosixPath("/mnt/b/Films"), set()) == "Films" + + +def test_a_distinct_name_counts_when_where_is_taken_too(): + taken = {fold("Films"), fold("Films (b)")} + assert distinct_name(PurePosixPath("/mnt/b/Films"), taken) == "Films (2)" + + def test_names_clash_without_regard_to_case(tmp_path): """ `Films` and `films` are one directory on NTFS and exFAT, which is where most -- cgit v1.2.3