From 5a91d34f6edca55789e345344397b27f44557c35 Mon Sep 17 00:00:00 2001 From: joyfuI Date: Sat, 8 Aug 2020 15:33:14 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=AA=85=20=EC=84=A4=EC=A0=95=20=EA=B4=80=EB=A0=A8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logic_normal.py | 4 ++++ my_youtube_dl.py | 2 ++ plugin.py | 5 ++++- templates/youtube-dl_download.html | 3 ++- templates/youtube-dl_setting.html | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/logic_normal.py b/logic_normal.py index 5c46b91..e70b8d1 100644 --- a/logic_normal.py +++ b/logic_normal.py @@ -19,6 +19,10 @@ class LogicNormal(object): def get_youtube_dl_version(): return MyYoutubeDL.get_version() + @staticmethod + def get_default_filename(): + return MyYoutubeDL.DEFAULT_FILENAME + @staticmethod def get_preset_list(): return [ diff --git a/my_youtube_dl.py b/my_youtube_dl.py index 61e1119..25766ef 100644 --- a/my_youtube_dl.py +++ b/my_youtube_dl.py @@ -40,6 +40,8 @@ class Status(Enum): class MyYoutubeDL(object): + DEFAULT_FILENAME = '%(title)s-%(id)s.%(ext)s' + __index = 0 _last_msg = '' diff --git a/plugin.py b/plugin.py index 0b52e42..e273dc1 100644 --- a/plugin.py +++ b/plugin.py @@ -68,11 +68,12 @@ def first_menu(sub): if sub == 'setting': arg.update(ModelSetting.to_dict()) arg['youtube_dl_version'] = LogicNormal.get_youtube_dl_version() + arg['DEFAULT_FILENAME'] = LogicNormal.get_default_filename() return render_template('%s_%s.html' % (package_name, sub), arg=arg) elif sub == 'download': default_filename = ModelSetting.get('default_filename') - arg['file_name'] = default_filename if default_filename else '%(title)s-%(id)s.%(ext)s' + arg['file_name'] = default_filename if default_filename else LogicNormal.get_default_filename() arg['preset_list'] = LogicNormal.get_preset_list() arg['postprocessor_list'] = LogicNormal.get_postprocessor_list() return render_template('%s_%s.html' % (package_name, sub), arg=arg) @@ -201,6 +202,8 @@ def api(sub): return LogicNormal.abort(ret, 2) # 잘못된 동영상 주소 if preferredcodec not in (None, 'best', 'mp3', 'aac', 'flac', 'm4a', 'opus', 'vorbis', 'wav'): return LogicNormal.abort(ret, 5) # 허용되지 않은 값이 있음 + if filename: + filename = LogicNormal.get_default_filename() youtube_dl = LogicNormal.download(plugin=plugin, url=url, filename=filename, diff --git a/templates/youtube-dl_download.html b/templates/youtube-dl_download.html index 2d7fa9c..e1b94a7 100644 --- a/templates/youtube-dl_download.html +++ b/templates/youtube-dl_download.html @@ -1,3 +1,5 @@ +{% extends "base.html" %} + {% macro setting_select2(id, title, options, col='9', desc=None, value=None) %} {{ macros.setting_top(title) }}
@@ -27,7 +29,6 @@ {{ macros.setting_bottom(desc) }} {% endmacro %} -{% extends "base.html" %} {% block content %}
diff --git a/templates/youtube-dl_setting.html b/templates/youtube-dl_setting.html index 21f930a..2fd8008 100644 --- a/templates/youtube-dl_setting.html +++ b/templates/youtube-dl_setting.html @@ -7,7 +7,7 @@ {{ macros.setting_input_text_and_buttons('ffmpeg_path', 'FFmpeg 경로', [['ffmpeg_version', '버전확인']], value=arg['ffmpeg_path'], placeholder='ffmpeg', desc='SJVA에 내장된 버전 말고 원하는 버전을 사용할 수 있습니다.') }} {{ macros.setting_input_text('temp_path', '임시 폴더', value=arg['temp_path'], desc='다운로드 파일이 임시로 저장될 폴더입니다.') }} {{ macros.setting_input_text('save_path', '저장 폴더', value=arg['save_path'], desc='정상적으로 완료된 파일이 이동할 폴더입니다.') }} - {{ macros.setting_input_text('default_filename', '기본 파일명', value=arg['default_filename'], placeholder='%(title)s-%(id)s.%(ext)s', desc='템플릿 규칙은 https://github.com/ytdl-org/youtube-dl/blob/master/README.md#output-template 참고') }} + {{ macros.setting_input_text('default_filename', '기본 파일명', value=arg['default_filename'], placeholder=arg['DEFAULT_FILENAME'], desc='템플릿 규칙은 https://github.com/ytdl-org/youtube-dl/blob/master/README.md#output-template 참고') }} {{ macros.setting_input_text('proxy', '프록시', value=arg['proxy'], desc=['HTTP/HTTPS/SOCKS를 지원합니다. 예) socks5://127.0.0.1:1080/', '빈칸으로 두면 프록시를 사용하지 않습니다.']) }} {{ macros.setting_checkbox('activate_cors', 'CORS 허용', value=arg['activate_cors'], desc='API로의 크로스 도메인 요청을 허용합니다. 설정 저장 후 재시작이 필요합니다.') }} {{ macros.setting_button([['global_setting_save_btn', '저장']]) }}