Spaces:

Unicone-Studio
/

instance2

Build error

App Files Files Community

ChandimaPrabath commited on Jul 27, 2024

Commit

f505705

1 Parent(s): 632ec73

test player

Browse files

Files changed (4) hide show

app.py +44 -9
templates/film_details_page.html +1 -1
templates/film_player.html +69 -30
video.py +74 -16

app.py CHANGED Viewed

@@ -1,10 +1,10 @@
-# app.py
 from flask import Flask, jsonify, render_template, request, Response
 import os
 import json
 import re
 import urllib.parse
 from threading import Thread
 from video import ffmpeg_stream
 from indexer import indexer
 from dotenv import load_dotenv
@@ -92,8 +92,22 @@ def start_prefetching():
     prefetch_metadata()
 def generate(file_url):
     token = TOKEN
-    output_stream = ffmpeg_stream(file_url, token)
 thread = Thread(target=start_prefetching)
 thread.daemon = True
@@ -111,7 +125,10 @@ def tvshow_player():
 @app.route('/film_player')
 def film_player():
-    return render_template('film_player.html')
 @app.route('/films')
 def films():
@@ -184,18 +201,36 @@ def get_metadata():
     return jsonify({'error': 'Metadata not found'}), 404
-@app.route('/stream')
 def stream_video():
     file_path = request.args.get('path')
     if not file_path:
         return "File path not provided", 400
     file_url = f"https://huggingface.co/{REPO}/resolve/main/{file_path}"
-    return Response(generate(file_url), mimetype="video/mp4")
-@app.route('/film/<path:title>')
-def film_details(title):
-    return render_template('film_details_page.html', title=title)
 if __name__ == '__main__':
     app.run(debug=True, host="0.0.0.0", port=7860)

 from flask import Flask, jsonify, render_template, request, Response
 import os
 import json
 import re
 import urllib.parse
 from threading import Thread
+import uuid
 from video import ffmpeg_stream
 from indexer import indexer
 from dotenv import load_dotenv
     prefetch_metadata()
 def generate(file_url):
+    # Generate a unique stream ID
+    stream_id = str(uuid.uuid4())
+    output_dir = os.path.join(CACHE_DIR, "stream", stream_id)
+    # Ensure output directory exists
+    if not os.path.exists(output_dir):
+        os.makedirs(output_dir)
+    # Set up HLS streaming
     token = TOKEN
+    output_path, process = ffmpeg_stream(file_url, token, output_dir=output_dir)
+    if output_path:
+        # Return the unique stream ID for later use
+        return stream_id
+    return None
 thread = Thread(target=start_prefetching)
 thread.daemon = True
 @app.route('/film_player')
 def film_player():
+    title = request.args.get('title')
+    if not title:
+        return "No film title provided", 400
+    return render_template('film_player.html', title=urllib.parse.unquote(title))
 @app.route('/films')
 def films():
     return jsonify({'error': 'Metadata not found'}), 404
+@app.route('/film/<path:title>')
+def film_details(title):
+    return render_template('film_details_page.html', title=title)
+@app.route('/api/stream')
 def stream_video():
     file_path = request.args.get('path')
     if not file_path:
         return "File path not provided", 400
     file_url = f"https://huggingface.co/{REPO}/resolve/main/{file_path}"
+    stream_id = generate(file_url)
+    if stream_id:
+        # Return the UUID for the client to use
+        return jsonify({'stream_id': stream_id})
+    return "Streaming error", 500
+@app.route('/stream/<stream_id>')
+def stream_file(stream_id):
+    stream_dir = os.path.join(CACHE_DIR, "stream", stream_id)
+    playlist_path = os.path.join(stream_dir, 'output.m3u8')
+    if os.path.exists(playlist_path):
+        return Response(
+            open(playlist_path, 'rb').read(),
+            mimetype='application/vnd.apple.mpegurl'
+        )
+    return "Stream not found", 404
 if __name__ == '__main__':
     app.run(debug=True, host="0.0.0.0", port=7860)

templates/film_details_page.html CHANGED Viewed

@@ -172,7 +172,7 @@
             metadataContainer.appendChild(createMetadataElement('Release Date', metadata.first_air_time));
             const playButton = document.getElementById('play-button');
-            playButton.href = `/stream?path=${encodeURIComponent(data.file_path)}`;
         }
         const urlParams = new URLSearchParams(window.location.search);

             metadataContainer.appendChild(createMetadataElement('Release Date', metadata.first_air_time));
             const playButton = document.getElementById('play-button');
+            playButton.href = `/film_player?title=${encodeURIComponent(title)}`;
         }
         const urlParams = new URLSearchParams(window.location.search);

templates/film_player.html CHANGED Viewed

@@ -1,50 +1,89 @@
 <!DOCTYPE html>
-<html>
 <head>
-    <title>Media Player</title>
     <style>
         body {
             font-family: Arial, sans-serif;
-            background-color: #141414;
-            color: #fff;
             margin: 0;
             padding: 0;
         }
-        .header {
-            background-color: #000;
-            padding: 20px;
-            text-align: center;
-        }
-        .header h1 {
-            margin: 0;
-            font-size: 24px;
-        }
-        .content {
-            padding: 20px;
-        }
-        .player-container {
-            max-width: 100%;
             margin: auto;
-            text-align: center;
         }
         video {
             width: 100%;
             height: auto;
-            background-color: #333;
         }
     </style>
 </head>
 <body>
-    <div class="header">
-        <h1>Movie Player</h1>
-    </div>
-    <div class="content">
-        <div class="player-container">
-            <video id="videoPlayer" controls>
-                <source id="videoSource" type="video/mp4">
-                Your browser does not support the video tag.
-            </video>
-        </div>
     </div>
 </body>
 </html>

 <!DOCTYPE html>
+<html lang="en">
 <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Film Player</title>
     <style>
         body {
             font-family: Arial, sans-serif;
             margin: 0;
             padding: 0;
+            background-color: #f0f0f0;
         }
+        .container {
+            max-width: 800px;
             margin: auto;
+            padding: 20px;
+            background-color: #fff;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+            border-radius: 8px;
         }
         video {
             width: 100%;
             height: auto;
+            border-radius: 8px;
+        }
+        .title {
+            font-size: 24px;
+            font-weight: bold;
+            margin-bottom: 20px;
+        }
+        .error {
+            color: red;
+            font-size: 18px;
+            margin-top: 20px;
         }
     </style>
 </head>
 <body>
+    <div class="container">
+        <div class="title" id="filmTitle">Film Title</div>
+        <video id="videoPlayer" controls>
+            <source id="videoSource" type="application/vnd.apple.mpegurl">
+            Your browser does not support the video tag.
+        </video>
+        <div id="error" class="error"></div>
     </div>
+    <script>
+        document.addEventListener("DOMContentLoaded", function() {
+            const queryParams = new URLSearchParams(window.location.search);
+            const filmTitle = queryParams.get('title');
+            if (!filmTitle) {
+                document.getElementById('error').innerText = 'No film title provided.';
+                return;
+            }
+            // Display the film title
+            document.getElementById('filmTitle').innerText = decodeURIComponent(filmTitle);
+            // Fetch film metadata and stream URL
+            fetch(`/api/film/${encodeURIComponent(filmTitle)}`)
+                .then(response => response.json())
+                .then(data => {
+                    if (data.file_path) {
+                        return fetch(`/api/stream?path=${encodeURIComponent(data.file_path)}`);
+                    } else {
+                        throw new Error('File path not found.');
+                    }
+                })
+                .then(response => response.json())
+                .then(data => {
+                    if (data.stream_id) {
+                        // Update video source with the stream URL
+                        const videoSource = document.getElementById('videoSource');
+                        videoSource.src = `/stream/${data.stream_id}`;
+                        document.getElementById('videoPlayer').load();
+                    } else {
+                        throw new Error('Stream ID not found.');
+                    }
+                })
+                .catch(error => {
+                    document.getElementById('error').innerText = `Error: ${error.message}`;
+                });
+        });
+    </script>
 </body>
 </html>

video.py CHANGED Viewed

@@ -1,21 +1,79 @@
-from ffmpy import FFmpeg
-def ffmpeg_stream(file_url,token, output="tmp/cache/output.mp4"):
     try:
-        # Set up the FFmpeg command with quality options
-        ff = FFmpeg(
-            inputs={
-                file_url: None
-            },
-            outputs={
-                f'{output}': '-c:v libx264 -crf 23 -preset medium -c:a aac -b:a 192k'
-            },
-            global_options= f'-headers "Authorization: Bearer {token}"'
-        )
-        # Run the command
-        ff.run()
     except Exception as e:
-        print(f"Error using FFmpeg to stream file: {e}")
-        return None

+import os
+import subprocess
+import logging
+import uuid
+# Set up logging
+logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
+def ffmpeg_stream(file_url, token, output_dir="tmp/cache/stream"):
+    # Create unique directory for each stream using UUID
+    stream_id = str(uuid.uuid4())
+    stream_dir = os.path.join(output_dir, stream_id)
+    if not os.path.exists(stream_dir):
+        os.makedirs(stream_dir)
+        logging.info(f"Created directory: {stream_dir}")
+    else:
+        logging.info(f"Directory already exists: {stream_dir}")
+    # Set up the FFmpeg command for HLS
+    output_path = os.path.join(stream_dir, 'output.m3u8')
+    segment_filename = os.path.join(stream_dir, 'segment_%03d.ts')
+    ffmpeg_command = [
+        'ffmpeg',
+        '-headers', f'Authorization: Bearer {token}',
+        '-i', file_url,
+        '-c:v', 'libx264',
+        '-crf', '23',
+        '-preset', 'medium',
+        '-c:a', 'aac',
+        '-b:a', '192k',
+        '-f', 'hls',
+        '-hls_time', '10',
+        '-hls_list_size', '0',
+        '-hls_segment_filename', segment_filename,
+        output_path
+    ]
     try:
+        # Log the command being executed
+        logging.debug(f"Running FFmpeg command: {' '.join(ffmpeg_command)}")
+        # Run the FFmpeg command
+        process = subprocess.Popen(
+            ffmpeg_command,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+        # Capture stdout and stderr
+        stdout, stderr = process.communicate()
+        # Log FFmpeg output
+        logging.debug("FFmpeg stdout: %s", stdout.decode())
+        logging.error("FFmpeg stderr: %s", stderr.decode())
+        # Check if the output file was created
+        if os.path.exists(output_path):
+            logging.info(f"HLS playlist created at {output_path}")
+        else:
+            logging.error(f"HLS playlist not created at {output_path}")
+        # Return the unique stream ID and process
+        return stream_id, process
     except Exception as e:
+        logging.error(f"Error using FFmpeg to stream file: {e}")
+        return None, None
+# # Example usage
+# if __name__ == "__main__":
+#     url = "https://huggingface.co/Unicone-Studio/jellyfin_media/resolve/main/films/Funky%20Monkey%202004/Funky%20Monkey%20(2004)%20Web-dl%201080p.mp4"
+#     token = os.getenv("TOKEN")
+#     stream_id, process = ffmpeg_stream(url, token)
+#     if stream_id:
+#         logging.info(f"HLS playlist created with stream ID: {stream_id}")
+#     else:
+#         logging.error("Failed to create HLS playlist.")