From 432fc92f54113118a36e36f22e2e2c726f28246d Mon Sep 17 00:00:00 2001 From: joyfuI Date: Fri, 9 Oct 2020 12:50:03 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=A6=AC=ED=8E=99=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.py | 2 +- templates/youtube-dl_download.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.py b/plugin.py index 5cc284d..e004d76 100644 --- a/plugin.py +++ b/plugin.py @@ -73,7 +73,7 @@ def first_menu(sub): elif sub == 'download': default_filename = ModelSetting.get('default_filename') - arg['file_name'] = default_filename if default_filename else LogicNormal.get_default_filename() + arg['filename'] = 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) diff --git a/templates/youtube-dl_download.html b/templates/youtube-dl_download.html index a4bedf2..8ac5a71 100644 --- a/templates/youtube-dl_download.html +++ b/templates/youtube-dl_download.html @@ -33,7 +33,7 @@
{{ macros.setting_input_text('url', 'URL', placeholder='http:// 주소', desc='유튜브, 네이버TV 등 동영상 주소') }} - {{ macros.setting_input_text('filename', '파일명', value=arg['file_name'], desc='템플릿 규칙은 https://github.com/ytdl-org/youtube-dl/blob/master/README.md#output-template 참고') }} + {{ macros.setting_input_text('filename', '파일명', value=arg['filename'], desc='템플릿 규칙은 https://github.com/ytdl-org/youtube-dl/blob/master/README.md#output-template 참고') }} {{ macros.setting_select('preset', '동영상 포맷 프리셋', arg['preset_list'], col='3') }} {{ macros.setting_input_text('format', '동영상 포맷', desc=['포맷 지정은 https://github.com/ytdl-org/youtube-dl/blob/master/README.md#format-selection 참고', '빈칸으로 두면 최고 화질로 다운로드합니다.']) }} {{ setting_select2('postprocessor', '후처리', arg['postprocessor_list'], col='3', desc='다운로드 후 FFmpeg로 후처리합니다.') }} From d80796ebb9cb6bac0bc62093bd21d1f6cca8185e Mon Sep 17 00:00:00 2001 From: joyfuI Date: Fri, 9 Oct 2020 19:16:22 +0900 Subject: [PATCH 2/2] =?UTF-8?q?download=20API=EC=97=90=EC=84=9C=20filename?= =?UTF-8?q?=20=ED=82=A4=EA=B0=80=20=EC=A0=81=EC=9A=A9=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ info.json | 2 +- my_youtube_dl.py | 2 +- plugin.py | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9f5f793..1be311e 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,9 @@ API에선 직접 비트레이트를 설정할 수 있습니다. 물론 해당 정보가 없으면 null입니다. ## Changelog +v1.6.8 +* download API에서 filename 키가 적용되지 않는 문제 수정 + v1.6.7 * 일부 상황에서 다운로드가 완료로 표시되지 않는 문제 수정 diff --git a/info.json b/info.json index 9d0fbf7..2559281 100644 --- a/info.json +++ b/info.json @@ -1 +1 @@ -{"description": "\uc720\ud29c\ube0c, \ub124\uc774\ubc84TV \ub4f1 \ub3d9\uc601\uc0c1 \uc0ac\uc774\ud2b8\uc5d0\uc11c \ub3d9\uc601\uc0c1 \ub2e4\uc6b4\ub85c\ub4dc", "name": "youtube-dl", "more": "", "version": "1.6.7", "home": "https://github.com/joyfuI/youtube-dl", "category_name": "vod", "developer": "joyfuI"} \ No newline at end of file +{"description": "\uc720\ud29c\ube0c, \ub124\uc774\ubc84TV \ub4f1 \ub3d9\uc601\uc0c1 \uc0ac\uc774\ud2b8\uc5d0\uc11c \ub3d9\uc601\uc0c1 \ub2e4\uc6b4\ub85c\ub4dc", "name": "youtube-dl", "more": "", "version": "1.6.8", "home": "https://github.com/joyfuI/youtube-dl", "category_name": "vod", "developer": "joyfuI"} \ No newline at end of file diff --git a/my_youtube_dl.py b/my_youtube_dl.py index 90fd5bb..c4a48ca 100644 --- a/my_youtube_dl.py +++ b/my_youtube_dl.py @@ -176,7 +176,7 @@ class MyYoutubeDL(object): self.status = { 'downloading': Status.DOWNLOADING, 'error': Status.ERROR, - 'finished': Status.FINISHED # 다운로드 완료. 변환 시작 + 'finished': Status.FINISHED # 다운로드 완료. 변환 시작 }[d['status']] if d['status'] != 'error': self.filename = os.path.basename(d.get('filename')) diff --git a/plugin.py b/plugin.py index e004d76..127e9bf 100644 --- a/plugin.py +++ b/plugin.py @@ -34,7 +34,7 @@ menu = { } plugin_info = { - 'version': '1.6.7', + 'version': '1.6.8', 'name': 'youtube-dl', 'category_name': 'vod', 'developer': 'joyfuI', @@ -202,7 +202,7 @@ 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: + if not filename: filename = LogicNormal.get_default_filename() youtube_dl = LogicNormal.download(plugin=plugin, url=url,