From d8efaf35031db7540ca5ffac817345b35ea60992 Mon Sep 17 00:00:00 2001
From: Ilya Simonov <i.simonov@4taps.me>
Date: Tue, 14 Mar 2023 18:26:32 +0800
Subject: [PATCH] fix upload files in folder
---
apps/core/__pycache__/signals.cpython-39.pyc | Bin 1005 -> 980 bytes
apps/core/__pycache__/utils.cpython-39.pyc | Bin 1074 -> 1060 bytes
apps/core/signals.py | 4 ++--
apps/core/tasks.py | 3 ++-
apps/core/utils.py | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/apps/core/__pycache__/signals.cpython-39.pyc b/apps/core/__pycache__/signals.cpython-39.pyc
index db66d6991f78e07ae799763c5687816f185bb061..2a69c16acbb75285c4e42945336ffc47e1937207 100644
GIT binary patch
delta 280
zcmY+9u};G<6h-~~oES_Ub*Y#N5?fjL5D-f@mJsTQHb7drCQ>U$d;tUUf~YDb3ld+#
zz{-?=K>PwWV&M%}_ee)qdSCpL%S=i^{Ebfg>f%X$Kde1iD9Ez%3A!@0z=nlhU>i7U
z;y^9bsKDZeY-!C5FLpM>vR{h4vuh)7#ERD3h-S~mmRa7Sg*2@96kda3j{wBbMg|v%
zB4aWV(fOKJGnLPm?gfr9(ZapMncJtACwP;uy2MQH@2<*hcAG9TGwt|fUYfi#UGJ}?
oX0^!Qh#tCE`aBSjPyr13G@<%1JSw$xW1I{E=;8l3a36T|13<M&fB*mh
delta 305
zcmcb@{+69Lk(ZZ?0SKZ@1X4OC^1iR{0di^>vlxmyfFxs4M+s9F^8ywSJBxWCh|ju!
z4a8f>Sj$|(p2abnA%zjh=LFJBHO#Xa=CanZ0M&5SumDxCqRFw;vZXNBvX^i#;HhD)
zVXI+Z$Xvr153-Lpg(aOag|%0nk&&T<X#pQdJ0n91LokCTn_m@sS!POVezE>9#>uUW
zTFm@K+><vk`Y<zPrcD0Jn5fTJl2MwQl$V&96JL;6l5vYYIX|x?HLv6rb9QRwEgmQ@
zzNE4sbtOZQ{N!Gy8KM$QT#Q1DEQ|t7d`v}(Ku>G(7V%BCVonwXaf;+o35Cg<n3Vu;
CzflMP
diff --git a/apps/core/__pycache__/utils.cpython-39.pyc b/apps/core/__pycache__/utils.cpython-39.pyc
index 95a2501b7e72ceeccaac4029419b89d0b09305e6..5f76382da15298c1967999c5853a4027976e5dd0 100644
GIT binary patch
delta 219
zcmdnQv4n#+k(ZZ?0SJ8T1X7+(<Xz#!1mrjaaWP0Zg|UWlHp5(|U<OSlzbf{!%#_sp
zV*Qms-Yt&IyyB9?yyVnd9BG+3sd<UHsYR?nEk&%8nHeh?IVaaLb}|2A)St}56vGXX
z0LgMpE@skY6rQ}0=`xCFJ+lFaEKq?acaiwy?aT_6qCid*Uv7R`W@<sDUTR8aNq$ig
X3&;pg5FrdAKpLQy!dV=X1z3~-+<7ld
delta 232
zcmZ3&v5A8>k(ZZ?0SIQA2&8<T$h*Ri1;}v*;$k5nk-}KRki{^YA%&@iaW=zTmS6@=
zX1^--vdom!{9^rIjQX04x0o_hG?{L3Wabr@B<3Zj-r`8h%t_5l%uQX%P{cX$dnF_H
z<U+<S)*@D*d6WM!#&B~28AV`%YjP@+E~Cig$xN3~L<^Y>IOKq;G`Wi;Ca+{xuoMGw
nqWE(2%Q907D)mxRGE4G{ia;(c;sy~SAOfTTVl1)+Oe{(OD+e_)
diff --git a/apps/core/signals.py b/apps/core/signals.py
index 379e5f6..739c0b1 100644
--- a/apps/core/signals.py
+++ b/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)
diff --git a/apps/core/tasks.py b/apps/core/tasks.py
index dd59aef..6d7eb64 100644
--- a/apps/core/tasks.py
+++ b/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')
diff --git a/apps/core/utils.py b/apps/core/utils.py
index 45dca4a..75086ba 100644
--- a/apps/core/utils.py
+++ b/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):
--
2.18.1