ske087
05194a19b6
- New route GET /players/<id>/edited-media-report with tabular report - New template edited_media_report.html with User/Filename/Date/Link columns - Launch Report button (green) next to View All Edited Media button - Fix: on first edit, move original file to versionized folder as original_<name> - Fix: content lookup fallback via PlayerEdit records and path regex - Keep Content.filename pointing to latest edit for player playlist
117 lines
4.4 KiB
Python
117 lines
4.4 KiB
Python
"""Background task execution for long-running operations."""
|
|
import threading
|
|
import logging
|
|
from typing import Callable, Any, Dict
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def run_background_task(task_func: Callable, *args, **kwargs) -> threading.Thread:
|
|
"""Run a function in a background thread, with a Flask app context pushed."""
|
|
from flask import current_app
|
|
# Capture the app instance now (in the request context) so the thread can use it
|
|
app = current_app._get_current_object()
|
|
|
|
def wrapper():
|
|
with app.app_context():
|
|
try:
|
|
logger.info(f"Starting background task: {task_func.__name__}")
|
|
task_func(*args, **kwargs)
|
|
logger.info(f"Completed background task: {task_func.__name__}")
|
|
except Exception as e:
|
|
logger.error(f"Background task failed ({task_func.__name__}): {str(e)}", exc_info=True)
|
|
|
|
thread = threading.Thread(target=wrapper, daemon=True)
|
|
thread.start()
|
|
return thread
|
|
|
|
|
|
def background_player_deployment(
|
|
hostname: str,
|
|
username: str,
|
|
password: str,
|
|
player_name: str,
|
|
player_id: int,
|
|
port: int = 22,
|
|
server_url: str = None,
|
|
server_api_key: str = None,
|
|
player_hostname: str = None,
|
|
quickconnect_code: str = None,
|
|
orientation: str = 'Landscape',
|
|
verify_ssl: bool = False
|
|
) -> None:
|
|
"""
|
|
Deploy player code to host in background.
|
|
|
|
Args:
|
|
hostname: SSH hostname/IP
|
|
username: SSH username
|
|
password: SSH password
|
|
player_name: Player name
|
|
player_id: Player database ID
|
|
port: SSH port
|
|
server_url: DigiServer URL for player
|
|
server_api_key: API key for player
|
|
player_hostname: Player screen identity used for auth (Player.hostname)
|
|
quickconnect_code: Quick connect code used for auth
|
|
orientation: Player orientation (Landscape/Portrait)
|
|
verify_ssl: Whether the player should verify the server TLS certificate
|
|
"""
|
|
from app.utils.ssh_deploy import deploy_player_to_host
|
|
from app.models import Player
|
|
from app.extensions import db
|
|
from app.utils.logger import log_action
|
|
|
|
from datetime import datetime
|
|
|
|
# Mark deployment as "in progress" immediately so the UI can show live status
|
|
player = Player.query.get(player_id)
|
|
if player:
|
|
player.deployment_status = 'deploying'
|
|
player.last_deployment_at = datetime.utcnow()
|
|
player.last_deployment_status = None
|
|
player.last_deployment_message = 'Deployment in progress...'
|
|
db.session.commit()
|
|
|
|
try:
|
|
# Execute deployment
|
|
result = deploy_player_to_host(
|
|
hostname=hostname,
|
|
username=username,
|
|
password=password,
|
|
player_name=player_name,
|
|
port=port,
|
|
server_url=server_url,
|
|
server_api_key=server_api_key,
|
|
player_hostname=player_hostname,
|
|
quickconnect_code=quickconnect_code,
|
|
orientation=orientation,
|
|
verify_ssl=verify_ssl
|
|
)
|
|
|
|
# Update player with deployment status
|
|
player = Player.query.get(player_id)
|
|
if player:
|
|
if result.get('success'):
|
|
player.deployment_status = 'deployed'
|
|
player.last_deployment_status = 'success'
|
|
player.last_deployment_message = result.get('message', 'Deployment successful')
|
|
log_action('info', f'Background deployment completed for player "{player_name}": {result["message"]}')
|
|
else:
|
|
player.deployment_status = 'failed'
|
|
player.last_deployment_status = 'failed'
|
|
player.last_deployment_message = result.get('error', result.get('message', 'Deployment failed'))
|
|
log_action('error', f'Background deployment failed for player "{player_name}": {result.get("error", result.get("message"))}')
|
|
|
|
db.session.commit()
|
|
|
|
except Exception as e:
|
|
logger.error(f"Background deployment error for player '{player_name}': {str(e)}", exc_info=True)
|
|
player = Player.query.get(player_id)
|
|
if player:
|
|
player.deployment_status = 'failed'
|
|
player.last_deployment_status = 'failed'
|
|
player.last_deployment_message = f'Deployment crashed: {str(e)}'
|
|
db.session.commit()
|
|
log_action('error', f'Background deployment error for player "{player_name}": {str(e)}')
|