fix video

app.py

@@ -19,11 +19,11 @@ CACHE_DIR = os.getenv("CACHE_DIR")
 if not os.path.exists(CACHE_DIR):
     os.makedirs(CACHE_DIR)
 
-indexer()
-
 if not os.path.exists(INDEX_FILE):
     raise FileNotFoundError(f"{INDEX_FILE} not found. Please make sure the file exists.")
 
+indexer()
+
 with open(INDEX_FILE, 'r') as f:
     file_structure = json.load(f)
 
@@ -102,10 +102,9 @@ def generate(file_url):
 
     # Set up HLS streaming
     token = TOKEN
-    process = ffmpeg_stream(file_url, token, output_dir=output_dir)
+    _, _ = ffmpeg_stream(file_url, token, output_dir=output_dir, stream_id=stream_id)
     return stream_id
 
-
 thread = Thread(target=start_prefetching)
 thread.daemon = True
 thread.start()
@@ -219,8 +218,8 @@ def stream_video():
 
 @app.route('/stream/<stream_id>')
 def stream_file(stream_id):
-    stream_dir = CACHE_DIR+"/stream/"+stream_id
-    playlist_path = stream_dir+'/output.m3u8'
+    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(

requirements.txt

@@ -2,4 +2,5 @@ flask
 Flask-Cors
 requests
 python-dotenv
-ffmpy
+ffmpy
+ffmpeg-python

video.py

@@ -1,15 +1,14 @@
 import os
 import logging
+import ffmpeg
 import uuid
-from ffmpy import FFmpeg
 
 # 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"):
+def ffmpeg_stream(file_url, token, output_dir="tmp/cache/stream", stream_id=None):
     # Generate a unique directory for the stream
-    unique_id = str(uuid.uuid4())
-    stream_dir = os.path.join(output_dir, unique_id)
+    stream_dir = os.path.join(output_dir, stream_id) if stream_id else os.path.join(output_dir, str(uuid.uuid4()))
     
     if not os.path.exists(stream_dir):
         os.makedirs(stream_dir)
@@ -17,23 +16,28 @@ def ffmpeg_stream(file_url, token, output_dir="tmp/cache/stream"):
     # Set the output paths
     output_path = os.path.join(stream_dir, 'output.m3u8')
     segment_filename = os.path.join(stream_dir, 'segment_%03d.ts')
-    file_url = "'"+file_url+"'"
-    # Construct the FFmpeg command using ffmpy
-    ff = FFmpeg(
-        inputs={file_url: None},
-        outputs={
-            output_path: f'-c:v libx264 -crf 23 -preset medium -c:a aac -b:a 192k -f hls '
-                         f'-hls_time 10 -hls_list_size 0 -hls_segment_filename {segment_filename}'
-        },
-        global_options=f'-headers \"Authorization: Bearer {token}\r\n"'
-    )
+
+    # Log the URL and output paths
+    logging.debug(f"URL: {file_url}")
+    logging.debug(f"Output Path: {output_path}")
+    logging.debug(f"Segment Filename: {segment_filename}")
 
     try:
         # Log the command being executed
-        logging.debug(f"Running FFmpeg command: {ff.cmd}")
-        
-        # Run the FFmpeg command
-        ff.run()
+        logging.debug(f"Starting FFmpeg process with URL: {file_url}")
+
+        # Run the FFmpeg command using ffmpeg-python
+        process = (
+            ffmpeg
+            .input(file_url, headers=f"Authorization: Bearer {token}")
+            .output(output_path, 
+                    vcodec='libx264', crf=23, preset='medium', 
+                    acodec='aac', audio_bitrate='192k', format='hls', 
+                    hls_time=10, hls_list_size=0, 
+                    hls_segment_filename=segment_filename)
+        )
+
+        process.run()
 
         # Check if the output file was created
         if os.path.exists(output_path):
@@ -41,18 +45,9 @@ def ffmpeg_stream(file_url, token, output_dir="tmp/cache/stream"):
         else:
             logging.error(f"HLS playlist not created at {output_path}")
 
-        return unique_id, output_path
-
-    except Exception as e:
-        logging.error(f"Error using FFmpeg to stream file: {e}")
-        return None, None
-
-# Uncomment and modify the following lines if you want to test the script
-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, output_path = 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.")
+        return output_path
+
+    except ffmpeg.Error as e:
+        error_message = e.stderr.decode('utf8') if e.stderr else str(e)
+        logging.error(f"Error using FFmpeg to stream file: {error_message}")
+        return None