ychernenko/WFL
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. обновил инструкцию

Browse Source 
2. добавил в админку Добавление обновлений, чтобы не через код
This commit is contained in:
Юрий Черненко
2026-06-22 17:58:20 +03:00
parent 3e6f767a12
commit 55cb965d9f
5 changed files with 1016 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

269
app.py
View File

@@ -27,6 +27,8 @@ from urllib.parse import quote, urlencode
import traceback
import contextlib
import os
import html
import re
from parsers.parser_game import run_parser_game
from parsers.parser_players import run_parser_players
from parsers.parser_schedule import run_parser_schedule
@@ -1924,6 +1926,230 @@ async def list_vmix_clients():
return {"items": clients}
INFO_TEMPLATE_PATH = BASE_DIR / "templates" / "info.html"
def _clean_update_text(value: str | None) -> str:
return (value or "").strip()
def _escape_text(value: str | None) -> str:
return html.escape(_clean_update_text(value), quote=True)
def _split_lines(value: str | None) -> list[str]:
return [line.strip() for line in (value or "").splitlines() if line.strip()]
def _format_update_date(value: str | None) -> str:
value = _clean_update_text(value)
if re.fullmatch(r"\d{4}-\d{2}-\d{2}", value):
try:
return datetime.strptime(value, "%Y-%m-%d").strftime("%d.%m.%Y")
except ValueError:
return value
return value
def _paragraphs_html(value: str | None) -> str:
lines = _split_lines(value)
if not lines:
return "<p>Описание не заполнено.</p>"
return "\n".join(f"<p>{_escape_text(line)}</p>" for line in lines)
def _normalize_update_image_path(value: str | None) -> str:
path = _clean_update_text(value)
if not path:
return ""
# Удобный вариант для админки: можно ввести только имя файла,
# например "no photo.png" — оно превратится в /static/docs/no photo.png.
if path.startswith("static/"):
path = "/" + path
elif path.startswith("docs/"):
path = "/static/" + path
elif not path.startswith(("/static/", "http://", "https://")):
path = "/static/docs/" + path.lstrip("/")
return path
def _image_html(value: str | None, alt: str | None = None) -> str:
path = _normalize_update_image_path(value)
if not path:
return ""
return f'\n <img src="{html.escape(path, quote=True)}" alt="{_escape_text(alt or "Скриншот обновления")}">'
def _build_update_block(
version: str,
date: str,
operator_actions: str,
item_badges: list[str],
item_titles: list[str],
item_texts: list[str],
item_images: list[str] | None = None,
) -> str:
badge_meta = {
"new": ("new", "Новое"),
"fix": ("fix", "Исправлено"),
"improve": ("improve", "Улучшено"),
"important": ("important", "Важно"),
}
version_html = _escape_text(version)
date_html = _escape_text(date)
actions = _split_lines(operator_actions)
if actions:
actions_html = "\n".join(f"<li>{_escape_text(action)}</li>" for action in actions)
else:
actions_html = "<li>Ознакомиться с обновлением перед работой с матчем.</li>"
item_images = item_images or []
update_items: list[str] = []
max_len = max(len(item_titles), len(item_texts), len(item_badges), len(item_images), 1)
for index in range(max_len):
title = _clean_update_text(item_titles[index] if index < len(item_titles) else "")
text = _clean_update_text(item_texts[index] if index < len(item_texts) else "")
badge = _clean_update_text(item_badges[index] if index < len(item_badges) else "new")
image = _clean_update_text(item_images[index] if index < len(item_images) else "")
if not title and not text:
continue
badge_class, badge_label = badge_meta.get(badge, badge_meta["new"])
item_title_html = _escape_text(title or "Без названия")
item_text_html = _paragraphs_html(text) + _image_html(image, title or "Скриншот обновления")
update_items.append(
f''' <div class="update-item">
<span class="update-badge {badge_class}">{badge_label}</span>
<div class="update-content">
<div class="update-title">{item_title_html}</div>
<div class="update-text">
{item_text_html}
</div>
</div>
</div>'''
)
if not update_items:
update_items.append(
''' <div class="update-item">
<span class="update-badge new">Новое</span>
<div class="update-content">
<div class="update-title">Обновление системы</div>
<div class="update-text">
<p>Описание не заполнено.</p>
</div>
</div>
</div>'''
)
items_html = "\n".join(update_items)
return f'''
<details class="update-details" open>
<summary>
<article class="update-card latest">
<div class="update-header">
<div>
<div class="update-version-big update-date">Версия {version_html}</div>
<div class="update-version">{date_html}</div>
</div>
<div class="update-toggle"></div>
</div>
<div class="update-actions">
<div class="update-actions-title">Что сделать оператору</div>
<ul>
{actions_html}
</ul>
</div>
<div class="update-items">
{items_html}
</div>
</article>
</summary>
</details>
'''.rstrip()
def _update_latest_summary(html_text: str, version: str, date: str, item_titles: list[str]) -> str:
titles = [title.strip() for title in item_titles if title and title.strip()]
if not titles:
titles = ["Добавлено новое обновление системы."]
list_items = "\n".join(f" <li>{_escape_text(title)}</li>" for title in titles[:5])
summary_html = f''' <div class="latest-update-box">
<div class="latest-update-title">Последние изменения: версия {_escape_text(version)} от {_escape_text(date)}</div>
<ul class="latest-update-list">
{list_items}
</ul>
</div>'''
pattern = re.compile(r' <div class="latest-update-box">.*? </div>', re.S)
return pattern.sub(summary_html, html_text, count=1)
def add_update_to_info_template(
version: str,
date: str,
operator_actions: str,
item_badges: list[str],
item_titles: list[str],
item_texts: list[str],
item_images: list[str] | None = None,
) -> None:
version = _clean_update_text(version)
date = _format_update_date(date)
if not version:
raise ValueError("Укажите номер версии.")
if not date:
raise ValueError("Укажите дату обновления.")
html_text = INFO_TEMPLATE_PATH.read_text(encoding="utf-8")
insert_marker = ' <div class="updates-timeline">'
if insert_marker not in html_text:
raise RuntimeError("Не найден блок updates-timeline в templates/info.html.")
# У старых карточек убираем отметку latest, чтобы зелёная лента NEW была только у свежего обновления.
html_text = html_text.replace('update-card latest', 'update-card')
new_update_html = _build_update_block(
version=version,
date=date,
operator_actions=operator_actions,
item_badges=item_badges,
item_titles=item_titles,
item_texts=item_texts,
item_images=item_images,
)
html_text = html_text.replace(
insert_marker,
insert_marker + "\n" + new_update_html,
1,
)
html_text = _update_latest_summary(html_text, version, date, item_titles)
INFO_TEMPLATE_PATH.write_text(html_text, encoding="utf-8")
@app.get("/info", response_class=HTMLResponse)
def info_page(request: Request):
return templates.TemplateResponse(name="info.html", request=request, context={})
@@ -1934,6 +2160,8 @@ def render_admin_db_index(
parser_output: str | None = None,
parser_name: str | None = None,
parser_success: bool | None = None,
update_output: str | None = None,
update_success: bool | None = None,
):
return templates.TemplateResponse(
name="admin_db_index.html",
@@ -1943,6 +2171,8 @@ def render_admin_db_index(
"parser_output": parser_output,
"parser_name": parser_name,
"parser_success": parser_success,
"update_output": update_output,
"update_success": update_success,
},
)
@@ -2002,6 +2232,45 @@ def admin_db_run_parser(request: Request, parser_name: str = Form(...)):
)
@app.post("/admin/db/add-update", response_class=HTMLResponse)
def admin_db_add_update(
request: Request,
version: str = Form(...),
date: str = Form(...),
operator_actions: str = Form(default=""),
item_badge: list[str] = Form(default=[]),
item_title: list[str] = Form(default=[]),
item_text: list[str] = Form(default=[]),
item_image: list[str] = Form(default=[]),
):
current_user = getattr(request.state, "current_user", None)
if not current_user or current_user.get("role") != "admin":
return RedirectResponse(url="/login", status_code=303)
try:
add_update_to_info_template(
version=version,
date=date,
operator_actions=operator_actions,
item_badges=item_badge,
item_titles=item_title,
item_texts=item_text,
item_images=item_image,
)
return render_admin_db_index(
request,
update_output=f"Обновление версии {version.strip()} добавлено в templates/info.html и будет отображаться сверху на странице /info.",
update_success=True,
)
except Exception:
return render_admin_db_index(
request,
update_output="Ошибка при добавлении обновления:\n" + traceback.format_exc(),
update_success=False,
)
@app.post("/admin/db/create-account", response_class=HTMLResponse)
def admin_db_create_account(
request: Request,