ychernenko/RFB
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test6

Browse Source
This commit is contained in:
Юрий Черненко
2025-11-18 18:49:11 +03:00
parent b2d7a80a66
commit c984bc359e
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
get_data.py
View File

@@ -1134,11 +1134,11 @@ def start_prestart_watcher(game_dt: datetime | None):
for g in reversed(items): for g in reversed(items):
try: try:
t1 = (g["team1"]["name"] or "").strip().casefold() t1 = (g["team1"]["name"] or "").strip().casefold()
t2 = (g["team2"]["name"] or "").strip().casefold() if team_norm not in (t1):
if team_norm not in (t1, t2):
continue continue
except Exception: except Exception:
continue continue
print(g)
gdt = extract_game_datetime(g) gdt = extract_game_datetime(g)
if not gdt: if not gdt:
try: try:
@@ -1164,6 +1164,7 @@ def start_prestart_watcher(game_dt: datetime | None):
timeout=6, timeout=6,
).json() ).json()
prev_game_id, prev_game_dt = _find_prev_game_id(calendar_resp, game_dt) prev_game_id, prev_game_dt = _find_prev_game_id(calendar_resp, game_dt)
# print(prev_game_id, prev_game_dt)
if prev_game_id and str(prev_game_id) != str(GAME_ID): if prev_game_id and str(prev_game_id) != str(GAME_ID):
logger.info( logger.info(
f"[preload] старт оффлайна по предыдущей игре {prev_game_id} ({prev_game_dt})" f"[preload] старт оффлайна по предыдущей игре {prev_game_id} ({prev_game_dt})"
@@ -1411,13 +1412,13 @@ app = FastAPI(
# раздаём /shotmaps как статику из SHOTMAP_DIR # раздаём /shotmaps как статику из SHOTMAP_DIR
app.mount("/shotmaps", StaticFiles(directory=SHOTMAP_DIR), name="shotmaps") app.mount("/shotmaps", StaticFiles(directory=SHOTMAP_DIR), name="shotmaps")
@app.get("/shotmaps/{filename}") # @app.get("/shotmaps/{filename}")
async def get_shotmap(filename: str): # async def get_shotmap(filename: str):
data = SHOTMAP_CACHE.get(filename) # data = SHOTMAP_CACHE.get(filename)
if not data: # if not data:
# если вдруг перезапустился процесс или такой карты нет # # если вдруг перезапустился процесс или такой карты нет
raise HTTPException(status_code=404, detail="Shotmap not found") # raise HTTPException(status_code=404, detail="Shotmap not found")
return Response(content=data, media_type="image/png") # return Response(content=data, media_type="image/png")
def format_time(seconds: float | int) -> str: def format_time(seconds: float | int) -> str:
""" """
@@ -3488,10 +3489,10 @@ def get_image(points, bib, count_point):
public_base = f"https://{MYHOST}.tvstart.ru" public_base = f"https://{MYHOST}.tvstart.ru"
public_url = f"{public_base.rstrip('/')}/shotmaps/{filename}" public_url = f"{public_base.rstrip('/')}/shotmaps/{filename}"
logger.info( # logger.info(
f"[shotmap] generated in-memory shotmap for bib={bib}, ver={count_point} " # f"[shotmap] generated in-memory shotmap for bib={bib}, ver={count_point} "
f"-> {filename}, url={public_url}" # f"-> {filename}, url={public_url}"
) # )
return public_url return public_url