From 5031bdd86ea45fbb5b23ef4e80ed5bf793eacb25 Mon Sep 17 00:00:00 2001 From: javara999 Date: Fri, 3 Apr 2026 17:33:32 +0900 Subject: [PATCH] auto download fix3 --- logic_linkkf.py | 12 +++++----- mod_basic.py | 12 ++++++++++ templates/linkkf_setting.html | 41 +++++++++++++++++++++++++---------- 3 files changed, 49 insertions(+), 16 deletions(-) diff --git a/logic_linkkf.py b/logic_linkkf.py index aaa3774..e07e099 100644 --- a/logic_linkkf.py +++ b/logic_linkkf.py @@ -504,6 +504,10 @@ class LogicLinkkf(object): else: ret["ret"] = False ret["data"] = whitelist_programs + ret["whitelist_program"] = ",".join(whitelist_programs) + ret["data"] = whitelist_programs + ret["whitelist_program"] = ",".join(whitelist_programs) + ret["data"] = whitelist_programs ret["log"] = "No current data!!" except Exception as e: logger.error("Exception:%s", e) @@ -597,12 +601,10 @@ class LogicLinkkf(object): ret["ret"] = True ret["code"] = code ret["data"] = whitelist_programs - if return_current_data: - LogicLinkkf.current_data["ret"] = True + ret["whitelist_program"] = whitelist_program + if return_current_data and LogicLinkkf.current_data is not None: LogicLinkkf.current_data["whitelist_program"] = whitelist_program - return LogicLinkkf.current_data - else: - return ret + return ret else: ret["ret"] = False ret["log"] = "이미 추가되어 있습니다." diff --git a/mod_basic.py b/mod_basic.py index d0b3a87..7adfea2 100644 --- a/mod_basic.py +++ b/mod_basic.py @@ -113,6 +113,18 @@ class ModuleBasic(PluginModuleBase): if data["ret"] == "error": return jsonify(data) return jsonify({"ret": "success", "data": data}) + if sub == "get_whitelist_program": + return jsonify( + { + "ret": "success", + "data": ( + self.P.ModelSetting.get("whitelist_program") + if self.P.ModelSetting is not None + else "" + ) + or "", + } + ) if sub == "play": episode_url = req.form["url"] play_title = req.form.get("title", "LinkKF") diff --git a/templates/linkkf_setting.html b/templates/linkkf_setting.html index 3d83c6c..2cbd74a 100644 --- a/templates/linkkf_setting.html +++ b/templates/linkkf_setting.html @@ -3,7 +3,7 @@
{{ macros.m_button_group([['globalSettingSaveBtn', '설정 저장']]) }}
- {{ macros.setting_input_text_and_buttons('linkkf_url', 'Linkkf 주소', [['go_btn', '열기']], value=arg['linkkf_url']) }} + {{ macros.setting_input_text_and_buttons('linkkf_url', 'LinkKF 주소', [['go_btn', '열기']], value=arg['linkkf_url'], desc=['기본 주소는 https://linkkf.tv']) }} {{ macros.setting_input_text('download_path', '다운로드 폴더', value=arg['download_path']) }} {{ macros.setting_checkbox('auto_make_folder', '작품 폴더 생성', value=arg['auto_make_folder']) }} {{ macros.setting_checkbox('linkkf_auto_make_season_folder', '시즌 폴더 생성', value=arg['linkkf_auto_make_season_folder']) }} @@ -11,10 +11,10 @@ {{ macros.setting_input_int('max_ffmpeg_process_count', '동시 다운로드 수', value=arg['max_ffmpeg_process_count']) }} {{ macros.setting_input_text('auto_interval', '자동 실행 주기', value=arg['auto_interval'], col='3', placeholder='*/20 * * * *') }} {{ macros.setting_checkbox('auto_start', '시작 시 자동 실행', value=arg['auto_start']) }} - {{ macros.setting_input_textarea('whitelist_program', '자동 다운로드 코드', value=arg['whitelist_program']) }} + {{ macros.setting_input_textarea('whitelist_program', '자동 다운로드 코드', value=arg['whitelist_program'], desc=['쉼표 또는 줄바꿈으로 여러 코드를 입력할 수 있습니다.']) }} {{ macros.global_setting_scheduler_button(arg['scheduler'], arg['is_running']) }} {{ macros.setting_buttons([['linkkf_one_execute_btn', '1회 실행']], left='수동 실행') }} - {{ macros.setting_buttons([['linkkf_reset_db_btn', 'DB 초기화']], left='DB 정리') }} + {{ macros.setting_buttons([['linkkf_reset_db_btn', 'DB 초기화']], left='DB 관리') }} {{ macros.setting_buttons([['btn_airing_code', '최신 코드 가져오기']], left='보조 기능') }}
@@ -22,8 +22,28 @@