updated feedback
This commit is contained in:
@@ -65,7 +65,7 @@ def send_player_feedback(config, message, status="active", playlist_version=None
|
||||
|
||||
def send_playlist_check_feedback(config, playlist_version=None):
|
||||
"""
|
||||
Send feedback when playlist is checked for updates.
|
||||
Send feedback when server is interrogated for playlist updates.
|
||||
|
||||
Args:
|
||||
config (dict): Configuration containing server details
|
||||
@@ -75,8 +75,8 @@ def send_playlist_check_feedback(config, playlist_version=None):
|
||||
bool: True if feedback sent successfully, False otherwise
|
||||
"""
|
||||
player_name = config.get("screen_name", "unknown")
|
||||
version_info = f"v{playlist_version}" if playlist_version else "unknown"
|
||||
message = f"player {player_name}, is active, Playing {version_info}"
|
||||
version_info = f"playlist v{playlist_version}" if playlist_version else "unknown"
|
||||
message = f"player {player_name}, server interrogation, checking for updates : {version_info}"
|
||||
|
||||
return send_player_feedback(
|
||||
config=config,
|
||||
@@ -97,8 +97,8 @@ def send_playlist_restart_feedback(config, playlist_version=None):
|
||||
bool: True if feedback sent successfully, False otherwise
|
||||
"""
|
||||
player_name = config.get("screen_name", "unknown")
|
||||
version_info = f"v{playlist_version}" if playlist_version else "unknown"
|
||||
message = f"player {player_name}, playlist loop completed, restarting {version_info}"
|
||||
version_info = f"playlist v{playlist_version}" if playlist_version else "unknown"
|
||||
message = f"player {player_name}, playlist working in loop, cycle completed : {version_info}"
|
||||
|
||||
return send_player_feedback(
|
||||
config=config,
|
||||
@@ -132,20 +132,19 @@ def send_player_error_feedback(config, error_message, playlist_version=None):
|
||||
|
||||
def send_playing_status_feedback(config, playlist_version=None, current_media=None):
|
||||
"""
|
||||
Send feedback about current playing status.
|
||||
Send feedback about playlist starting (first media).
|
||||
|
||||
Args:
|
||||
config (dict): Configuration containing server details
|
||||
playlist_version (int, optional): Current playlist version
|
||||
current_media (str, optional): Currently playing media file
|
||||
current_media (str, optional): First media file in playlist
|
||||
|
||||
Returns:
|
||||
bool: True if feedback sent successfully, False otherwise
|
||||
"""
|
||||
player_name = config.get("screen_name", "unknown")
|
||||
version_info = f"v{playlist_version}" if playlist_version else "unknown"
|
||||
media_info = f" - {current_media}" if current_media else ""
|
||||
message = f"player {player_name}, is active, Playing {version_info}{media_info}"
|
||||
version_info = f"playlist v{playlist_version}" if playlist_version else "unknown"
|
||||
message = f"player {player_name}, playlist started : {version_info}"
|
||||
|
||||
return send_player_feedback(
|
||||
config=config,
|
||||
@@ -304,7 +303,7 @@ def update_playlist_if_needed(local_playlist_path, config, media_dir, playlist_d
|
||||
|
||||
Logger.info(f"Local playlist version: {local_version}, Server playlist version: {server_version}")
|
||||
|
||||
# Send feedback about playlist check
|
||||
# Send feedback about server interrogation (checking for updates)
|
||||
send_playlist_check_feedback(config, server_version if server_version > 0 else local_version)
|
||||
|
||||
if local_version != server_version:
|
||||
@@ -315,11 +314,6 @@ def update_playlist_if_needed(local_playlist_path, config, media_dir, playlist_d
|
||||
# Delete old playlists and unreferenced media
|
||||
delete_old_playlists_and_media(server_version, playlist_dir, media_dir)
|
||||
|
||||
# Send feedback about playlist update
|
||||
player_name = config.get("screen_name", "unknown")
|
||||
update_message = f"player {player_name}, playlist updated to v{server_version}"
|
||||
send_player_feedback(config, update_message, "active", server_version)
|
||||
|
||||
return True
|
||||
else:
|
||||
Logger.warning("No playlist data fetched from server or playlist is empty.")
|
||||
|
||||
Reference in New Issue
Block a user