feat: gear registry — manage bikes/shoes per athlete, set per activity
- New /api/gear CRUD endpoints (gear.json per user) - Gear tab in AthleteView (owner-only): add, edit, retire items - EditDrawer gear field becomes a dropdown when registry has items - Strava API sync now resolves gear_id → name, adds to registry automatically - Strava ZIP import reads Gear column from activities.csv - POST /api/strava/import-gear for one-time backfill from stored originals
This commit is contained in:
Davide Scaini
@@ -0,0 +1,134 @@
|
||||
"""Gear registry endpoints (/api/gear)."""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import uuid
|
||||
from pathlib import Path
|
||||
|
||||
from fastapi import APIRouter, Cookie, HTTPException, Request
|
||||
from fastapi.responses import JSONResponse
|
||||
|
||||
from bincio.serve import deps
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
_GEAR_TYPES = {"bike", "shoes", "skis", "other"}
|
||||
|
||||
|
||||
def _gear_path(user_dir: Path) -> Path:
|
||||
return user_dir / "gear.json"
|
||||
|
||||
|
||||
def _load(user_dir: Path) -> list[dict]:
|
||||
p = _gear_path(user_dir)
|
||||
if not p.exists():
|
||||
return []
|
||||
try:
|
||||
data = json.loads(p.read_text(encoding="utf-8"))
|
||||
return data.get("items", [])
|
||||
except (OSError, json.JSONDecodeError):
|
||||
return []
|
||||
|
||||
|
||||
def _save(user_dir: Path, items: list[dict]) -> None:
|
||||
_gear_path(user_dir).write_text(
|
||||
json.dumps({"items": items}, indent=2, ensure_ascii=False),
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/api/gear")
|
||||
async def gear_list(bincio_session: str | None = Cookie(default=None)) -> JSONResponse:
|
||||
user = deps._require_user(bincio_session)
|
||||
items = _load(deps._get_data_dir() / user.handle)
|
||||
return JSONResponse({"items": items})
|
||||
|
||||
|
||||
@router.post("/api/gear")
|
||||
async def gear_add(
|
||||
request: Request,
|
||||
bincio_session: str | None = Cookie(default=None),
|
||||
) -> JSONResponse:
|
||||
user = deps._require_user(bincio_session)
|
||||
body = await request.json()
|
||||
name = str(body.get("name", "")).strip()
|
||||
if not name:
|
||||
raise HTTPException(400, "name is required")
|
||||
gear_type = str(body.get("type", "other")).strip()
|
||||
if gear_type not in _GEAR_TYPES:
|
||||
raise HTTPException(400, f"type must be one of: {', '.join(sorted(_GEAR_TYPES))}")
|
||||
strava_id = str(body.get("strava_id", "")).strip() or None
|
||||
|
||||
user_dir = deps._get_data_dir() / user.handle
|
||||
items = _load(user_dir)
|
||||
|
||||
# Deduplicate by strava_id if provided
|
||||
if strava_id and any(i.get("strava_id") == strava_id for i in items):
|
||||
existing = next(i for i in items if i.get("strava_id") == strava_id)
|
||||
return JSONResponse({"ok": True, "item": existing, "created": False})
|
||||
|
||||
item: dict = {
|
||||
"id": str(uuid.uuid4()),
|
||||
"name": name,
|
||||
"type": gear_type,
|
||||
"retired": False,
|
||||
}
|
||||
if strava_id:
|
||||
item["strava_id"] = strava_id
|
||||
|
||||
items.append(item)
|
||||
_save(user_dir, items)
|
||||
return JSONResponse({"ok": True, "item": item, "created": True}, status_code=201)
|
||||
|
||||
|
||||
@router.patch("/api/gear/{item_id}")
|
||||
async def gear_update(
|
||||
item_id: str,
|
||||
request: Request,
|
||||
bincio_session: str | None = Cookie(default=None),
|
||||
) -> JSONResponse:
|
||||
user = deps._require_user(bincio_session)
|
||||
user_dir = deps._get_data_dir() / user.handle
|
||||
items = _load(user_dir)
|
||||
|
||||
idx = next((i for i, g in enumerate(items) if g["id"] == item_id), None)
|
||||
if idx is None:
|
||||
raise HTTPException(404, "Gear item not found")
|
||||
|
||||
body = await request.json()
|
||||
item = dict(items[idx])
|
||||
|
||||
if "name" in body:
|
||||
name = str(body["name"]).strip()
|
||||
if not name:
|
||||
raise HTTPException(400, "name cannot be empty")
|
||||
item["name"] = name
|
||||
if "type" in body:
|
||||
gear_type = str(body["type"]).strip()
|
||||
if gear_type not in _GEAR_TYPES:
|
||||
raise HTTPException(400, f"type must be one of: {', '.join(sorted(_GEAR_TYPES))}")
|
||||
item["type"] = gear_type
|
||||
if "retired" in body:
|
||||
item["retired"] = bool(body["retired"])
|
||||
|
||||
items[idx] = item
|
||||
_save(user_dir, items)
|
||||
return JSONResponse({"ok": True, "item": item})
|
||||
|
||||
|
||||
@router.delete("/api/gear/{item_id}")
|
||||
async def gear_delete(
|
||||
item_id: str,
|
||||
bincio_session: str | None = Cookie(default=None),
|
||||
) -> JSONResponse:
|
||||
user = deps._require_user(bincio_session)
|
||||
user_dir = deps._get_data_dir() / user.handle
|
||||
items = _load(user_dir)
|
||||
|
||||
before = len(items)
|
||||
items = [g for g in items if g["id"] != item_id]
|
||||
if len(items) == before:
|
||||
raise HTTPException(404, "Gear item not found")
|
||||
|
||||
_save(user_dir, items)
|
||||
return JSONResponse({"ok": True})
|
||||
@@ -171,6 +171,105 @@ async def serve_strava_sync_stream(bincio_session: Optional[str] = Cookie(defaul
|
||||
)
|
||||
|
||||
|
||||
@router.post("/api/strava/import-gear")
|
||||
async def serve_strava_import_gear(bincio_session: Optional[str] = Cookie(default=None)) -> JSONResponse:
|
||||
"""One-time backfill: scan stored Strava originals for gear_ids, fetch names, populate gear registry."""
|
||||
user = deps._require_user(bincio_session)
|
||||
cid, csec = deps._strava_creds(user.handle)
|
||||
if not cid or not csec:
|
||||
raise HTTPException(400, "Strava not configured on this server")
|
||||
dd = deps._get_data_dir() / user.handle
|
||||
originals_dir = dd / "originals" / "strava"
|
||||
if not originals_dir.exists():
|
||||
return JSONResponse({"ok": True, "gear_added": 0, "activities_updated": 0, "message": "No stored originals found"})
|
||||
|
||||
import contextlib
|
||||
import uuid
|
||||
|
||||
from bincio.extract.strava_api import StravaError, ensure_fresh, fetch_gear
|
||||
from bincio.render.merge import merge_one
|
||||
from bincio.serve.routers.gear import _load as _gear_load, _save as _gear_save
|
||||
|
||||
try:
|
||||
token = ensure_fresh(dd, cid, csec)
|
||||
except StravaError as e:
|
||||
raise HTTPException(502, str(e))
|
||||
|
||||
registry = _gear_load(dd)
|
||||
known_strava_ids = {g.get("strava_id") for g in registry if g.get("strava_id")}
|
||||
|
||||
# Collect all unique gear_ids from originals
|
||||
gear_id_to_activities: dict[str, list[str]] = {}
|
||||
for orig_path in originals_dir.glob("*.json"):
|
||||
try:
|
||||
data = json.loads(orig_path.read_text(encoding="utf-8"))
|
||||
gear_id = (data.get("meta") or {}).get("gear_id") or ""
|
||||
if gear_id:
|
||||
gear_id_to_activities.setdefault(gear_id, []).append(orig_path.stem)
|
||||
except (OSError, json.JSONDecodeError):
|
||||
continue
|
||||
|
||||
gear_added = 0
|
||||
activities_updated = 0
|
||||
|
||||
for gear_id, activity_ids in gear_id_to_activities.items():
|
||||
if gear_id in known_strava_ids:
|
||||
gear_name = next(g["name"] for g in registry if g.get("strava_id") == gear_id)
|
||||
else:
|
||||
details = fetch_gear(token["access_token"], gear_id)
|
||||
gear_name = details.get("name") or ""
|
||||
if not gear_name:
|
||||
continue
|
||||
gear_type = "shoes" if details.get("primary_type") == "B" else "bike"
|
||||
new_item: dict = {"id": str(uuid.uuid4()), "name": gear_name, "type": gear_type, "retired": False, "strava_id": gear_id}
|
||||
registry.append(new_item)
|
||||
known_strava_ids.add(gear_id)
|
||||
gear_added += 1
|
||||
|
||||
# Backfill: write sidecar for each activity that has no gear set yet
|
||||
import yaml as _yaml
|
||||
edits_dir = dd / "edits"
|
||||
edits_dir.mkdir(exist_ok=True)
|
||||
for activity_id in activity_ids:
|
||||
activity_json = dd / "activities" / f"{activity_id}.json"
|
||||
if not activity_json.exists():
|
||||
continue
|
||||
try:
|
||||
act = json.loads(activity_json.read_text(encoding="utf-8"))
|
||||
if act.get("gear"):
|
||||
continue # already has gear
|
||||
except (OSError, json.JSONDecodeError):
|
||||
continue
|
||||
sidecar = edits_dir / f"{activity_id}.md"
|
||||
fm: dict = {}
|
||||
body = ""
|
||||
if sidecar.exists():
|
||||
try:
|
||||
text = sidecar.read_text(encoding="utf-8")
|
||||
import re as _re
|
||||
parts = _re.split(r"^---[ \t]*$", text, maxsplit=2, flags=_re.MULTILINE)
|
||||
if len(parts) >= 3:
|
||||
fm = _yaml.safe_load(parts[1]) or {}
|
||||
body = parts[2].strip()
|
||||
except Exception:
|
||||
pass
|
||||
if fm.get("gear"):
|
||||
continue # sidecar already sets gear
|
||||
fm["gear"] = gear_name
|
||||
fm_text = _yaml.safe_dump(fm, default_flow_style=False, allow_unicode=True).strip()
|
||||
content = f"---\n{fm_text}\n---\n"
|
||||
if body:
|
||||
content += f"\n{body}\n"
|
||||
sidecar.write_text(content, encoding="utf-8")
|
||||
with contextlib.suppress(Exception):
|
||||
merge_one(dd, activity_id)
|
||||
activities_updated += 1
|
||||
|
||||
_gear_save(dd, registry)
|
||||
tasks._trigger_rebuild(user.handle)
|
||||
return JSONResponse({"ok": True, "gear_added": gear_added, "activities_updated": activities_updated})
|
||||
|
||||
|
||||
@router.post("/api/strava/sync")
|
||||
async def serve_strava_sync(bincio_session: Optional[str] = Cookie(default=None)) -> JSONResponse:
|
||||
user = deps._require_user(bincio_session)
|
||||
|
||||
@@ -23,6 +23,7 @@ from bincio.serve.routers import (
|
||||
download,
|
||||
feed,
|
||||
garmin,
|
||||
gear,
|
||||
ideas,
|
||||
me,
|
||||
ogimage,
|
||||
@@ -69,5 +70,6 @@ for _router in [
|
||||
garmin.router,
|
||||
ideas.router,
|
||||
ogimage.router,
|
||||
gear.router,
|
||||
]:
|
||||
app.include_router(_router)
|
||||
|
||||
Reference in New Issue
Block a user