디폴트 youtube_dl 패키지를 yt-dlp로 변경
This commit is contained in:
@@ -245,6 +245,10 @@ API를 제공합니다. 다른 플러그인에서 동영상 정보나 다운로
|
|||||||
|
|
||||||
## Changelog
|
## Changelog
|
||||||
|
|
||||||
|
v3.1.1
|
||||||
|
|
||||||
|
- 디폴트 youtube_dl 패키지를 yt-dlp로 변경
|
||||||
|
|
||||||
v3.1.0
|
v3.1.0
|
||||||
|
|
||||||
- yt-dlp일 때 작동 안하는 문제 수정
|
- yt-dlp일 때 작동 안하는 문제 수정
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "3.1.0",
|
"version": "3.1.1",
|
||||||
"name": "youtube-dl",
|
"name": "youtube-dl",
|
||||||
"category_name": "vod",
|
"category_name": "vod",
|
||||||
"developer": "joyfuI",
|
"developer": "joyfuI",
|
||||||
|
|||||||
18
logic.py
18
logic.py
@@ -19,7 +19,7 @@ logger = get_logger(package_name)
|
|||||||
class Logic(object):
|
class Logic(object):
|
||||||
db_default = {
|
db_default = {
|
||||||
"db_version": "2",
|
"db_version": "2",
|
||||||
"youtube_dl_package": "0",
|
"youtube_dl_package": "1",
|
||||||
"ffmpeg_path": ""
|
"ffmpeg_path": ""
|
||||||
if platform.system() != "Windows"
|
if platform.system() != "Windows"
|
||||||
else os.path.join(path_app_root, "bin", "Windows", "ffmpeg.exe"),
|
else os.path.join(path_app_root, "bin", "Windows", "ffmpeg.exe"),
|
||||||
@@ -37,8 +37,8 @@ class Logic(object):
|
|||||||
db.session.add(ModelSetting(key, value))
|
db.session.add(ModelSetting(key, value))
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
Logic.migration()
|
Logic.migration()
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -65,16 +65,16 @@ class Logic(object):
|
|||||||
Util.save_from_dict_to_json(
|
Util.save_from_dict_to_json(
|
||||||
plugin_info, os.path.join(os.path.dirname(__file__), "info.json")
|
plugin_info, os.path.join(os.path.dirname(__file__), "info.json")
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def plugin_unload():
|
def plugin_unload():
|
||||||
try:
|
try:
|
||||||
logger.debug("%s plugin_unload", package_name)
|
logger.debug("%s plugin_unload", package_name)
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -98,6 +98,6 @@ class Logic(object):
|
|||||||
connect.close()
|
connect.close()
|
||||||
ModelSetting.set("db_version", Logic.db_default["db_version"])
|
ModelSetting.set("db_version", Logic.db_default["db_version"])
|
||||||
db.session.flush()
|
db.session.flush()
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|||||||
28
model.py
28
model.py
@@ -37,24 +37,24 @@ class ModelSetting(db.Model):
|
|||||||
return (
|
return (
|
||||||
db.session.query(ModelSetting).filter_by(key=key).first().value.strip()
|
db.session.query(ModelSetting).filter_by(key=key).first().value.strip()
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s %s", e, key)
|
logger.error("Exception:%s %s", error, key)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_int(key):
|
def get_int(key):
|
||||||
try:
|
try:
|
||||||
return int(ModelSetting.get(key))
|
return int(ModelSetting.get(key))
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s %s", e, key)
|
logger.error("Exception:%s %s", error, key)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_bool(key):
|
def get_bool(key):
|
||||||
try:
|
try:
|
||||||
return ModelSetting.get(key) == "True"
|
return ModelSetting.get(key) == "True"
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s %s", e, key)
|
logger.error("Exception:%s %s", error, key)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -71,8 +71,8 @@ class ModelSetting(db.Model):
|
|||||||
db.session.commit()
|
db.session.commit()
|
||||||
else:
|
else:
|
||||||
db.session.add(ModelSetting(key, value.strip()))
|
db.session.add(ModelSetting(key, value.strip()))
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
logger.error("Error Key:%s Value:%s", key, value)
|
logger.error("Error Key:%s Value:%s", key, value)
|
||||||
|
|
||||||
@@ -80,8 +80,8 @@ class ModelSetting(db.Model):
|
|||||||
def to_dict():
|
def to_dict():
|
||||||
try:
|
try:
|
||||||
return Util.db_list_to_dict(db.session.query(ModelSetting).all())
|
return Util.db_list_to_dict(db.session.query(ModelSetting).all())
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -102,8 +102,8 @@ class ModelSetting(db.Model):
|
|||||||
entity.value = value
|
entity.value = value
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
return True
|
return True
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -114,6 +114,6 @@ class ModelSetting(db.Model):
|
|||||||
values = [x.strip().strip() for x in value.replace("\n", "|").split("|")]
|
values = [x.strip().strip() for x in value.replace("\n", "|").split("|")]
|
||||||
values = Util.get_list_except_empty(values)
|
values = Util.get_list_except_empty(values)
|
||||||
return values
|
return values
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s %s", e, key)
|
logger.error("Exception:%s %s", error, key)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|||||||
14
plugin.py
14
plugin.py
@@ -47,7 +47,7 @@ menu = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugin_info = {
|
plugin_info = {
|
||||||
"version": "3.1.0",
|
"version": "3.1.1",
|
||||||
"name": "youtube-dl",
|
"name": "youtube-dl",
|
||||||
"category_name": "vod",
|
"category_name": "vod",
|
||||||
"developer": "joyfuI",
|
"developer": "joyfuI",
|
||||||
@@ -123,8 +123,8 @@ def first_menu(sub):
|
|||||||
|
|
||||||
elif sub == "log":
|
elif sub == "log":
|
||||||
return render_template("log.html", package=package_name)
|
return render_template("log.html", package=package_name)
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
return render_template("sample.html", title=f"{package_name} - {sub}")
|
return render_template("sample.html", title=f"{package_name} - {sub}")
|
||||||
|
|
||||||
@@ -228,8 +228,8 @@ def ajax(sub):
|
|||||||
index = int(request.form["index"])
|
index = int(request.form["index"])
|
||||||
LogicNormal.youtube_dl_list[index].stop()
|
LogicNormal.youtube_dl_list[index].stop()
|
||||||
return jsonify([])
|
return jsonify([])
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
|
||||||
|
|
||||||
@@ -486,8 +486,8 @@ def api(sub):
|
|||||||
ret["temp_path"] = youtube_dl.temp_path
|
ret["temp_path"] = youtube_dl.temp_path
|
||||||
ret["save_path"] = youtube_dl.save_path
|
ret["save_path"] = youtube_dl.save_path
|
||||||
return jsonify(ret)
|
return jsonify(ret)
|
||||||
except Exception as e:
|
except Exception as error:
|
||||||
logger.error("Exception:%s", e)
|
logger.error("Exception:%s", error)
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
abort(500) # 500 에러(서버 오류)
|
abort(500) # 500 에러(서버 오류)
|
||||||
abort(404) # 404 에러(페이지 없음)
|
abort(404) # 404 에러(페이지 없음)
|
||||||
|
|||||||
Reference in New Issue
Block a user