upload feedbackto server

app/app.py

@@ -1,3 +1,25 @@
+# Player feedback API
+from models.player_feedback import PlayerFeedback
+# --- API route to receive player feedback ---
+@app.route('/api/player-feedback', methods=['POST'])
+def api_player_feedback():
+    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
+
+    feedback = PlayerFeedback(
+        player_name=data['player_name'],
+        quickconnect_code=data['quickconnect_code'],
+        message=data['message'],
+        status=data['status'],
+        timestamp=data['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
 import os
 import click
 import psutil

app/models/__init__.py

@@ -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

app/models/player_feedback.py

@@ -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)

app/templates/upload_content.html

@@ -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 %}

app/utils/uploads.py

@@ -1,4 +1,4 @@
-import os
+ import os
 import subprocess
 from flask import Flask
 from werkzeug.utils import secure_filename
@@ -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):