From d4d9584bb30f1ce941295fa9d512929ec58f1663 Mon Sep 17 00:00:00 2001 From: Alexey Barabanov Date: Thu, 13 Nov 2025 15:28:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=B2=D0=B7=D0=BE=D0=B8=D0=BC=D0=BE=D0=B6=D0=B5=D0=B9?= =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B8=D0=B5=20=D1=81=20=D1=84=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB=D0=BE=D0=BC=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F.=20=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=D0=B8=20=D1=87=D1=82=D0=BE=20=D0=B1=D0=B5=D1=80=D0=B5=D1=82?= =?UTF-8?q?=D1=8C=D1=81=D1=8F=20=D0=B8=D0=B7=20=D1=84=D0=B0=D0=B9=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- get_data.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/get_data.py b/get_data.py index 780b23f..1cc36d6 100644 --- a/get_data.py +++ b/get_data.py @@ -29,27 +29,21 @@ _latest_lock = Lock() _stop_event = Event() _worker_thread: Thread | None = None -# Загружаем переменные из .env -if load_dotenv(dotenv_path="/mnt/khl/.env", verbose=True): - print("Добавить в лог что был найден файл окружения!!") - pass -else: - load_dotenv() - print("Добавить в лог что не был найден файл окружения!!") - +pprint(f"Локальный файл окружения ={load_dotenv(verbose=True)}") api_user = os.getenv("API_USER") api_pass = os.getenv("API_PASS") league = os.getenv("LEAGUE") +api_base_url = os.getenv("API_BASE_URL") POLL_SEC = int(os.getenv("GAME_POLL_SECONDS")) SERVER_NAME = os.getenv("SYNO_URL") USER = os.getenv("SYNO_USERNAME") PASSWORD = os.getenv("SYNO_PASSWORD") -PATH = "/team-folders/GFX/Hockey/KHL/Soft/MATCH.xlsm" +PATH = f'{os.getenv("SYNO_PATH")}MATCH.xlsm' def load_today_schedule(): """Возвращает DataFrame матчей на сегодня с нужными колонками (или пустой DF).""" - url_tournaments = "http://stat2tv.khl.ru/tournaments.xml" + url_tournaments = f"{api_base_url}tournaments.xml" r = requests.get( url_tournaments, auth=HTTPBasicAuth(api_user, api_pass), verify=False ) @@ -73,7 +67,7 @@ def load_today_schedule(): global current_tournament_id, current_season current_tournament_id = tournament_id current_season = season - url_schedule = f"http://stat2tv.khl.ru/{tournament_id}/schedule-{tournament_id}.xml" + url_schedule = f"{api_base_url}{tournament_id}/schedule-{tournament_id}.xml" r = requests.get(url_schedule, auth=HTTPBasicAuth(api_user, api_pass), verify=False) schedule_df = pd.read_xml(io.StringIO(r.text)) @@ -131,7 +125,7 @@ def load_today_schedule(): def _build_game_url(tournament_id: int, game_id: int) -> str: # URL по аналогии с расписанием: .../{tournament_id}/json_en/{game_id}.json # Если у тебя другой шаблон — просто поменяй строку ниже. - return f"http://stat2tv.khl.ru/{tournament_id}/json_en/{game_id}.json" + return f"{api_base_url}{tournament_id}/json_en/{game_id}.json" def _fetch_game_once(tournament_id: int, game_id: int) -> dict: