From 64ce8c1d05d335d03a15e3b5f9f11336eaa5e770 Mon Sep 17 00:00:00 2001 From: joyfuI Date: Fri, 26 Feb 2021 00:08:01 +0900 Subject: [PATCH] =?UTF-8?q?yt-dlp=20=ED=8C=A8=ED=82=A4=EC=A7=80=EB=AA=85?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ info.json | 2 +- logic_normal.py | 9 +++++++-- plugin.py | 2 +- static/youtube-dl_download.js | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9f2102c..c7ab747 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,9 @@ API를 제공합니다. 다른 플러그인에서 동영상 정보나 다운로 물론 해당 정보가 없으면 null입니다. ## Changelog +v2.3.1 +* yt-dlp 패키지명 변경 대응 + v2.3.0 * youtube-dlc를 yt-dlp로 변경 youtube-dlc가 2개월 넘게 커밋이 없어서 youtube-dlc의 포크 프로젝트인 yt-dlp로 변경했습니다. diff --git a/info.json b/info.json index 96e1b2b..dd5eb8e 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": "2.3.0", "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": "2.3.1", "home": "https://github.com/joyfuI/youtube-dl", "category_name": "vod", "developer": "joyfuI"} \ No newline at end of file diff --git a/logic_normal.py b/logic_normal.py index 4b244b9..77dd234 100644 --- a/logic_normal.py +++ b/logic_normal.py @@ -17,7 +17,7 @@ class LogicNormal(object): @staticmethod def get_youtube_dl_package(index=None, import_pkg=False): packages = ['youtube-dl', 'yt-dlp'] - import_name = ['youtube_dl', 'youtube_dlc'] + import_name = ['youtube_dl', 'yt_dlp'] if import_pkg: return import_name if index is None else import_name[int(index)] else: @@ -25,7 +25,12 @@ class LogicNormal(object): @staticmethod def get_youtube_dl_version(): - return MyYoutubeDL.get_version() + try: + return MyYoutubeDL.get_version() + except Exception as e: + logger.error('Exception:%s', e) + logger.error(traceback.format_exc()) + return '패키지 임포트 실패' @staticmethod def get_default_filename(): diff --git a/plugin.py b/plugin.py index d1b7142..6752c25 100644 --- a/plugin.py +++ b/plugin.py @@ -47,7 +47,7 @@ menu = { } plugin_info = { - 'version': '2.3.0', + 'version': '2.3.1', 'name': 'youtube-dl', 'category_name': 'vod', 'developer': 'joyfuI', diff --git a/static/youtube-dl_download.js b/static/youtube-dl_download.js index 08a3b34..1ff644b 100644 --- a/static/youtube-dl_download.js +++ b/static/youtube-dl_download.js @@ -1,6 +1,6 @@ "use strict"; -const url = document.getElementById('url').value; +const url = document.getElementById('url'); const preset = document.getElementById('preset'); const format = document.getElementById('format'); const postprocessor = document.getElementById('postprocessor');