From 3318a117884ca953e0a7d7329696314d5fd7efb0 Mon Sep 17 00:00:00 2001 From: joyfuI Date: Sun, 11 Oct 2020 12:23:38 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EB=A9=94=EB=89=B4?= =?UTF-8?q?=EC=97=90=20=EC=A0=84=EC=B2=B4=20=EC=A4=91=EC=A7=80=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ info.json | 2 +- plugin.py | 7 ++++++- templates/youtube-dl_download.html | 4 ++-- templates/youtube-dl_list.html | 20 ++++++++++++++++++++ 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4d64558..93af164 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,9 @@ API에선 직접 비트레이트를 설정할 수 있습니다. 물론 해당 정보가 없으면 null입니다. ## Changelog +v1.6.11 +* 목록 메뉴에 전체 중지 버튼 추가 + v1.6.10 * CORS 허용 설정이 작동하지 않는 문제 수정 Thanks to [dbswnschl](https://github.com/dbswnschl) diff --git a/info.json b/info.json index 0a315c6..fd7d7e8 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.10", "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.11", "home": "https://github.com/joyfuI/youtube-dl", "category_name": "vod", "developer": "joyfuI"} \ No newline at end of file diff --git a/plugin.py b/plugin.py index f52dc8d..714c5a9 100644 --- a/plugin.py +++ b/plugin.py @@ -43,7 +43,7 @@ menu = { } plugin_info = { - 'version': '1.6.10', + 'version': '1.6.11', 'name': 'youtube-dl', 'category_name': 'vod', 'developer': 'joyfuI', @@ -149,6 +149,11 @@ def ajax(sub): ret.append(data) return jsonify(ret) + elif sub == 'all_stop': + for i in LogicNormal.youtube_dl_list: + i.stop() + return jsonify([]) + elif sub == 'stop': index = int(request.form['index']) LogicNormal.youtube_dl_list[index].stop() diff --git a/templates/youtube-dl_download.html b/templates/youtube-dl_download.html index 8ac5a71..f55baa4 100644 --- a/templates/youtube-dl_download.html +++ b/templates/youtube-dl_download.html @@ -37,7 +37,7 @@ {{ 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로 후처리합니다.') }} - {{ macros.setting_button([['download_start', '다운로드']]) }} + {{ macros.setting_button([['download_btn', '다운로드']]) }}