A record's metric heads the page, above the tabs, under its discipline's mark

The node page's identity header, for a record: one line above the strip carrying the
discipline's own mark (the one its board heading wears) and the score in the
discipline's unit, which is the one thing the record is — the title bar already names
the discipline and the standing. The score lane that repeated it on Info is gone, and
the metric's spelling is one function, record_score, shared with the board's score
lane so a partial Longest-distance walk reads ≥ in both.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Jean-Pierre MartineauandClaude Fable 5.1 committed 2026-09-12 13:22:45 -04:00
1 parent aae3d3f0fe
commit 6e84c7fe54
2 files changed
+65 -19

No files matched your search

+37 -18
View File
@@ -150,6 +150,18 @@ def discipline_lane() -> int:
return max(cell_len(glyph(category.icon)) for category in CATEGORIES)
def record_score(category: Category, record: DiscoveredPath) -> str:
"""A record's score in its discipline's unit, bounded where the walk was partial.
THE spelling of the metric wherever it is written — the board's score lane and the
record page's header — so a partial Longest-distance walk reads ``≥`` in both.
"""
score = category.format_score(record.score)
if category.id == "long_haul" and not record.stats.get("km_complete", True):
score = "≥ " + score
return score
def _drawn_rows(lines: list[str]) -> list[str]:
"""``lines`` with the rows nothing actually landed on stripped from either end.
@@ -204,7 +216,9 @@ class RecordScreen(Screen):
reads *back*. It used to float as a 62-column card, which read as a question over the
list rather than as the page it is.
A **tabbed stage**, organized like the node page (:func:`~meshterm.ui.widgets.tab_strip`,
Organized like the node page: a one-line **header** above the strip — the discipline's
mark and the record's metric, the score in the discipline's unit — then a **tabbed
stage** (:func:`~meshterm.ui.widgets.tab_strip`,
``Tab``/``Shift+Tab`` to switch): **Info** is the record's stats with the page's
action rows at its foot; **Route** is the walk two ways — THE route graph over the
route line — with *Trace this path* under it, so Enter there walks the route on show;
@@ -388,6 +402,20 @@ class RecordScreen(Screen):
"""Keep the selected action visible while arrowing; scroll free once paging."""
return self._cursor if self._follow else None
def _header(self) -> Text:
"""The one-line identity above the strip: the discipline's mark, then the metric.
The record page's counterpart to the node page's identity header. The mark is the
discipline's own (the same one its board heading wears), the metric is the score in
the discipline's unit (:func:`record_score`), and that is the whole line: the
title bar already names the discipline and the standing, so the header spends its
cells on the one thing the record *is* — its number.
"""
line = Text(glyph(self._category.icon))
line.append(" ")
line.append(record_score(self._category, self._record), style="accent bold")
return line
@staticmethod
def _label(label: str) -> Text:
"""The card's muted label lane, padded to :data:`_LABEL_W` cells."""
@@ -455,14 +483,10 @@ class RecordScreen(Screen):
longest-leg lane the link it spanned; a record set before a stat existed simply has
no lane for it.
"""
record, category = self._record, self._category
record = self._record
stats = record.stats
lanes: list[Text] = []
score = category.format_score(record.score)
if category.id == "long_haul" and not stats.get("km_complete", True):
score = "≥ " + score
lanes.append(self._lane("score", Text(score, style="accent bold")))
# No score lane: the metric is the page's header, above the strip (see _header).
if self._reliability is not None:
rate, ok, total = self._reliability
@@ -607,8 +631,10 @@ class RecordScreen(Screen):
for the drawing, the rows), so it is composed once and cached; only the
cursor-bearing action rows re-render per repaint.
"""
# The pinned chrome every tab opens under: the strip in its air (see widgets.tab_air).
lines: list[str] = [""] * tab_air()
# The pinned chrome every tab opens under: the metric line, then the strip in its
# air (see widgets.tab_air) — the node page's identity header and strip.
lines: list[str] = [render_to_ansi(self._header(), width, no_wrap=True)]
lines.extend([""] * tab_air())
lines.extend(render_lines(tab_strip(self._tabs, self._tab_index, width), width))
lines.extend([""] * tab_air())
if self._tab == _TAB_AREA:
@@ -877,13 +903,6 @@ async def open_records(ctx: AppContext) -> dict:
rows.append(Separator(f" {line}", style="muted"))
return rows
def scored(category: Category, record: DiscoveredPath) -> str:
"""A record's score in its discipline's unit, bounded where the walk was partial."""
score = category.format_score(record.score)
if category.id == "long_haul" and not record.stats.get("km_complete", True):
score = "≥ " + score
return score
def browser_lanes(
rank: int,
category: Category,
@@ -904,7 +923,7 @@ async def open_records(ctx: AppContext) -> dict:
row = Text(f"#{rank} ", style="muted")
row.append(record.discovered_at.astimezone().strftime("%b %d"), style="muted")
row.append(" ")
row.append(fit_cells(scored(category, record), score_w), style="accent")
row.append(fit_cells(record_score(category, record), score_w), style="accent")
if show_width:
row.append(f" {record.width_bytes} B", style="muted")
row.append(" ")
@@ -995,7 +1014,7 @@ async def open_records(ctx: AppContext) -> dict:
# The score lane is this board's own widest score — "3 nodes" and "+6.0 dB"
# measure differently, and a lane sized for the worst case everywhere would
# spend the difference on padding in front of every route.
score_w = max((cell_len(scored(category, r)) for r in board), default=0)
score_w = max((cell_len(record_score(category, r)) for r in board), default=0)
for rank, record in enumerate(board, start=1):
lanes = browser_lanes(
rank,
+28 -1
View File
@@ -333,13 +333,40 @@ def test_record_opens_on_info_with_route_and_area_tabs_beside_it() -> None:
assert "Info" in strip and "Route" in strip and "Area" in strip, "all three boxed"
body = [line for line in lines[_strip_end(lines) :] if line]
assert body[0].startswith("spec") and body[1].startswith("recorded") # identity first
assert body[2].startswith("score")
assert body[2].startswith("walk") # the score is the header, not a lane
assert "Trace this path" in "\n".join(body) and "Delete record" in "\n".join(body)
assert not any(_is_braille(ch) for line in body for ch in line), "no drawing here"
assert "Hilltop-Repeater" not in "\n".join(body), "the route has a tab of its own"
assert "Far" in "\n".join(body) # the far-point name is a stat, not a drawing label
def test_record_header_is_the_disciplines_mark_and_the_metric_above_the_strip() -> None:
"""One line above the tabs: the discipline's own mark, then the score in its unit.
The node page's identity header, for a record: the title bar names the discipline
and the standing, so the header spends its cells on the number the record *is* —
and the score lane that used to repeat it on Info is gone.
"""
from meshterm.ui.theme import glyph
screen = _dialog(_record(), shape=_loop_shape())
lines = _plain(screen.render_body(58)).splitlines()
mark = glyph(CATEGORY_BY_ID["grand_tour"].icon)
assert lines[0] == f"{mark} 2 nodes" # the very first row, before the strip's air
assert "score" not in _plain(screen.render_body(58))
for _ in range(3): # the header stays put whichever tab is up
screen.handle("tab")
assert _plain(screen.render_body(58)).splitlines()[0] == f"{mark} 2 nodes"
partial = _record(
category="long_haul",
score=8.4,
stats={"km_travelled": 8.4, "km_complete": False, "hop_count": 3, "distinct_nodes": 3},
)
head = _plain(_dialog(partial).render_body(58)).splitlines()[0]
assert head.endswith("≥ 8.4 km") # the board's bounded spelling, and no other
def test_record_route_tab_draws_the_walk_and_enter_traces_it() -> None:
"""The Route tab: the graph over the route line, with Trace this path as its one row.