Compare commits

...

3 Commits

Author SHA1 Message Date
DigiServer Developer
9cb32da13c Resolve merge conflict in docker-compose.yml 2025-09-09 15:29:21 +03:00
DigiServer Developer
0f34a47fa9 updated to receive player message 2025-09-09 15:24:35 +03:00
DigiServer Developer
a5ef5749b1 upload feedbackto server 2025-09-08 14:04:13 +03:00
14 changed files with 1884 additions and 62 deletions

View File

@@ -1,3 +1,10 @@
# ...existing code...
# Player feedback API
from models.player_feedback import PlayerFeedback
# --- API route to receive player feedback ---
import os
import click
import psutil
@@ -99,6 +106,38 @@ login_manager.login_view = 'login'
migrate = Migrate(app, db)
@app.route('/api/player-feedback', methods=['POST'])
def api_player_feedback():
from datetime import datetime
import dateutil.parser
data = request.get_json()
required_fields = ['player_name', 'quickconnect_code', 'message', 'status', 'timestamp']
if not all(field in data for field in required_fields):
return jsonify({'error': 'Missing required fields'}), 400
# Convert timestamp string to datetime object
try:
if isinstance(data['timestamp'], str):
timestamp = dateutil.parser.parse(data['timestamp'])
else:
timestamp = data['timestamp']
except (ValueError, TypeError):
return jsonify({'error': 'Invalid timestamp format'}), 400
feedback = PlayerFeedback(
player_name=data['player_name'],
quickconnect_code=data['quickconnect_code'],
message=data['message'],
status=data['status'],
timestamp=timestamp,
playlist_version=data.get('playlist_version'),
error_details=data.get('error_details')
)
db.session.add(feedback)
db.session.commit()
return jsonify({'success': True, 'feedback_id': feedback.id}), 200
# Add error handlers for better user experience
@app.errorhandler(413)
def request_entity_too_large(error):
@@ -330,7 +369,13 @@ def create_user():
def player_page(player_id):
player = db.session.get(Player, player_id)
content = get_player_content(player_id)
return render_template('player_page.html', player=player, content=content)
# Get last 5 feedback entries for this player
player_feedback = PlayerFeedback.query.filter_by(
player_name=player.username
).order_by(PlayerFeedback.timestamp.desc()).limit(5).all()
return render_template('player_page.html', player=player, content=content, player_feedback=player_feedback)
@app.route('/player/<int:player_id>/upload', methods=['POST'])
@login_required

1
app/migrations/README Normal file
View File

@@ -0,0 +1 @@
Single-database configuration for Flask.

View File

@@ -0,0 +1,50 @@
# A generic, single database configuration.
[alembic]
# template used to generate migration files
# file_template = %%(rev)s_%%(slug)s
# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false
# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic,flask_migrate
[handlers]
keys = console
[formatters]
keys = generic
[logger_root]
level = WARN
handlers = console
qualname =
[logger_sqlalchemy]
level = WARN
handlers =
qualname = sqlalchemy.engine
[logger_alembic]
level = INFO
handlers =
qualname = alembic
[logger_flask_migrate]
level = INFO
handlers =
qualname = flask_migrate
[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic
[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S

113
app/migrations/env.py Normal file
View File

@@ -0,0 +1,113 @@
import logging
from logging.config import fileConfig
from flask import current_app
from alembic import context
# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config
# Interpret the config file for Python logging.
# This line sets up loggers basically.
fileConfig(config.config_file_name)
logger = logging.getLogger('alembic.env')
def get_engine():
try:
# this works with Flask-SQLAlchemy<3 and Alchemical
return current_app.extensions['migrate'].db.get_engine()
except (TypeError, AttributeError):
# this works with Flask-SQLAlchemy>=3
return current_app.extensions['migrate'].db.engine
def get_engine_url():
try:
return get_engine().url.render_as_string(hide_password=False).replace(
'%', '%%')
except AttributeError:
return str(get_engine().url).replace('%', '%%')
# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
config.set_main_option('sqlalchemy.url', get_engine_url())
target_db = current_app.extensions['migrate'].db
# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
# ... etc.
def get_metadata():
if hasattr(target_db, 'metadatas'):
return target_db.metadatas[None]
return target_db.metadata
def run_migrations_offline():
"""Run migrations in 'offline' mode.
This configures the context with just a URL
and not an Engine, though an Engine is acceptable
here as well. By skipping the Engine creation
we don't even need a DBAPI to be available.
Calls to context.execute() here emit the given string to the
script output.
"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url, target_metadata=get_metadata(), literal_binds=True
)
with context.begin_transaction():
context.run_migrations()
def run_migrations_online():
"""Run migrations in 'online' mode.
In this scenario we need to create an Engine
and associate a connection with the context.
"""
# this callback is used to prevent an auto-migration from being generated
# when there are no changes to the schema
# reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
def process_revision_directives(context, revision, directives):
if getattr(config.cmd_opts, 'autogenerate', False):
script = directives[0]
if script.upgrade_ops.is_empty():
directives[:] = []
logger.info('No changes in schema detected.')
conf_args = current_app.extensions['migrate'].configure_args
if conf_args.get("process_revision_directives") is None:
conf_args["process_revision_directives"] = process_revision_directives
connectable = get_engine()
with connectable.connect() as connection:
context.configure(
connection=connection,
target_metadata=get_metadata(),
**conf_args
)
with context.begin_transaction():
context.run_migrations()
if context.is_offline_mode():
run_migrations_offline()
else:
run_migrations_online()

View File

@@ -0,0 +1,24 @@
"""${message}
Revision ID: ${up_revision}
Revises: ${down_revision | comma,n}
Create Date: ${create_date}
"""
from alembic import op
import sqlalchemy as sa
${imports if imports else ""}
# revision identifiers, used by Alembic.
revision = ${repr(up_revision)}
down_revision = ${repr(down_revision)}
branch_labels = ${repr(branch_labels)}
depends_on = ${repr(depends_on)}
def upgrade():
${upgrades if upgrades else "pass"}
def downgrade():
${downgrades if downgrades else "pass"}

View File

@@ -0,0 +1,38 @@
"""Add PlayerFeedback table
Revision ID: 217eab16e4e4
Revises:
Create Date: 2025-09-08 11:30:26.742813
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '217eab16e4e4'
down_revision = None
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('player_feedback',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('player_name', sa.String(length=255), nullable=False),
sa.Column('quickconnect_code', sa.String(length=255), nullable=False),
sa.Column('message', sa.Text(), nullable=False),
sa.Column('status', sa.String(length=50), nullable=False),
sa.Column('timestamp', sa.DateTime(), nullable=False),
sa.Column('playlist_version', sa.Integer(), nullable=True),
sa.Column('error_details', sa.Text(), nullable=True),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('player_feedback')
# ### end Alembic commands ###

View File

@@ -2,4 +2,5 @@ from .user import User
from .player import Player
from .group import Group, group_player
from .content import Content
from .server_log import ServerLog
from .server_log import ServerLog
from .player_feedback import PlayerFeedback

View File

@@ -0,0 +1,11 @@
from extensions import db
class PlayerFeedback(db.Model):
id = db.Column(db.Integer, primary_key=True)
player_name = db.Column(db.String(255), nullable=False)
quickconnect_code = db.Column(db.String(255), nullable=False)
message = db.Column(db.Text, nullable=False)
status = db.Column(db.String(50), nullable=False)
timestamp = db.Column(db.DateTime, nullable=False)
playlist_version = db.Column(db.Integer, nullable=True)
error_details = db.Column(db.Text, nullable=True)

View File

@@ -18,6 +18,9 @@ alembic==1.14.1
Mako==1.3.8
greenlet==3.1.1
# Date parsing
python-dateutil==2.9.0
# File Processing
pdf2image==1.17.0
PyPDF2==3.0.1

View File

@@ -54,20 +54,77 @@
<div class="container py-5">
<h1 class="text-center mb-4">Player Schedule for {{ player.username }}</h1>
<!-- Player Info Section -->
<div class="card mb-4 {% if theme == 'dark' %}dark-mode{% endif %}">
<div class="card-header bg-info text-white">
<h2>Player Info</h2>
<div class="row">
<!-- Player Info Section -->
<div class="col-md-6">
<div class="card mb-4 {% if theme == 'dark' %}dark-mode{% endif %}">
<div class="card-header bg-info text-white">
<h2>Player Info</h2>
</div>
<div class="card-body">
<p><strong>Player Name:</strong> {{ player.username }}</p>
<p><strong>Hostname:</strong> {{ player.hostname }}</p>
{% if current_user.role == 'admin' %}
<a href="{{ url_for('edit_player', player_id=player.id, return_url=url_for('player_page', player_id=player.id)) }}" class="btn btn-warning">Update</a>
<form action="{{ url_for('delete_player', player_id=player.id) }}" method="post" style="display:inline;">
<button type="submit" class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this player?');">Delete</button>
</form>
{% endif %}
</div>
</div>
</div>
<div class="card-body">
<p><strong>Player Name:</strong> {{ player.username }}</p>
<p><strong>Hostname:</strong> {{ player.hostname }}</p>
{% if current_user.role == 'admin' %}
<a href="{{ url_for('edit_player', player_id=player.id, return_url=url_for('player_page', player_id=player.id)) }}" class="btn btn-warning">Update</a>
<form action="{{ url_for('delete_player', player_id=player.id) }}" method="post" style="display:inline;">
<button type="submit" class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this player?');">Delete</button>
</form>
{% endif %}
<!-- Player Status Section -->
<div class="col-md-6">
<div class="card mb-4 {% if theme == 'dark' %}dark-mode{% endif %}">
<div class="card-header bg-success text-white">
<h2>Player Status</h2>
</div>
<div class="card-body">
{% if player_feedback %}
<div class="mb-3">
<strong>Current Status:</strong>
<span class="badge bg-{{ 'success' if player_feedback[0].status in ['active', 'playing'] else 'danger' }}">
{{ player_feedback[0].status|title }}
</span>
</div>
<div class="mb-3">
<strong>Last Activity:</strong> {{ player_feedback[0].timestamp.strftime('%Y-%m-%d %H:%M:%S') }}
</div>
<div class="mb-3">
<strong>Latest Message:</strong> {{ player_feedback[0].message }}
</div>
<!-- Recent Activity Log -->
<details>
<summary class="fw-bold mb-2">Recent Activity (Last 5)</summary>
<div class="mt-2">
{% for feedback in player_feedback %}
<div class="border-bottom pb-2 mb-2">
<div class="d-flex justify-content-between">
<span class="badge bg-{{ 'success' if feedback.status in ['active', 'playing'] else 'danger' }}">
{{ feedback.status|title }}
</span>
<small class="text-muted">{{ feedback.timestamp.strftime('%m-%d %H:%M') }}</small>
</div>
<div class="mt-1">
<small>{{ feedback.message }}</small>
{% if feedback.playlist_version %}
<br><small class="text-muted">Playlist v{{ feedback.playlist_version }}</small>
{% endif %}
</div>
</div>
{% endfor %}
</div>
</details>
{% else %}
<div class="text-center text-muted">
<p>No status information available</p>
<small>Player hasn't sent any feedback yet</small>
</div>
{% endif %}
</div>
</div>
</div>
</div>

View File

@@ -223,61 +223,82 @@
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js"></script>
<script>
function showStatusModal() {
console.log("Processing popup triggered");
const statusModal = new bootstrap.Modal(document.getElementById('statusModal'));
statusModal.show();
// Update status message based on media type
const mediaType = document.getElementById('media_type').value;
const statusMessage = document.getElementById('status-message');
switch(mediaType) {
case 'image':
statusMessage.textContent = 'Uploading images...';
break;
case 'video':
statusMessage.textContent = 'Uploading and processing video. This may take a while...';
break;
case 'pdf':
statusMessage.textContent = 'Converting PDF to 4K images. This may take a while...';
break;
case 'ppt':
statusMessage.textContent = 'Converting PowerPoint to images (PPTX → PDF → Images). This may take 2-5 minutes...';
break;
default:
statusMessage.textContent = 'Uploading and processing your files. Please wait...';
}
// Start system monitoring updates in modal
{% if system_info %}
startModalSystemMonitoring();
{% endif %}
// Simulate progress updates
const progressBar = document.getElementById('progress-bar');
let progress = 0;
const interval = setInterval(() => {
// For slow processes, increment more slowly
const increment = (mediaType === 'image') ? 20 : 5;
progress += increment;
if (progress >= 100) {
clearInterval(interval);
statusMessage.textContent = 'Files uploaded and processed successfully!';
// Stop system monitoring updates
{% if system_info %}
stopModalSystemMonitoring();
{% endif %}
// Enable the close button
document.querySelector('[data-bs-dismiss="modal"]').disabled = false;
} else {
progressBar.style.width = `${progress}%`;
progressBar.setAttribute('aria-valuenow', progress);
if (mediaType === 'video') {
statusMessage.textContent = 'Uploading video...';
// Stage 1: Uploading (0-40%)
let uploadInterval = setInterval(() => {
progress += 8;
if (progress >= 40) {
clearInterval(uploadInterval);
progress = 40;
progressBar.style.width = `${progress}%`;
progressBar.setAttribute('aria-valuenow', progress);
// Stage 2: Converting
statusMessage.textContent = 'Converting video to standard format (29.97 fps, 1080p)...';
let convertProgress = 40;
let convertInterval = setInterval(() => {
convertProgress += 3;
progressBar.style.width = `${convertProgress}%`;
progressBar.setAttribute('aria-valuenow', convertProgress);
if (convertProgress >= 100) {
clearInterval(convertInterval);
statusMessage.textContent = 'Video uploaded and converted successfully!';
// Stop system monitoring updates
{% if system_info %}
stopModalSystemMonitoring();
{% endif %}
document.querySelector('[data-bs-dismiss="modal"]').disabled = false;
}
}, 600);
} else {
progressBar.style.width = `${progress}%`;
progressBar.setAttribute('aria-valuenow', progress);
}
}, 400);
} else {
// Default for other media types
switch(mediaType) {
case 'image':
statusMessage.textContent = 'Uploading images...';
break;
case 'pdf':
statusMessage.textContent = 'Converting PDF to 4K images. This may take a while...';
break;
case 'ppt':
statusMessage.textContent = 'Converting PowerPoint to images (PPTX → PDF → Images). This may take 2-5 minutes...';
break;
default:
statusMessage.textContent = 'Uploading and processing your files. Please wait...';
}
}, 500);
// Simulate progress updates
let interval = setInterval(() => {
const increment = (mediaType === 'image') ? 20 : 5;
progress += increment;
if (progress >= 100) {
clearInterval(interval);
statusMessage.textContent = 'Files uploaded and processed successfully!';
{% if system_info %}
stopModalSystemMonitoring();
{% endif %}
document.querySelector('[data-bs-dismiss="modal"]').disabled = false;
} else {
progressBar.style.width = `${progress}%`;
progressBar.setAttribute('aria-valuenow', progress);
}
}, 500);
}
}
{% if system_info %}

View File

@@ -56,8 +56,39 @@ def convert_video(input_file, output_folder):
return input_file
def convert_video_and_update_playlist(app, file_path, original_filename, target_type, target_id, duration):
print(f"Video conversion skipped for: {file_path}")
return None
import shutil
import tempfile
print(f"Starting video normalization for: {file_path}")
# Only process .mp4 files
if not file_path.lower().endswith('.mp4'):
print(f"Skipping non-mp4 file: {file_path}")
return None
# Prepare temp output file
temp_dir = tempfile.gettempdir()
temp_output = os.path.join(temp_dir, f"normalized_{os.path.basename(file_path)}")
ffmpeg_cmd = [
'ffmpeg', '-y', '-i', file_path,
'-c:v', 'libx264', '-profile:v', 'main',
# Bitrate is not forced, so we allow lower bitrates
'-vf', 'scale=1920:1080,fps=29.97',
'-c:a', 'copy',
temp_output
]
print(f"Running ffmpeg: {' '.join(ffmpeg_cmd)}")
try:
result = subprocess.run(ffmpeg_cmd, capture_output=True, text=True, timeout=1800)
if result.returncode != 0:
print(f"ffmpeg error: {result.stderr}")
return None
# Replace original file with normalized one
shutil.move(temp_output, file_path)
print(f"Video normalized and replaced: {file_path}")
except Exception as e:
print(f"Error during video normalization: {e}")
return None
# No need to update playlist, as filename remains the same
return True
# PDF conversion functions
def convert_pdf_to_images(pdf_file, output_folder, delete_pdf=True, dpi=300):

View File

@@ -0,0 +1,336 @@
import os
import json
import requests
import bcrypt
import re
import datetime
from logging_config import Logger
def send_player_feedback(config, message, status="active", playlist_version=None, error_details=None):
"""
Send feedback to the server about player status.
Args:
config (dict): Configuration containing server details
message (str): Main feedback message
status (str): Player status - "active", "playing", "error", "restarting"
playlist_version (int, optional): Current playlist version being played
error_details (str, optional): Error details if status is "error"
Returns:
bool: True if feedback sent successfully, False otherwise
"""
try:
server = config.get("server_ip", "")
host = config.get("screen_name", "")
quick = config.get("quickconnect_key", "")
port = config.get("port", "")
# Construct server URL
ip_pattern = r'^\d+\.\d+\.\d+\.\d+$'
if re.match(ip_pattern, server):
feedback_url = f'http://{server}:{port}/api/player-feedback'
else:
feedback_url = f'http://{server}/api/player-feedback'
# Prepare feedback data
feedback_data = {
'player_name': host,
'quickconnect_code': quick,
'message': message,
'status': status,
'timestamp': datetime.datetime.now().isoformat(),
'playlist_version': playlist_version,
'error_details': error_details
}
Logger.info(f"Sending feedback to {feedback_url}: {feedback_data}")
# Send POST request
response = requests.post(feedback_url, json=feedback_data, timeout=10)
if response.status_code == 200:
Logger.info(f"Feedback sent successfully: {message}")
return True
else:
Logger.warning(f"Feedback failed with status {response.status_code}: {response.text}")
return False
except requests.exceptions.RequestException as e:
Logger.error(f"Failed to send feedback: {e}")
return False
except Exception as e:
Logger.error(f"Unexpected error sending feedback: {e}")
return False
def send_playlist_check_feedback(config, playlist_version=None):
"""
Send feedback when playlist is checked for updates.
Args:
config (dict): Configuration containing server details
playlist_version (int, optional): Current playlist version
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"
message = f"player {player_name}, is active, Playing {version_info}"
return send_player_feedback(
config=config,
message=message,
status="active",
playlist_version=playlist_version
)
def send_playlist_restart_feedback(config, playlist_version=None):
"""
Send feedback when playlist loop ends and restarts.
Args:
config (dict): Configuration containing server details
playlist_version (int, optional): Current playlist version
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"
message = f"player {player_name}, playlist loop completed, restarting {version_info}"
return send_player_feedback(
config=config,
message=message,
status="restarting",
playlist_version=playlist_version
)
def send_player_error_feedback(config, error_message, playlist_version=None):
"""
Send feedback when an error occurs in the player.
Args:
config (dict): Configuration containing server details
error_message (str): Description of the error
playlist_version (int, optional): Current playlist version
Returns:
bool: True if feedback sent successfully, False otherwise
"""
player_name = config.get("screen_name", "unknown")
message = f"player {player_name}, error occurred"
return send_player_feedback(
config=config,
message=message,
status="error",
playlist_version=playlist_version,
error_details=error_message
)
def send_playing_status_feedback(config, playlist_version=None, current_media=None):
"""
Send feedback about current playing status.
Args:
config (dict): Configuration containing server details
playlist_version (int, optional): Current playlist version
current_media (str, optional): Currently playing media file
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}"
return send_player_feedback(
config=config,
message=message,
status="playing",
playlist_version=playlist_version
)
def is_playlist_up_to_date(local_playlist_path, config):
"""
Compare the version of the local playlist with the server playlist.
Returns True if up-to-date, False otherwise.
"""
import json
if not os.path.exists(local_playlist_path):
Logger.info(f"Local playlist file not found: {local_playlist_path}")
return False
with open(local_playlist_path, 'r') as f:
local_data = json.load(f)
local_version = local_data.get('version', 0)
server_data = fetch_server_playlist(config)
server_version = server_data.get('version', 0)
Logger.info(f"Local playlist version: {local_version}, Server playlist version: {server_version}")
return local_version == server_version
def fetch_server_playlist(config):
"""Fetch the updated playlist from the server using a config dict."""
server = config.get("server_ip", "")
host = config.get("screen_name", "")
quick = config.get("quickconnect_key", "")
port = config.get("port", "")
try:
ip_pattern = r'^\d+\.\d+\.\d+\.\d+$'
if re.match(ip_pattern, server):
server_url = f'http://{server}:{port}/api/playlists'
else:
server_url = f'http://{server}/api/playlists'
params = {
'hostname': host,
'quickconnect_code': quick
}
Logger.info(f"Fetching playlist from URL: {server_url} with params: {params}")
response = requests.get(server_url, params=params)
if response.status_code == 200:
response_data = response.json()
Logger.info(f"Server response: {response_data}")
playlist = response_data.get('playlist', [])
version = response_data.get('playlist_version', None)
hashed_quickconnect = response_data.get('hashed_quickconnect', None)
if version is not None and hashed_quickconnect is not None:
if bcrypt.checkpw(quick.encode('utf-8'), hashed_quickconnect.encode('utf-8')):
Logger.info("Fetched updated playlist from server.")
return {'playlist': playlist, 'version': version}
else:
Logger.error("Quickconnect code validation failed.")
else:
Logger.error("Failed to retrieve playlist or hashed quickconnect from the response.")
else:
Logger.error(f"Failed to fetch playlist. Status Code: {response.status_code}")
except requests.exceptions.RequestException as e:
Logger.error(f"Failed to fetch playlist: {e}")
return {'playlist': [], 'version': 0}
def save_playlist_with_version(playlist_data, playlist_dir):
version = playlist_data.get('version', 0)
playlist_file = os.path.join(playlist_dir, f'server_playlist_v{version}.json')
with open(playlist_file, 'w') as f:
json.dump(playlist_data, f, indent=2)
print(f"Playlist saved to {playlist_file}")
return playlist_file
def download_media_files(playlist, media_dir):
"""Download media files from the server and save them to media_dir."""
if not os.path.exists(media_dir):
os.makedirs(media_dir)
Logger.info(f"Created directory {media_dir} for media files.")
updated_playlist = []
for media in playlist:
file_name = media.get('file_name', '')
file_url = media.get('url', '')
duration = media.get('duration', 10)
local_path = os.path.join(media_dir, file_name)
Logger.info(f"Preparing to download {file_name} from {file_url}...")
if os.path.exists(local_path):
Logger.info(f"File {file_name} already exists. Skipping download.")
else:
try:
response = requests.get(file_url, timeout=10)
if response.status_code == 200:
with open(local_path, 'wb') as file:
file.write(response.content)
Logger.info(f"Successfully downloaded {file_name} to {local_path}")
else:
Logger.error(f"Failed to download {file_name}. Status Code: {response.status_code}")
continue
except requests.exceptions.RequestException as e:
Logger.error(f"Error downloading {file_name}: {e}")
continue
updated_media = {
'file_name': file_name,
'url': os.path.relpath(local_path, os.path.dirname(media_dir)),
'duration': duration
}
updated_playlist.append(updated_media)
return updated_playlist
def delete_old_playlists_and_media(current_version, playlist_dir, media_dir, keep_versions=1):
"""
Delete old playlist files and media files not referenced by the latest playlist version.
keep_versions: number of latest versions to keep (default 1)
"""
# Find all playlist files
playlist_files = [f for f in os.listdir(playlist_dir) if f.startswith('server_playlist_v') and f.endswith('.json')]
# Keep only the latest N versions
versions = sorted([int(f.split('_v')[-1].split('.json')[0]) for f in playlist_files], reverse=True)
keep = set(versions[:keep_versions])
# Delete old playlist files
for f in playlist_files:
v = int(f.split('_v')[-1].split('.json')[0])
if v not in keep:
os.remove(os.path.join(playlist_dir, f))
# Collect all media files referenced by the kept playlists
referenced = set()
for v in keep:
path = os.path.join(playlist_dir, f'server_playlist_v{v}.json')
if os.path.exists(path):
with open(path, 'r') as f:
data = json.load(f)
for item in data.get('playlist', []):
referenced.add(item.get('file_name'))
# Delete media files not referenced
for f in os.listdir(media_dir):
if f not in referenced:
try:
os.remove(os.path.join(media_dir, f))
except Exception as e:
Logger.warning(f"Failed to delete media file {f}: {e}")
def update_playlist_if_needed(local_playlist_path, config, media_dir, playlist_dir):
"""
Fetch the server playlist once, compare versions, and update if needed.
Returns True if updated, False if already up to date.
Also sends feedback to server about playlist check.
"""
import json
server_data = fetch_server_playlist(config)
server_version = server_data.get('version', 0)
if not os.path.exists(local_playlist_path):
local_version = 0
else:
with open(local_playlist_path, 'r') as f:
local_data = json.load(f)
local_version = local_data.get('version', 0)
Logger.info(f"Local playlist version: {local_version}, Server playlist version: {server_version}")
# Send feedback about playlist check
send_playlist_check_feedback(config, server_version if server_version > 0 else local_version)
if local_version != server_version:
if server_data and server_data.get('playlist'):
updated_playlist = download_media_files(server_data['playlist'], media_dir)
server_data['playlist'] = updated_playlist
save_playlist_with_version(server_data, playlist_dir)
# 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.")
# Send error feedback
send_player_error_feedback(config, "No playlist data fetched from server or playlist is empty", local_version)
return False
else:
Logger.info("Local playlist is already up to date.")
return False

1091
code player/player.py Normal file

File diff suppressed because it is too large Load Diff