X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/4ed2ea5a00aa1293135923b513925c46b963be93..HEAD:/src/youtube/utils.py diff --git a/src/youtube/utils.py b/src/youtube/utils.py index 6c95c69..87fcf1a 100644 --- a/src/youtube/utils.py +++ b/src/youtube/utils.py @@ -1,3 +1,4 @@ +import hashlib import os import shutil import subprocess @@ -23,12 +24,24 @@ def link_or_copy(src, dst): def process_to_file(cmdline, prefix='', suffix='', cache_key=None, output_path=None): if not output_path: - tmp = NamedTemporaryFile(prefix=prefix, suffix=suffix, delete=False) + tmp = NamedTemporaryFile( + prefix=prefix, suffix=suffix, delete=False, + dir=settings.FILE_UPLOAD_TEMP_DIR + ) tmp.close() output_path = tmp.name if cache_key: - cache_path = FILE_CACHE + cache_key.replace('/', '__') + cache_path = cache_key.replace('/', '__') + if len(cache_path) > 200: + parts = cache_path.rsplit('.', 1) + limit = 200 - 9 + if len(parts) > 1: + limit -= len(parts[1]) + 1 + cache_path = parts[0][:limit] + '.' + hashlib.sha1(cache_key.encode('utf-8')).hexdigest()[:8] + if len(parts) > 1: + cache_path += '.' + parts[1] + cache_path = FILE_CACHE + cache_path if cache_key and os.path.exists(cache_path): link_or_copy(cache_path, output_path) @@ -59,7 +72,10 @@ def cut_video(video_path, duration): def ffmpeg_concat(paths, suffix, copy=False): - filelist = NamedTemporaryFile(prefix='concat-', suffix='.txt') + filelist = NamedTemporaryFile( + prefix='concat-', suffix='.txt', + dir=settings.FILE_UPLOAD_TEMP_DIR + ) for path in paths: filelist.write(f"file '{path}'\n".encode('utf-8')) filelist.flush()