brut/bincio-activity
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

second pass. low

Browse Source
This commit is contained in:
Davide Scaini
2026-04-01 19:00:28 +02:00
parent 3d364c3992
commit bd5831c2fd
11 changed files with 277 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_merge.py
+19 -19
View File
@@ -55,7 +55,7 @@ def test_parse_sidecar_frontmatter_only(tmp_path):
# ── apply_sidecar ─────────────────────────────────────────────────────────────
BASE_DETAIL = {
"id": "2024-01-01T08:00:00Z_cycling",
"id": "2024-01-01T080000Z-morning-ride",
"title": "Morning Ride",
"sport": "cycling",
"started_at": "2024-01-01T08:00:00Z",
@@ -118,21 +118,21 @@ def data_dir(tmp_path):
acts = tmp_path / "activities"
acts.mkdir()
# Two activities
for act_id, title in [
("2024-01-01T08:00:00Z_cycling", "Morning Ride"),
("2024-01-02T09:00:00Z_running", "Easy Run"),
for act_id, title, sport, started_at in [
("2024-01-01T080000Z-morning-ride", "Morning Ride", "cycling", "2024-01-01T08:00:00Z"),
("2024-01-02T090000Z-easy-run", "Easy Run", "running", "2024-01-02T09:00:00Z"),
]:
detail = {
"id": act_id, "title": title, "sport": act_id.split("_")[1],
"started_at": act_id.split("_")[0],
"id": act_id, "title": title, "sport": sport,
"started_at": started_at,
"description": "", "privacy": "public", "custom": {},
}
(acts / f"{act_id}.json").write_text(json.dumps(detail))
# Index
index = {"activities": [
{"id": "2024-01-01T08:00:00Z_cycling", "title": "Morning Ride",
{"id": "2024-01-01T080000Z-morning-ride", "title": "Morning Ride",
"sport": "cycling", "started_at": "2024-01-01T08:00:00Z", "privacy": "public", "custom": {}},
{"id": "2024-01-02T09:00:00Z_running", "title": "Easy Run",
{"id": "2024-01-02T090000Z-easy-run", "title": "Easy Run",
"sport": "running", "started_at": "2024-01-02T09:00:00Z", "privacy": "public", "custom": {}},
]}
(tmp_path / "index.json").write_text(json.dumps(index))
@@ -145,20 +145,20 @@ def test_merge_all_no_sidecars(data_dir):
merged = data_dir / "_merged"
assert merged.exists()
# Unmodified files are symlinked
detail_link = merged / "activities" / "2024-01-01T08:00:00Z_cycling.json"
detail_link = merged / "activities" / "2024-01-01T080000Z-morning-ride.json"
assert detail_link.is_symlink()
def test_merge_all_applies_sidecar(data_dir):
edits = data_dir / "edits"
edits.mkdir()
(edits / "2024-01-01T08:00:00Z_cycling.md").write_text(
(edits / "2024-01-01T080000Z-morning-ride.md").write_text(
"---\ntitle: Epic Ride\nhighlight: true\n---\n\nWhat a day!"
)
n = merge_all(data_dir)
assert n == 1
merged_json = data_dir / "_merged" / "activities" / "2024-01-01T08:00:00Z_cycling.json"
merged_json = data_dir / "_merged" / "activities" / "2024-01-01T080000Z-morning-ride.json"
assert not merged_json.is_symlink()
data = json.loads(merged_json.read_text())
assert data["title"] == "Epic Ride"
@@ -166,41 +166,41 @@ def test_merge_all_applies_sidecar(data_dir):
assert data["description"] == "What a day!"
# Untouched activity is still a symlink
run_link = data_dir / "_merged" / "activities" / "2024-01-02T09:00:00Z_running.json"
run_link = data_dir / "_merged" / "activities" / "2024-01-02T090000Z-easy-run.json"
assert run_link.is_symlink()
def test_merge_all_private_filtered_from_index(data_dir):
edits = data_dir / "edits"
edits.mkdir()
(edits / "2024-01-01T08:00:00Z_cycling.md").write_text("---\nprivate: true\n---\n")
(edits / "2024-01-01T080000Z-morning-ride.md").write_text("---\nprivate: true\n---\n")
merge_all(data_dir)
index = json.loads((data_dir / "_merged" / "index.json").read_text())
ids = [a["id"] for a in index["activities"]]
assert "2024-01-01T08:00:00Z_cycling" not in ids
assert "2024-01-02T09:00:00Z_running" in ids
assert "2024-01-01T080000Z-morning-ride" not in ids
assert "2024-01-02T090000Z-easy-run" in ids
def test_merge_all_highlight_sorts_first(data_dir):
edits = data_dir / "edits"
edits.mkdir()
# Highlight the older activity — it should appear first
(edits / "2024-01-01T08:00:00Z_cycling.md").write_text("---\nhighlight: true\n---\n")
(edits / "2024-01-01T080000Z-morning-ride.md").write_text("---\nhighlight: true\n---\n")
merge_all(data_dir)
index = json.loads((data_dir / "_merged" / "index.json").read_text())
ids = [a["id"] for a in index["activities"]]
assert ids[0] == "2024-01-01T08:00:00Z_cycling"
assert ids[0] == "2024-01-01T080000Z-morning-ride"
def test_merge_all_idempotent(data_dir):
edits = data_dir / "edits"
edits.mkdir()
(edits / "2024-01-01T08:00:00Z_cycling.md").write_text("---\ntitle: Renamed\n---\n")
(edits / "2024-01-01T080000Z-morning-ride.md").write_text("---\ntitle: Renamed\n---\n")
merge_all(data_dir)
merge_all(data_dir) # second run should not error or double-apply
data = json.loads(
(data_dir / "_merged" / "activities" / "2024-01-01T08:00:00Z_cycling.json").read_text()
(data_dir / "_merged" / "activities" / "2024-01-01T080000Z-morning-ride.json").read_text()
)
assert data["title"] == "Renamed"