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 @@