fix: address atlas review followups

rosuH · rosuH · commit 7a2f1c3c4ccd · 2026-05-10T23:13:17.000+08:00
diff --git a/scripts/build_atlas_route.py b/scripts/build_atlas_route.py
@@ -5,6 +5,7 @@
 import argparse
 import html
 import json
+import os
 import re
 import shutil
 from pathlib import Path
@@ -136,10 +137,27 @@ def _image_for_audio(audio_path: Path) -> Path | None:
     return images[0] if images else None
 
 
+def _is_excluded_dir_name(name: str) -> bool:
+    return name.startswith(".") or name in EXCLUDED_DIRS
+
+
+def _iter_audio_paths(root: Path):
+    audio_paths: list[Path] = []
+    for current_dir, dirnames, filenames in os.walk(root):
+        dirnames[:] = sorted(name for name in dirnames if not _is_excluded_dir_name(name))
+        for filename in sorted(filenames):
+            if filename.startswith("."):
+                continue
+            audio_path = Path(current_dir) / filename
+            if audio_path.is_file() and audio_path.suffix.lower() in AUDIO_SUFFIXES:
+                audio_paths.append(audio_path)
+    yield from sorted(audio_paths)
+
+
 def discover_media(root: Path) -> list[dict[str, str]]:
     root = root.resolve()
     media: list[dict[str, str]] = []
-    for audio_path in sorted(path for path in root.rglob("*") if path.is_file() and path.suffix.lower() in AUDIO_SUFFIXES):
+    for audio_path in _iter_audio_paths(root):
         relative_audio = audio_path.relative_to(root)
         if not _is_sound_library_path(relative_audio):
             continue
diff --git a/scripts/serve_atlas.py b/scripts/serve_atlas.py
@@ -25,6 +25,15 @@ class QuietAtlasServer(http.server.ThreadingHTTPServer):
     allow_reuse_address = True
 
 
+def preview_entry_path(directory: Path) -> str:
+    directory = directory.resolve()
+    if (directory / "atlas" / "index.html").exists():
+        return "/atlas/"
+    if (directory / "index.html").exists():
+        return "/"
+    return "/"
+
+
 def main() -> None:
     parser = argparse.ArgumentParser(description="Serve the Yellowstone atlas locally.")
     parser.add_argument("port", nargs="?", type=int, default=4173)
@@ -36,10 +45,11 @@ def main() -> None:
     )
     args = parser.parse_args()
 
-    handler = functools.partial(QuietAtlasHandler, directory=str(args.directory))
+    directory = args.directory.resolve()
+    handler = functools.partial(QuietAtlasHandler, directory=str(directory))
     server = QuietAtlasServer(("", args.port), handler)
 
-    print(f"Serving atlas preview at http://localhost:{args.port}/atlas/")
+    print(f"Serving atlas preview from {directory} at http://localhost:{args.port}{preview_entry_path(directory)}")
     try:
         server.serve_forever()
     except KeyboardInterrupt:
diff --git a/tests/test_atlas_preview_server.py b/tests/test_atlas_preview_server.py
@@ -1,7 +1,10 @@
 """Checks for the local atlas preview helper."""
 
+import sys
 from pathlib import Path
 
+from scripts import serve_atlas
+
 ROOT = Path(__file__).resolve().parents[1]
 SERVER_PATH = ROOT / "scripts" / "serve_atlas.py"
 MAKEFILE_PATH = ROOT / "Makefile"
@@ -25,6 +28,51 @@ def test_preview_server_enables_address_reuse_before_binding():
     assert "server.allow_reuse_address = True" not in script
 
 
+def test_preview_server_reports_root_url_when_serving_atlas_directory(tmp_path, monkeypatch, capsys):
+    atlas_dir = tmp_path / "atlas"
+    atlas_dir.mkdir()
+    (atlas_dir / "index.html").write_text("<!doctype html>", encoding="utf-8")
+
+    class FakeServer:
+        def __init__(self, address, handler):
+            self.address = address
+            self.handler = handler
+
+        def serve_forever(self):
+            raise KeyboardInterrupt
+
+    monkeypatch.setattr(serve_atlas, "QuietAtlasServer", FakeServer)
+    monkeypatch.setattr(sys, "argv", ["serve_atlas.py", "4321", "--directory", str(atlas_dir)])
+
+    serve_atlas.main()
+
+    output = capsys.readouterr().out
+    assert f"Serving atlas preview from {atlas_dir.resolve()} at http://localhost:4321/" in output
+    assert "http://localhost:4321/atlas/" not in output
+
+
+def test_preview_server_reports_atlas_url_when_serving_repo_root(tmp_path, monkeypatch, capsys):
+    atlas_dir = tmp_path / "atlas"
+    atlas_dir.mkdir()
+    (atlas_dir / "index.html").write_text("<!doctype html>", encoding="utf-8")
+
+    class FakeServer:
+        def __init__(self, address, handler):
+            self.address = address
+            self.handler = handler
+
+        def serve_forever(self):
+            raise KeyboardInterrupt
+
+    monkeypatch.setattr(serve_atlas, "QuietAtlasServer", FakeServer)
+    monkeypatch.setattr(sys, "argv", ["serve_atlas.py", "4321", "--directory", str(tmp_path)])
+
+    serve_atlas.main()
+
+    output = capsys.readouterr().out
+    assert f"Serving atlas preview from {tmp_path.resolve()} at http://localhost:4321/atlas/" in output
+
+
 def test_makefile_exposes_atlas_preview_target():
     makefile = MAKEFILE_PATH.read_text(encoding="utf-8")
 
diff --git a/tests/test_atlas_route_builder.py b/tests/test_atlas_route_builder.py
@@ -30,6 +30,24 @@ def test_discover_media_pairs_audio_with_same_folder_image_and_ignores_site_file
     assert media[0]["title"] == "American Coots"
 
 
+def test_discover_media_prunes_hidden_and_excluded_directories_before_walk(tmp_path, monkeypatch):
+    (tmp_path / "American Coots").mkdir()
+    (tmp_path / "American Coots" / "American Coots.mp3").write_bytes(b"audio")
+    (tmp_path / ".git" / "objects").mkdir(parents=True)
+    (tmp_path / ".git" / "objects" / "ignored.mp3").write_bytes(b"not sound library media")
+    (tmp_path / "atlas").mkdir()
+    (tmp_path / "atlas" / "ignored.mp3").write_bytes(b"not sound library media")
+
+    def fail_rglob(self, pattern):
+        raise AssertionError("discover_media should prune excluded directories before walking")
+
+    monkeypatch.setattr(Path, "rglob", fail_rglob)
+
+    media = discover_media(tmp_path)
+
+    assert [entry["audioPath"] for entry in media] == ["American Coots/American Coots.mp3"]
+
+
 def test_merge_route_preserves_curated_stops_and_appends_publishable_entries(tmp_path):
     existing_route = [
         {
