test6

get_data.py

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