From a2475c262a344ac33103d947aa37e44af46192c4 Mon Sep 17 00:00:00 2001 From: Alexey Barabanov Date: Sat, 22 Nov 2025 19:19:17 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20URL=20=D0=B2=20=D1=84=D1=83=D0=BD=D0=BA?= =?UTF-8?q?=D1=86=D0=B8=D0=B8=20change=5Fvmix=5Fdatasource=5Furls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- get_data.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/get_data.py b/get_data.py index 313c306..5dadfd0 100644 --- a/get_data.py +++ b/get_data.py @@ -14,7 +14,7 @@ from dotenv import load_dotenv from pprint import pprint import nasio import io, os, platform, time -import xml.etree.ElementTree as ET +import xml.etree.ElementTree as ETя import re from PIL import Image, ImageDraw, ImageFont from io import BytesIO @@ -3194,14 +3194,11 @@ def change_vmix_datasource_urls(xml_data, new_base_url: str) -> bytes: root = ET.fromstring(text) # 4. Меняем URL - for ds in root.findall(".//datasource[@friendlyName='JSON']"): - for inst in ds.findall(".//instance"): - url_tag = inst.find(".//state/xml/url") - if url_tag is not None and url_tag.text: - old_url = url_tag.text.strip() - pattern = r"https?\:\/\/\w+\.\w+\.\w{2,}|https?\:\/\/\d{,3}\.\d{,3}\.\d{,3}\.\d{,3}\:\d*" - new_url = re.sub(pattern, new_base_url, old_url, count=0, flags=0) - url_tag.text = new_url + for url_tag in root.findall(".//datasource[@friendlyName='JSON']//instance//state/xml/url"): + old_url = url_tag.text.strip() + pattern = r'https?:\/\/[^\/]+' + new_url = re.sub(pattern, new_base_url, old_url, count=0, flags=0) + url_tag.text = new_url # 5. Сериализуем обратно в bytes new_xml = ET.tostring(root, encoding="utf-8", method="xml") From 59488f2c37272a913cecd6e5c8cfafa244edecce Mon Sep 17 00:00:00 2001 From: Alexey Barabanov Date: Sat, 22 Nov 2025 20:40:09 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=BC=D0=B5=D1=81=D1=82=20=D0=B3=D0=B4=D0=B5=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=BF=D0=BE=D1=82=D0=B8=D0=BC?= =?UTF-8?q?=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- get_data.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/get_data.py b/get_data.py index 5dadfd0..db25e10 100644 --- a/get_data.py +++ b/get_data.py @@ -651,7 +651,12 @@ def results_consumer(): "game over", ] - # 1) матч ЗАКОНЧЕН → запускаем ОТСРОЧЕННЫЙ переход + # 1) матч ЗАКОНЧЕН → запускаем ОТСРОЧЕННЫЙ переход + # ##TODO - Усложненый код? Нужен, если статус бывает сложнее, чем "result", + # а что-то в стиле "result 1:0", т.е. слова из finished_markers являются + # состовной частью настоящего статуса + # В противном случае вполне рабочий вариант: + # if raw_ls_status_low in finished_markers: if any(m in raw_ls_status_low for m in finished_markers): now_ts = time.time() # если ещё не назначали переход — назначим @@ -769,6 +774,7 @@ def get_items(data: dict) -> list: Многие ручки отдают {"result":[...]} или {"seasons":[...]}. Если находим список — возвращаем его. Если нет — возвращаем None (значит, нужно брать весь dict). + ВНИМАНИЕ: если списков в data несколько - вернет случайный """ for k, v in data.items(): if isinstance(v, list): @@ -811,6 +817,8 @@ def pick_game_for_team(calendar_json): return game["game"]["id"], gdt, True, cal_status # 2) если на сегодня нет — берём последнюю прошедшую + # TODO - код повторяется почти без изменений. + # Можно без сожаления свести в один проход. last_id = None last_dt = None last_status = None From ee7c6eee86f5de510d81da112f31a7987f9cc408 Mon Sep 17 00:00:00 2001 From: Alexey Barabanov Date: Sun, 23 Nov 2025 12:09:52 +0300 Subject: [PATCH 3/4] remove .bat --- replace.bat | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 replace.bat diff --git a/replace.bat b/replace.bat deleted file mode 100644 index ac6e9df..0000000 --- a/replace.bat +++ /dev/null @@ -1,41 +0,0 @@ -@echo off -setlocal - -set "vmix_file=%~1" -if "%vmix_file%"=="" ( - echo Usage: %0 filename.vmix - pause - exit /b 1 -) - -if not exist "%vmix_file%" ( - echo File "%vmix_file%" not found! - pause - exit /b 1 -) - -set "replace=https://per.tvstart.ru" -set "temp_file=%vmix_file%.tmp" - -echo Processing: %vmix_file% - -powershell -Command " -$content = Get-Content '%vmix_file%' -Raw -$pattern = 'https?:\/\/\d*\.\d*\.\d*\.\d*:\d*|https?:\/\/\w*\.\w*\.\w*' -$replacement = '%replace%' -$result = $content -replace $pattern, $replacement -$result | Out-File '%temp_file%' -Encoding UTF8 -" - -if exist "%temp_file%" ( - move /y "%temp_file%" "%vmix_file%" > nul - echo Replacement completed successfully! - echo URLs matching these patterns were replaced: - echo - IP addresses with ports (http://127.0.0.1:8000 etc.) - echo - Three-part domains (https://gfx.tvstart.ru etc.) - echo Replacement: %replace% -) else ( - echo Error: Failed to process file -) - -pause \ No newline at end of file From 31c1ab16faf1996d79c4aef72de267556f4f0ac8 Mon Sep 17 00:00:00 2001 From: Alexey Barabanov Date: Tue, 25 Nov 2025 10:10:40 +0000 Subject: [PATCH 4/4] add enisey --- deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy.sh b/deploy.sh index e3cd7e7..69c3358 100755 --- a/deploy.sh +++ b/deploy.sh @@ -317,6 +317,7 @@ detect_team() { ["10.10.35.28"]="mba-mai" ["10.10.35.29"]="Pari Nizhny Novgorod" ["10.10.35.30"]="unics" + ["10.10.35.31"]="enisey" ) # Определение команды по IP