ff_plugins/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
flaskfarm
2022-10-15 13:07:38 +09:00
parent 78fe7cd6b2
commit fefdbada91
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/framework/templates/macro.html
View File

@@ -234,7 +234,7 @@
{{ setting_bottom(desc, padding_top='-5') }} {{ setting_bottom(desc, padding_top='-5') }}
{% endmacro %} {% endmacro %}
{% macro info_text_go_button(id, left, buttons, value='', desc=None) %} {% macro info_text_go_buttons(id, left, buttons, value='', desc=None) %}
{{ setting_top(left) }} {{ setting_top(left) }}
<div style="padding-left:20px; padding-top:-5px;"> <div style="padding-left:20px; padding-top:-5px;">
<span id={{id}}><a href="{{value}}" target="_blank">{{value}}</a></span> <span id={{id}}><a href="{{value}}" target="_blank">{{value}}</a></span>

2
lib/framework/version.py
View File

@@ -1 +1 @@
VERSION="4.0.9" VERSION="4.0.10"

4
lib/plugin/logic_module_base.py
View File

@@ -139,11 +139,11 @@ class PluginPageBase(object):
arg = {} arg = {}
if self.P.ModelSetting != None: if self.P.ModelSetting != None:
arg = self.P.ModelSetting.to_dict() arg = self.P.ModelSetting.to_dict()
return render_template(f'{__package__}_{self.parent.name}_{self.name}.html', arg=arg) return render_template(f'{self.P.package_name}_{self.parent.name}_{self.name}.html', arg=arg)
except Exception as e: except Exception as e:
pass pass
return render_template('sample.html', title=f"PluginPageBase-process_menu {self.P.package_name}/{self.parent.name}/{self.name}") return render_template('sample.html', title=f"PluginPageBase-process_menu --- {self.P.package_name}/{self.parent.name}/{self.name}")
def process_ajax(self, sub, req): def process_ajax(self, sub, req):

12
lib/system/mod_tool.py
View File

@@ -7,7 +7,9 @@ name = 'tool'
class ModuleTool(PluginModuleBase): class ModuleTool(PluginModuleBase):
def __init__(self, P): def __init__(self, P):
super(ModuleTool, self).__init__(P, name=name, first_menu='upload') super(ModuleTool, self).__init__(P, name=name, first_menu='upload')
self.set_page_list([PageUpload]) self.set_page_list([PageUpload, PageCrypt])
class PageUpload(PluginPageBase): class PageUpload(PluginPageBase):
@@ -21,5 +23,13 @@ class PageUpload(PluginPageBase):
class PageCrypt(PluginPageBase): class PageCrypt(PluginPageBase):
def __init__(self, P, parent): def __init__(self, P, parent):
super(PageCrypt, self).__init__(P, parent, name='crypt') super(PageCrypt, self).__init__(P, parent, name='crypt')
self.db_default = {
f'{self.parent.name}_{self.name}_use_user_key': 'False',
f'{self.parent.name}_{self.name}_user_key': '',
f'{self.parent.name}_{self.name}_user_key': '',
}

2
lib/system/templates/system_tool_upload.html
View File

@@ -11,7 +11,7 @@
{{ macros.m_row_end() }} {{ macros.m_row_end() }}
{{ macros.m_hr() }} {{ macros.m_hr() }}
<form id='setting' name='setting'> <form id='setting' name='setting'>
{{ macros.setting_input_text_and_buttons('path_upload', '업로드 경로', [['select_btn', '폴더 선택']], value=arg['path_upload'], desc=['설정 저장 후부터 적용']) }} {{ macros.setting_input_text_and_buttons('path_upload', '업로드 경로', [['select_btn', '폴더 선택']], value=arg['path_upload'], desc=['경로 변경시 설정 저장 후부터 적용']) }}
</form> </form>
{{ macros.m_hr_black() }} {{ macros.m_hr_black() }}
{{ dropzone.create(action='upload') }} {{ dropzone.create(action='upload') }}