fix upload files in folder

apps/core/signals.py

@@ -12,10 +12,10 @@ def generate_default_thumbnail_for_video(sender, instance, **kwargs):
     if not instance.thumbnail and instance.local_file:
         if os.path.isfile(instance.local_file.path):
             thumbnail_name = utils.generate_thumbnail(instance.local_file)
-            thumbnail_path = f'{settings.MEDIA_ROOT}videos/{instance.id}/{thumbnail_name}'
+            key = f'videos/{thumbnail_name}'
+            thumbnail_path = f'{settings.MEDIA_ROOT}{key}'
 
             content = utils.get_thumbnail_content(thumbnail_path)
-            key = f'videos/{instance.id}/{thumbnail_name}'
             content_type = 'image/jpeg'
             instance.thumbnail = s3_uploader.upload_file(content, key, content_type)
 

apps/core/tasks.py

@@ -2,6 +2,7 @@ import os
 
 from .models import Video, READY
 from .s3_uploader import upload_file
+from .utils import asset_upload
 
 from cp_video.celery import app
 
@@ -12,7 +13,7 @@ def send_video_to_s3():
 
     for local_video in local_videos:
         video_name = local_video.local_file.name.split('/')[-1]
-        key = f'videos/{local_video.id}/{video_name}'
+        key = asset_upload(local_video, video_name)
         content = local_video.local_file.read()
 
         local_video.s3_file = upload_file(content, key, 'video/mp4')

apps/core/utils.py

@@ -7,7 +7,7 @@ from moviepy.editor import VideoFileClip
 
 
 def asset_upload(instance, filename):
-    return f'videos/{instance.id}/{filename}'
+    return f'videos/{filename}'
 
 
 def generate_thumbnail(video):