175 build - идентификатор для кнопки
This commit is contained in:
@@ -46,7 +46,24 @@ def _utcnow() -> datetime:
|
||||
return datetime.utcnow()
|
||||
|
||||
|
||||
TITLE_BUTTON_FIELDS = {
|
||||
"id": "ID нажатой кнопки", "label": "Название нажатой кнопки",
|
||||
"text": "Надпись в титре", "panel_id": "ID блока нажатой кнопки",
|
||||
"input": "Название Input нажатой кнопки",
|
||||
}
|
||||
PLAYER_PANEL_BUTTON_FIELDS = {
|
||||
"_preview_button_id": TITLE_BUTTON_FIELDS["id"],
|
||||
"_preview_button_label": TITLE_BUTTON_FIELDS["label"],
|
||||
"_preview_button_text": TITLE_BUTTON_FIELDS["text"],
|
||||
"_preview_input": TITLE_BUTTON_FIELDS["input"],
|
||||
}
|
||||
|
||||
|
||||
DEFAULT_CONTEXT_VARIABLES: tuple[dict[str, Any], ...] = (
|
||||
*({"key": f"title_button_{key}", "label": label, "category": "Титры · Нажатая кнопка",
|
||||
"scope": "match_shared", "source_type": "system", "value_type": "text",
|
||||
"description": "Последняя нажатая кнопка титра в текущем матче. Обновляется до Mapping и Preview."}
|
||||
for key, label in TITLE_BUTTON_FIELDS.items()),
|
||||
{"key": "game_id", "label": "Текущий матч", "category": "Система", "entity_type": "match", "scope": "match", "source_type": "system"},
|
||||
{"key": "tournament_id", "label": "Текущий турнир", "category": "Система", "entity_type": "tournament", "scope": "match", "source_type": "system"},
|
||||
{"key": "team1_id", "label": "Команда 1 / хозяева", "category": "Система", "entity_type": "team", "scope": "match", "source_type": "system"},
|
||||
@@ -246,6 +263,23 @@ LIMIT 1""",
|
||||
)
|
||||
|
||||
|
||||
# Keep the exact previous defaults for a safe, one-time migration. Custom SQL
|
||||
# must remain untouched, even when its source uses one of the built-in codes.
|
||||
LEGACY_SQL_SOURCE_TEXT = {item["code"]: item["sql_text"] for item in DEFAULT_SQL_SOURCES}
|
||||
|
||||
|
||||
def _localized_default_column(match: re.Match[str]) -> str:
|
||||
base = match.group(1)
|
||||
return (f"CASE WHEN :ui_language = 'en' "
|
||||
f"THEN COALESCE(NULLIF(TRIM({base}_en), ''), {base}_ru, '') "
|
||||
f"ELSE COALESCE(NULLIF(TRIM({base}_ru), ''), {base}_en, '') END")
|
||||
|
||||
|
||||
DEFAULT_SQL_SOURCES = tuple({**item, "sql_text": re.sub(
|
||||
r"\b((?:g|t|p|pt)\.[a-z_]+)_ru\b", _localized_default_column, item["sql_text"]
|
||||
)} for item in DEFAULT_SQL_SOURCES)
|
||||
|
||||
|
||||
class MappingDataService:
|
||||
"""Dynamic context variables and read-only SQL data sources for vMix mapping."""
|
||||
|
||||
@@ -309,9 +343,14 @@ class MappingDataService:
|
||||
is_system=item.get("source_type") == "system", enabled=True, sort_order=index,
|
||||
created_by="system", updated_by="system", created_at=now, updated_at=now,
|
||||
))
|
||||
existing_sources = {row.code for row in session.scalars(select(MappingSqlDataSource))}
|
||||
existing_sources = {row.code: row for row in session.scalars(select(MappingSqlDataSource))}
|
||||
for index, item in enumerate(DEFAULT_SQL_SOURCES):
|
||||
if item["code"] in existing_sources:
|
||||
row = existing_sources[item["code"]]
|
||||
if row.sql_text.strip() == LEGACY_SQL_SOURCE_TEXT[item["code"]].strip():
|
||||
row.sql_text = item["sql_text"]
|
||||
row.updated_at = now
|
||||
row.updated_by = "system"
|
||||
continue
|
||||
session.add(MappingSqlDataSource(
|
||||
code=item["code"], name=item["name"], category=item.get("category", "Данные"),
|
||||
@@ -644,6 +683,7 @@ class MappingDataService:
|
||||
context: dict[str, str] = {str(k): str(v) for k, v in supplied.items() if v is not None and str(v) != ""}
|
||||
context["account_id"] = str(user.id)
|
||||
context.setdefault("ui_language", self._current_language(supplied))
|
||||
context.update({f"title_button_{key}": "" for key in TITLE_BUTTON_FIELDS})
|
||||
if not context.get("device_id"):
|
||||
with self.database.session() as session:
|
||||
device = session.scalar(select(VmixDevice).where(and_(VmixDevice.wfl_user_id == user.id, VmixDevice.is_active_for_account.is_(True))))
|
||||
@@ -748,7 +788,10 @@ class MappingDataService:
|
||||
for raw_key, raw_value in runtime_values.items():
|
||||
raw_key_text = str(raw_key)
|
||||
player_match = re.match(r"^player_select\.([A-Za-z0-9_]+)\.(.+)$", raw_key_text)
|
||||
if player_match and player_match.group(2).startswith("_"):
|
||||
if player_match and player_match.group(2).startswith("_") and player_match.group(2) not in PLAYER_PANEL_BUTTON_FIELDS:
|
||||
continue
|
||||
if raw_key_text in {f"title_button.{key}" for key in TITLE_BUTTON_FIELDS}:
|
||||
context[raw_key_text.replace(".", "_")] = str(raw_value)
|
||||
continue
|
||||
sql_key = re.sub(r"[^A-Za-z0-9_]+", "_", raw_key_text).strip("_")[:120]
|
||||
if not sql_key or not re.match(r"^[A-Za-z]", sql_key):
|
||||
@@ -761,7 +804,7 @@ class MappingDataService:
|
||||
"id": "external ID", "db_id": "DB ID", "team_id": "ID команды",
|
||||
"side": "сторона", "number": "номер", "name": "имя",
|
||||
}
|
||||
label = field_key
|
||||
label = PLAYER_PANEL_BUTTON_FIELDS.get(field_key, field_key)
|
||||
if slot_match:
|
||||
slot_no, field_name = slot_match.groups()
|
||||
label = f"Игрок {slot_no} — {field_labels.get(field_name, field_name)}"
|
||||
@@ -1146,14 +1189,14 @@ class MappingDataService:
|
||||
if not player_match:
|
||||
continue
|
||||
panel_id, field_key = player_match.groups()
|
||||
if field_key.startswith("_"):
|
||||
if field_key.startswith("_") and field_key not in PLAYER_PANEL_BUTTON_FIELDS:
|
||||
continue
|
||||
slot_match = re.match(r"player(\d+)_(id|db_id|team_id|side|number|name)$", field_key)
|
||||
field_labels = {
|
||||
"id": "external ID", "db_id": "DB ID", "team_id": "ID команды",
|
||||
"side": "сторона", "number": "номер", "name": "имя",
|
||||
}
|
||||
label = field_key
|
||||
label = PLAYER_PANEL_BUTTON_FIELDS.get(field_key, field_key)
|
||||
if slot_match:
|
||||
slot_no, field_name = slot_match.groups()
|
||||
label = f"Игрок {slot_no} — {field_labels.get(field_name, field_name)}"
|
||||
@@ -1183,6 +1226,12 @@ class MappingDataService:
|
||||
tables: list[dict[str, Any]] = []
|
||||
# Context variables are usable directly as mapping values too.
|
||||
items.extend(self._live_control_items(context, language))
|
||||
items.extend({
|
||||
"key": f"title_button.{key}", "label": label,
|
||||
"category": "Титры · Нажатая кнопка", "kind": "text", "source_code": "live_control",
|
||||
"value": context.get(f"title_button_{key}", ""),
|
||||
"description": "Последняя нажатая кнопка титра в текущем матче. Обновляется до Mapping и Preview.",
|
||||
} for key, label in TITLE_BUTTON_FIELDS.items())
|
||||
for variable in variables:
|
||||
items.append({
|
||||
"key": f"context.{variable['key']}", "label": variable["label"], "category": f"Контекст · {variable['category']}",
|
||||
|
||||
@@ -1531,19 +1531,26 @@
|
||||
team2_id: value(game, ["away_team_external_id"]) || value(away, ["external_id", "id", "team_id"]),
|
||||
selected_player_id: value(selectedPlayer, ["external_id", "id", "player_id"]),
|
||||
selected_player_team_id: value(selectedPlayer, ["team.external_id", "team.id", "team_id"]),
|
||||
ui_language: String(runtime.language?.display || state.language || "ru").toLowerCase() === "en" ? "en" : "ru",
|
||||
// The language switch updates local preference before the new match
|
||||
// details arrive. Never let the previous match payload override it.
|
||||
ui_language: String(runtimeStorage.getItem("hockey.language") || state.language || runtime.language?.display || "ru").toLowerCase() === "en" ? "en" : "ru",
|
||||
session_token: selected.token || "",
|
||||
};
|
||||
}
|
||||
|
||||
let mappingCatalogRequestRevision = 0;
|
||||
async function loadMappingCatalog() {
|
||||
const revision = ++mappingCatalogRequestRevision;
|
||||
const context = mappingRequestContext();
|
||||
let catalog;
|
||||
try {
|
||||
state.mappingCatalog = await request("/api/hockey/admin/mapping-data/catalog", {
|
||||
method: "POST", body: JSON.stringify({ context: mappingRequestContext() }),
|
||||
catalog = await request("/api/hockey/admin/mapping-data/catalog", {
|
||||
method: "POST", body: JSON.stringify({ context }),
|
||||
});
|
||||
} catch (error) {
|
||||
state.mappingCatalog = { items: [], variables: [], sources: [], context: mappingRequestContext(), error: error.message || String(error) };
|
||||
catalog = { items: [], variables: [], sources: [], context, error: error.message || String(error) };
|
||||
}
|
||||
if (revision === mappingCatalogRequestRevision) state.mappingCatalog = catalog;
|
||||
return state.mappingCatalog;
|
||||
}
|
||||
|
||||
@@ -4267,7 +4274,10 @@
|
||||
|
||||
window.addEventListener("hockey:settings-updated", async (event) => {
|
||||
const lang = String(event.detail?.settings?.ui_language || event.detail?.settings?.settings?.ui_language || "").toLowerCase();
|
||||
if (lang === "ru" || lang === "en") state.language = lang;
|
||||
if (lang === "ru" || lang === "en") {
|
||||
state.language = lang;
|
||||
runtimeStorage.setItem("hockey.language", lang);
|
||||
}
|
||||
if (!state.open || !isMappingSection()) return;
|
||||
try { await loadMappingCatalog(); } catch (_) {}
|
||||
renderMappingCatalogUpdate();
|
||||
|
||||
Reference in New Issue
Block a user