v1.6.0 API에 format_code를 format로 변경
API에 format_code를 format로 변경 API에 temp_path 삭제
This commit is contained in:
22
plugin.py
22
plugin.py
@@ -34,7 +34,7 @@ menu = {
|
||||
}
|
||||
|
||||
plugin_info = {
|
||||
'version': '1.5.1',
|
||||
'version': '1.6.0',
|
||||
'name': 'youtube-dl',
|
||||
'category_name': 'vod',
|
||||
'developer': 'joyfuI',
|
||||
@@ -105,7 +105,7 @@ def ajax(sub):
|
||||
filename = request.form['filename']
|
||||
temp_path = ModelSetting.get('temp_path')
|
||||
save_path = ModelSetting.get('save_path')
|
||||
format_code = request.form['format'] if request.form['format'] else None
|
||||
format = request.form['format'] if request.form['format'] else None
|
||||
postprocessor = request.form['postprocessor'] if request.form['postprocessor'] else None
|
||||
video_convertor, extract_audio = LogicNormal.get_postprocessor()
|
||||
if postprocessor in video_convertor:
|
||||
@@ -120,7 +120,7 @@ def ajax(sub):
|
||||
'preferredquality': '192'
|
||||
}]
|
||||
opts = {
|
||||
'format': format_code,
|
||||
'format': format,
|
||||
'postprocessors': postprocessor,
|
||||
'proxy': ModelSetting.get('proxy')
|
||||
}
|
||||
@@ -180,9 +180,8 @@ def api(sub):
|
||||
key = request.form.get('key')
|
||||
url = request.form.get('url')
|
||||
filename = request.form.get('filename', ModelSetting.get('default_filename'))
|
||||
temp_path = request.form.get('temp_path', ModelSetting.get('temp_path'))
|
||||
save_path = request.form.get('save_path', ModelSetting.get('save_path'))
|
||||
format_code = request.form.get('format_code', None)
|
||||
format = request.form.get('format', None)
|
||||
preferedformat = request.form.get('preferedformat', None)
|
||||
preferredcodec = request.form.get('preferredcodec', None)
|
||||
preferredquality = request.form.get('preferredquality', 192)
|
||||
@@ -211,12 +210,12 @@ def api(sub):
|
||||
'preferredquality': str(preferredquality)
|
||||
})
|
||||
opts = {
|
||||
'format': format_code,
|
||||
'format': format,
|
||||
'postprocessors': postprocessor,
|
||||
'proxy': ModelSetting.get('proxy'),
|
||||
'download_archive': archive
|
||||
}
|
||||
youtube_dl = Youtube_dl(plugin, url, filename, temp_path, save_path, opts)
|
||||
youtube_dl = Youtube_dl(plugin, url, filename, ModelSetting.get('temp_path'), save_path, opts)
|
||||
youtube_dl.key = key
|
||||
LogicNormal.youtube_dl_list.append(youtube_dl) # 리스트 추가
|
||||
ret['index'] = youtube_dl.index
|
||||
@@ -271,7 +270,14 @@ def api(sub):
|
||||
elif sub == 'status':
|
||||
index = request.form.get('index')
|
||||
key = request.form.get('key')
|
||||
ret = {'errorCode': 0}
|
||||
ret = {
|
||||
'errorCode': 0,
|
||||
'status': None,
|
||||
'start_time': None,
|
||||
'end_time': None,
|
||||
'temp_path': None,
|
||||
'save_path': None
|
||||
}
|
||||
if None in (index, key):
|
||||
return LogicNormal.abort(ret, 1) # 필수 요청 변수가 없음
|
||||
index = int(index)
|
||||
|
||||
Reference in New Issue
Block a user