Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/brain/doctor.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ def _check_duplicates(master: Path, org: Org, rules: tuple[SpaceRule, ...],
# siblings under one parent still are.
all_paths = set(rels)
by_stem_all: dict[str, str] = {}
for r in rels:
for r in sorted(rels): # string order, as the indexer resolves duplicate stems
by_stem_all.setdefault(_stem(r), r)
up_of: dict[str, set[str]] = {}
for r in rels:
Expand Down Expand Up @@ -831,7 +831,7 @@ def _check_cross_space_refs(master: Path, org: Org, rules: tuple[SpaceRule, ...]
rels = run.content_files()
paths = set(rels)
by_stem: dict[str, str] = {}
for rel in rels:
for rel in sorted(rels): # string order, as the indexer resolves duplicate stems
by_stem.setdefault(_stem(rel), rel)

readers_of = run.readers_of(org, rules)
Expand Down
17 changes: 17 additions & 0 deletions tests/test_doctor.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,23 @@ def test_cross_space_reference_warns_and_same_space_is_silent(master):
assert "bob" in home[0].message # the reader who cannot see it


def test_cross_refs_resolve_duplicate_stems_like_the_indexer(master):
seed_meta(master)
# "Clients/a-b/Dup.md" sorts before "Clients/a/Dup.md" as a string ('-' < '/'),
# which is the order the indexer resolves a bare [[Dup]] in. Doctor must pick
# the same note: the public one, so the link leaks nothing.
(master / "_meta/spaces.yaml").write_text(
SPACES_YAML
+ ' - {path: "Clients/a", read: ["person:alice"], write: ["person:alice"]}\n'
+ ' - {path: "Clients/a-b", read: [everyone], write: ["person:alice"]}\n')
for rel in ("Clients/a/Dup.md", "Clients/a-b/Dup.md"):
(master / rel).parent.mkdir(parents=True, exist_ok=True)
(master / rel).write_text("# Dup\nbody.\n")
(master / "Company/Pointer.md").write_text("# Pointer\nSee [[Dup]].\n")
findings = [f for f in run_doctor(master) if f.check == "cross-refs"]
assert not [f for f in findings if f.message.startswith("Company/Pointer.md")]


def _restrict_vandenberg(master):
"""Add a Vandenberg client space readable only by alice."""
(master / "_meta/spaces.yaml").write_text(
Expand Down
Loading