UPDATE: Changed stream access URL to use streamer_name instead of streamer_key, to hide streamer key.

web_server/utils/path_manager.py

@@ -2,16 +2,19 @@
 
 class PathManager():
     def get_vods_path(self, username):
-        return f"stream_data/{username}/vods"
+        return f"stream_data/vods/{username}"
     
     def get_stream_path(self, username):
-        return f"stream_data/{username}/stream"
-    
-    def get_thumbnail_path(self, username):
-        return f"stream_data/{username}/thumbnails"
+        return f"stream_data/stream/{username}"
     
     def get_stream_file_path(self, username):
         return f"{self.get_stream_path(username)}/index.m3u8"
     
-    def get_thumbnail_file_path(self, username):
-        return f"{self.get_thumbnail_path(username)}/stream.jpg"
+    def get_current_stream_thumbnail_file_path(self, username):
+        return f"{self.get_stream_path(username)}/index.jpg"
+    
+    def get_vod_file_path(self, username, vod_id):
+        return f"{self.get_vods_path(username)}/{vod_id}.mp4"
+    
+    def get_vod_thumbnail_file_path(self, username, vod_id):
+        return f"{self.get_vods_path(username)}/{vod_id}.jpg"

web_server/utils/stream_utils.py

@@ -3,6 +3,7 @@ from typing import Optional
 import os, subprocess
 from typing import Optional, List
 from time import sleep
+from utils.path_manager import PathManager
 
 def get_streamer_live_status(user_id: int):
     """
@@ -147,9 +148,10 @@ def create_local_directories(username: str):
     Create directories for user stream data if they do not exist
     """
 
-    vods_path = f"stream_data/vods/{username}"
-    stream_path = f"stream_data/stream"
-    thumbnail_path = f"stream_data/thumbnails/{username}"
+    path_m = PathManager()
+
+    vods_path = path_m.get_vods_path(username)
+    stream_path = path_m.get_stream_path(username)
 
     if not os.path.exists(vods_path):
         os.makedirs(vods_path)
@@ -157,16 +159,11 @@ def create_local_directories(username: str):
     if not os.path.exists(stream_path):
         os.makedirs(stream_path)
 
-    if not os.path.exists(thumbnail_path):
-        os.makedirs(thumbnail_path)
-
     # Fix permissions
     os.chmod(vods_path, 0o777)
     os.chmod(stream_path, 0o777)
-    os.chmod(thumbnail_path, 0o777)
 
     return {
         "vod_path": vods_path,
-        "stream_path": stream_path,
-        "thumbnail_path": thumbnail_path
+        "stream_path": stream_path
     }