Update stream_server.py

stream_server.py

@@ -71,7 +71,7 @@ def convert_to_hls(input_path, output_dir, video_name, start_number):
 
 
 
-async def add_video(video_name, m3u8_file_path):
+async def add_video(video_name, output_path, audio_duration):
     """
     Endpoint to add a video to the streaming queue.
 
@@ -98,25 +98,33 @@ async def add_video(video_name, m3u8_file_path):
             segment_counter += num_new_segments
 
     video_names.append(video_name)
-
+    segment_duration = 3
+    full_segments = int(audio_duration // segment_duration)
+    remaining_duration = audio_duration % segment_duration
     existing_segments = set()
-    if m3u8_file_path.exists():
-        with open(m3u8_file_path, 'r') as m3u8_file:
+    if output_path:
+        with open(output_path, 'r') as m3u8_file:
             for line in m3u8_file:
                 if line.startswith('/live_stream/video_stream'):
                     existing_segments.add(line.strip())
 
-    new_ts_files = sorted([f for f in os.listdir(HLS_DIR) if f.startswith('video_stream') and f.endswith('.ts')])
-
-    with open(m3u8_file_path, 'a') as m3u8_file:
-        for ts_file in new_ts_files[-num_new_segments:]:  # Only process the new segments
-            segment_path = f"/live_stream/{ts_file}"
-            if segment_path not in existing_segments:  # Check if already exists
-                m3u8_file.write(f"#EXTINF:3.000,\n")  # Adjust duration as necessary
-                m3u8_file.write(f"{segment_path}\n")
-    
-    # Update concatenated playlist
-    #await concatenate_playlists(video_names, HLS_DIR)
+    new_segments = []
+    # Generate new segment paths
+    for i in range(1, full_segments + 1):
+        new_segment_path = f"/live_stream/video_stream{i}.ts"
+        if new_segment_path not in existing_segments:
+            new_segments.append(new_segment_path)
+
+    with open(output_path, 'a') as m3u8_file:
+        for segment in new_segments:
+            m3u8_file.write(f"#EXTINF:{segment_duration:.3f},\n")
+            m3u8_file.write(f"{segment}\n")
+
+        if remaining_duration > 0:
+            remaining_segment_path = f"/live_stream/video_stream{full_segments + 1}.ts"
+            if remaining_segment_path not in existing_segments:
+                m3u8_file.write(f"#EXTINF:{remaining_duration:.3f},\n")
+                m3u8_file.write(f"{remaining_segment_path}\n")
 
     return {"message": f'"{video_name}" added to the streaming queue.'}