Skip to content

198-Bug improve match history to show pending matchups instead of hiding TBD slots #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RemainingDelta merged 3 commits into from
Jun 15, 2026
Merged

198-Bug improve match history to show pending matchups instead of hiding TBD slots #315

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1eddbe
198-Bug improve match history to show pending matchups instead of hid…
RemainingDelta Jun 14, 2026
962dd5b
198-Bug fix entrantSources lookup using entrantId matching instead of…
RemainingDelta Jun 14, 2026
e1aa714
198-Bug update TBD slot display with source match score and teams
RemainingDelta Jun 14, 2026
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
159 changes: 154 additions & 5 deletions features/tourney/matcherino.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def get_team_info(entrant_dict):
if not entrant_dict:
return {"name": "TBD", "score": 0, "players": []}
e_id = entrant_dict.get("entrantId", 0)
score = entrant_dict.get("score", 0)
score = entrant_dict.get("score") or 0
info = entrant_map.get(e_id, {"name": "TBD", "players": []})
return {"name": info["name"], "score": score, "players": info["players"]}

Expand All @@ -291,6 +291,72 @@ def get_team_info(entrant_dict):
m["visualNum"] = i
visual_match_map[i] = m

raw_to_visual = {
m.get("matchNum"): v_num for v_num, m in visual_match_map.items()
}

def find_src(my_entrant, other_entrant, srcs, fallback_idx=0):
"""Return the entrantSources entry for my_entrant by matching entrantId."""
my_id = (my_entrant or {}).get("entrantId", 0)
other_id = (other_entrant or {}).get("entrantId", 0)
if my_id != 0:
found = next((s for s in srcs if s.get("entrantId") == my_id), None)
if found:
return found
if other_id != 0:
found = next((s for s in srcs if s.get("entrantId") != other_id), None)
if found:
return found
return srcs[fallback_idx] if len(srcs) > fallback_idx else None

def resolve_name(entrant_dict, source_entry, depth=0):
name = get_team_info(entrant_dict)["name"]
if name not in ("TBD", "BYE"):
return name
if not source_entry or depth > 1:
return "TBD"
raw_src = source_entry.get("matchNum")
v_src = raw_to_visual.get(raw_src, raw_src)
src = visual_match_map.get(v_src)
if not src:
return f"Waiting on Match #{v_src}"
srcs = src.get("entrantSources") or []
src_ea = find_src(src.get("entrantA"), src.get("entrantB"), srcs, 0)
src_eb = find_src(src.get("entrantB"), src.get("entrantA"), srcs, 1)
a = resolve_name(src.get("entrantA"), src_ea, depth + 1)
b = resolve_name(src.get("entrantB"), src_eb, depth + 1)
if "Waiting on" not in a and "Waiting on" not in b:
a_score = src.get("entrantA", {}).get("score") or 0
b_score = src.get("entrantB", {}).get("score") or 0
return f"Waiting on Match #{v_src} ({a} {a_score} - {b_score} {b})"
return f"Waiting on Match #{v_src} ({a} vs {b})"

def build_tbd_chain(source_entry):
if not source_entry:
return ["→ No source match information available"]
raw_src = source_entry.get("matchNum")
v_src = raw_to_visual.get(raw_src, raw_src)
src_match = visual_match_map.get(v_src)
if not src_match:
return [f"→ Waiting on Match #{v_src}"]
srcs = src_match.get("entrantSources") or []
src_ea = find_src(
src_match.get("entrantA"), src_match.get("entrantB"), srcs, 0
)
src_eb = find_src(
src_match.get("entrantB"), src_match.get("entrantA"), srcs, 1
)
a_name = resolve_name(src_match.get("entrantA"), src_ea, depth=1)
b_name = resolve_name(src_match.get("entrantB"), src_eb, depth=1)
if "Waiting on" not in a_name and "Waiting on" not in b_name:
a_score = src_match.get("entrantA", {}).get("score") or 0
b_score = src_match.get("entrantB", {}).get("score") or 0
return [f"→ Match #{v_src}: {a_name} {a_score} - {b_score} {b_name}"]
return [
f"→ Match #{v_src} [A]: {a_name}",
f"→ Match #{v_src} [B]: {b_name}",
]

current_match = visual_match_map.get(int(target_match_number))

if not current_match:
Expand All @@ -301,6 +367,41 @@ def get_team_info(entrant_dict):
team_a = get_team_info(current_match.get("entrantA"))
team_b = get_team_info(current_match.get("entrantB"))

sources = current_match.get("entrantSources") or []
team_a_is_tbd = team_a["name"] in ("TBD", "BYE")
team_b_is_tbd = team_b["name"] in ("TBD", "BYE")

def tbd_label(src_entry):
if not src_entry:
return "TBD"
raw = src_entry.get("matchNum")
v = raw_to_visual.get(raw, raw)
src_m = visual_match_map.get(v)
if not src_m:
return f"Waiting on Match #{v}"
srcs_m = src_m.get("entrantSources") or []
src_mea = find_src(src_m.get("entrantA"), src_m.get("entrantB"), srcs_m, 0)
src_meb = find_src(src_m.get("entrantB"), src_m.get("entrantA"), srcs_m, 1)
a_name = resolve_name(src_m.get("entrantA"), src_mea)
b_name = resolve_name(src_m.get("entrantB"), src_meb)
a_sc = src_m.get("entrantA", {}).get("score") or 0
b_sc = src_m.get("entrantB", {}).get("score") or 0
return f"Waiting on Match #{v} [{a_name} {a_sc} - {b_sc} {b_name}]"

if team_a_is_tbd:
src_a = find_src(
current_match.get("entrantA"), current_match.get("entrantB"), sources, 0
)
team_a["name"] = tbd_label(src_a)
team_a["score"] = None

if team_b_is_tbd:
src_b = find_src(
current_match.get("entrantB"), current_match.get("entrantA"), sources, 1
)
team_b["name"] = tbd_label(src_b)
team_b["score"] = None

match_status = current_match.get("status", "unknown")

# --- IMPROVED TIMING LOGIC ---
Expand Down Expand Up @@ -335,8 +436,30 @@ def get_team_info(entrant_dict):
except Exception:
pass

team_a_history = []
team_b_history = []
team_a_history = (
build_tbd_chain(
find_src(
current_match.get("entrantA"),
current_match.get("entrantB"),
sources,
0,
)
)
if team_a_is_tbd
else []
)
team_b_history = (
build_tbd_chain(
find_src(
current_match.get("entrantB"),
current_match.get("entrantA"),
sources,
1,
)
)
if team_b_is_tbd
else []
)

for v_num, match in visual_match_map.items():
if str(v_num) == str(target_match_number):
Expand All @@ -353,7 +476,20 @@ def get_team_info(entrant_dict):
is_pos_a = t_a_past["name"] == team_a["name"]
opp_name = t_b_past["name"] if is_pos_a else t_a_past["name"]

if opp_name.upper() not in ["BYE", "TBD"]:
if opp_name.upper() == "TBD":
h_srcs = match.get("entrantSources") or []
opp_dict = (
match.get("entrantB") if is_pos_a else match.get("entrantA")
)
my_dict = (
match.get("entrantA") if is_pos_a else match.get("entrantB")
)
opp_src = find_src(opp_dict, my_dict, h_srcs)
opp_label = resolve_name(opp_dict, opp_src)
team_a_history.append(
f"Match {v_num}: {team_a['name']} vs {opp_label}"
)
elif opp_name.upper() != "BYE":
t_score = t_a_past["score"] if is_pos_a else t_b_past["score"]
o_score = t_b_past["score"] if is_pos_a else t_a_past["score"]
team_a_history.append(
Expand All @@ -368,7 +504,20 @@ def get_team_info(entrant_dict):
is_pos_a = t_a_past["name"] == team_b["name"]
opp_name = t_b_past["name"] if is_pos_a else t_a_past["name"]

if opp_name.upper() not in ["BYE", "TBD"]:
if opp_name.upper() == "TBD":
h_srcs = match.get("entrantSources") or []
opp_dict = (
match.get("entrantB") if is_pos_a else match.get("entrantA")
)
my_dict = (
match.get("entrantA") if is_pos_a else match.get("entrantB")
)
opp_src = find_src(opp_dict, my_dict, h_srcs)
opp_label = resolve_name(opp_dict, opp_src)
team_b_history.append(
f"Match {v_num}: {team_b['name']} vs {opp_label}"
)
elif opp_name.upper() != "BYE":
t_score = t_a_past["score"] if is_pos_a else t_b_past["score"]
o_score = t_b_past["score"] if is_pos_a else t_a_past["score"]
team_b_history.append(
Expand Down
Loading