From 7bec0524e6cb613e1e02750761d59bf838f3f2ec Mon Sep 17 00:00:00 2001 From: joyfuI Date: Sun, 8 Nov 2020 16:06:34 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=B4=EC=8D=AC3=20=ED=98=B8?= =?UTF-8?q?=ED=99=98=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + __init__.py | 2 +- logic.py | 2 +- plugin.py | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cef476c..6d0abba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/ .venv/ *.pyo +__pycache__/ test/ diff --git a/__init__.py b/__init__.py index f7cd4a1..dd87e12 100644 --- a/__init__.py +++ b/__init__.py @@ -1,2 +1,2 @@ # -*- coding: utf-8 -*- -from plugin import blueprint, menu, plugin_load, plugin_unload, plugin_info +from .plugin import blueprint, menu, plugin_load, plugin_unload, plugin_info diff --git a/logic.py b/logic.py index 2f760b7..866f2e3 100644 --- a/logic.py +++ b/logic.py @@ -59,7 +59,7 @@ class Logic(object): logger.debug(subprocess.check_output([sys.executable, '-m', 'pip', 'install', '--upgrade', 'youtube-dl'], universal_newlines=True)) # 편의를 위해 json 파일 생성 - from plugin import plugin_info + from .plugin import plugin_info Util.save_from_dict_to_json(plugin_info, os.path.join(os.path.dirname(__file__), 'info.json')) except Exception as e: logger.error('Exception:%s', e) diff --git a/plugin.py b/plugin.py index 714c5a9..97b8f81 100644 --- a/plugin.py +++ b/plugin.py @@ -112,7 +112,8 @@ def ajax(sub): # UI 요청 elif sub == 'ffmpeg_version': path = request.form['path'] - ret = subprocess.check_output([path, '-version']).replace('\n', '
') + ret = subprocess.check_output([path, '-version']) + ret = ret.decode().replace('\n', '
') return jsonify(ret) elif sub == 'download':