updated
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"server_ip": "https://digi-signage.moto-adv.com",
|
"server_ip": "https://digi-signage.moto-adv.com",
|
||||||
"port": "80",
|
"port": "443",
|
||||||
"screen_name": "tv-acasa",
|
"screen_name": "tv-terasa",
|
||||||
"quickconnect_key": "8887779",
|
"quickconnect_key": "8887779",
|
||||||
"orientation": "Landscape",
|
"orientation": "Landscape",
|
||||||
"touch": "True",
|
"touch": "True",
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 227 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 MiB |
Binary file not shown.
@@ -31,15 +31,21 @@ def send_player_feedback(config, message, status="active", playlist_version=None
|
|||||||
port = config.get("port", "")
|
port = config.get("port", "")
|
||||||
|
|
||||||
# Construct server URL
|
# Construct server URL
|
||||||
|
# Remove protocol if already present
|
||||||
|
server_clean = server.replace('http://', '').replace('https://', '')
|
||||||
ip_pattern = r'^\d+\.\d+\.\d+\.\d+$'
|
ip_pattern = r'^\d+\.\d+\.\d+\.\d+$'
|
||||||
if re.match(ip_pattern, server):
|
if re.match(ip_pattern, server_clean):
|
||||||
feedback_url = f'http://{server}:{port}/api/player-feedback'
|
feedback_url = f'http://{server_clean}:{port}/api/player-feedback'
|
||||||
|
else:
|
||||||
|
# Use original server if it has protocol, otherwise add http://
|
||||||
|
if server.startswith(('http://', 'https://')):
|
||||||
|
feedback_url = f'{server}/api/player-feedback'
|
||||||
else:
|
else:
|
||||||
feedback_url = f'http://{server}/api/player-feedback'
|
feedback_url = f'http://{server}/api/player-feedback'
|
||||||
|
|
||||||
# Prepare feedback data
|
# Prepare feedback data
|
||||||
feedback_data = {
|
feedback_data = {
|
||||||
'player_name': host,
|
'hostname': host,
|
||||||
'quickconnect_code': quick,
|
'quickconnect_code': quick,
|
||||||
'message': message,
|
'message': message,
|
||||||
'status': status,
|
'status': status,
|
||||||
@@ -165,9 +171,15 @@ def fetch_server_playlist(config):
|
|||||||
quick = config.get("quickconnect_key", "")
|
quick = config.get("quickconnect_key", "")
|
||||||
port = config.get("port", "")
|
port = config.get("port", "")
|
||||||
try:
|
try:
|
||||||
|
# Remove protocol if already present
|
||||||
|
server_clean = server.replace('http://', '').replace('https://', '')
|
||||||
ip_pattern = r'^\d+\.\d+\.\d+\.\d+$'
|
ip_pattern = r'^\d+\.\d+\.\d+\.\d+$'
|
||||||
if re.match(ip_pattern, server):
|
if re.match(ip_pattern, server_clean):
|
||||||
server_url = f'http://{server}:{port}/api/playlists'
|
server_url = f'http://{server_clean}:{port}/api/playlists'
|
||||||
|
else:
|
||||||
|
# Use original server if it has protocol, otherwise add http://
|
||||||
|
if server.startswith(('http://', 'https://')):
|
||||||
|
server_url = f'{server}/api/playlists'
|
||||||
else:
|
else:
|
||||||
server_url = f'http://{server}/api/playlists'
|
server_url = f'http://{server}/api/playlists'
|
||||||
params = {
|
params = {
|
||||||
|
|||||||
Reference in New Issue
Block a user