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

Доделки по FQDN

Browse Source
This commit is contained in:
Alexey Barabanov
2025-11-20 13:29:12 +03:00
parent da7e7ad833
commit 3a360e0c79
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
get_data.py
View File

@@ -31,25 +31,12 @@ MYHOST = platform.node()
if not os.path.exists("logs"): if not os.path.exists("logs"):
os.makedirs("logs") os.makedirs("logs")
def get_fqdn():
system_name = platform.system()
if system_name == "Linux":
hostname = platform.node()
fqdn = f"https://{hostname}.tvstart.ru"
else:
fqdn = "http://127.0.0.1"
return fqdn
FQDN = get_fqdn
def get_fqdn(): def get_fqdn():
system_name = platform.system() system_name = platform.system()
if system_name == "Linux": if system_name == "Linux":
hostname = platform.node() hostname = platform.node().lower()
fqdn = f"https://{hostname}.tvstart.ru" fqdn = f"https://{hostname}.tvstart.ru"
else: else:
fqdn = "http://127.0.0.1" fqdn = "http://127.0.0.1"
@@ -3230,7 +3217,7 @@ async def vmix_project():
# pass # pass
# else: # else:
# ❗ На Linux/Synology/Docker — заменяем URL # ❗ На Linux/Synology/Docker — заменяем URL
edited_vmix = change_vmix_datasource_urls(vmix_bio, f"https://{MYHOST}.tvstart.ru") edited_vmix = change_vmix_datasource_urls(vmix_bio, FQDN)
# 2. гарантируем, что это bytes # 2. гарантируем, что это bytes
if isinstance(edited_vmix, str): if isinstance(edited_vmix, str):
edited_vmix = edited_vmix.encode("utf-8") edited_vmix = edited_vmix.encode("utf-8")
@@ -3512,8 +3499,7 @@ def get_image(points, bib, count_point):
SHOTMAP_CACHE[filename] = data # кладём в RAM SHOTMAP_CACHE[filename] = data # кладём в RAM
# формируем URL для vMix # формируем URL для vMix
public_base = f"https://{MYHOST}.tvstart.ru" public_url = f"{FQDN}/image/{filename}"
public_url = f"{public_base.rstrip('/')}/image/{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} "