fix app.py

app.py

@@ -33,23 +33,23 @@ def prefetch_metadata():
             for sub_item in item['contents']:
                 original_title = sub_item['path'].split('/')[-1]
                 media_type = 'series' if item['path'].startswith('tv') else 'movie'
-                title = original_title
-                year = None
-                
-                match = re.search(r'\((\d{4})\)', original_title)
-                if match:
-                    year_str = match.group(1)
-                    if year_str.isdigit() and len(year_str) == 4:
-                        title = original_title[:match.start()].strip()
-                        year = int(year_str)
-                else:
-                    parts = original_title.rsplit(' ', 1)
-                    if len(parts) > 1 and parts[-1].isdigit() and len(parts[-1]) == 4:
-                        title = parts[0].strip()
-                        year = int(parts[-1])
+                title, year = extract_title_and_year(original_title)
                 
                 fetch_and_cache_json(original_title, title, media_type, year)
 
+def extract_title_and_year(original_title):
+    match = re.search(r'\((\d{4})\)', original_title)
+    if match:
+        year_str = match.group(1)
+        if year_str.isdigit() and len(year_str) == 4:
+            title = original_title[:match.start()].strip()
+            return title, int(year_str)
+    else:
+        parts = original_title.rsplit(' ', 1)
+        if len(parts) > 1 and parts[-1].isdigit() and len(parts[-1]) == 4:
+            return parts[0].strip(), int(parts[-1])
+    return original_title, None
+
 def get_film_file_path(title):
     decoded_title = urllib.parse.unquote(title)
     normalized_title = decoded_title.split(' (')[0].strip()
@@ -74,13 +74,10 @@ def get_tv_show_seasons(title):
                 if sub_item['type'] == 'directory' and title in sub_item['path']:
                     for season in sub_item['contents']:
                         if season['type'] == 'directory':
-                            episodes = []
-                            for episode in season['contents']:
-                                if episode['type'] == 'file':
-                                    episodes.append({
-                                        "title": episode['path'].split('/')[-1],
-                                        "path": episode['path']
-                                    })
+                            episodes = [
+                                {"title": episode['path'].split('/')[-1], "path": episode['path']}
+                                for episode in season['contents'] if episode['type'] == 'file'
+                            ]
                             seasons.append({
                                 "season": season['path'].split('/')[-1],
                                 "episodes": episodes
@@ -102,8 +99,11 @@ def generate(file_url):
 
     # Set up HLS streaming
     token = TOKEN
-    _, _ = ffmpeg_stream(file_url, token, output_dir=output_dir, stream_id=stream_id)
-    return stream_id
+    output_path = ffmpeg_stream(file_url, token, output_dir=output_dir, stream_id=stream_id)
+    
+    if output_path:
+        return stream_id
+    return None
 
 thread = Thread(target=start_prefetching)
 thread.daemon = True
@@ -211,7 +211,6 @@ def stream_video():
     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

video.py

@@ -1,7 +1,6 @@
 import os
 import logging
 import ffmpeg
-import uuid
 
 # Set up logging
 logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -37,15 +36,15 @@ def ffmpeg_stream(file_url, token, output_dir="tmp/cache/stream", stream_id=None
                     hls_segment_filename=segment_filename)
         )
 
-        process.run()
+        process.run(capture_stdout=True, capture_stderr=True)
 
         # Check if the output file was created
         if os.path.exists(output_path):
             logging.info(f"HLS playlist created at {output_path}")
+            return output_path
         else:
             logging.error(f"HLS playlist not created at {output_path}")
-
-        return output_path
+            return None
 
     except ffmpeg.Error as e:
         error_message = e.stderr.decode('utf8') if e.stderr else str(e)