♻️ 重构对通知变量 bool 值的处理

Cp0204 · Nov 29, 2024 · 16866a0 · 16866a0
1 parent 7229388
commit 16866a0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/app/templates/index.html b/app/templates/index.html
@@ -414,20 +414,6 @@ <h5 class="modal-title"><b>分享文件列表</b>
         }
       },
       watch: {
-        'formData.push_config': {
-          handler: function (newVal, oldVal) {
-            for (key in newVal) {
-              if (typeof newVal[key] === 'string') {
-                if (newVal[key].toLowerCase() === 'false') {
-                  this.$set(this.formData.push_config, key, false);
-                } else if (newVal[key].toLowerCase() === 'true') {
-                  this.$set(this.formData.push_config, key, true);
-                }
-              }
-            }
-          },
-          deep: true
-        }
       },
       mounted() {
         this.fetchData();

diff --git a/notify.py b/notify.py
@@ -181,7 +181,8 @@ def console(title: str, content: str) -> None:
     """
     使用 控制台 推送消息。
     """
-    print(f"{title}\n\n{content}")
+    if str(push_config.get("CONSOLE")).lower() != "false":
+        print(f"{title}\n\n{content}")
 
 
 def dingding_bot(title: str, content: str) -> None:

diff --git a/quark_auto_save.py b/quark_auto_save.py
@@ -59,8 +59,8 @@ def send_ql_notify(title, body):
 
         # 如未配置 push_config 则使用青龙环境通知设置
         if CONFIG_DATA.get("push_config"):
-            CONFIG_DATA["push_config"]["CONSOLE"] = True
-            notify.push_config = CONFIG_DATA["push_config"]
+            notify.push_config = CONFIG_DATA["push_config"].copy()
+            notify.push_config["CONSOLE"] = notify.push_config.get("CONSOLE", True)
         notify.send(title, body)
     except Exception as e:
         if e:
@@ -796,7 +796,10 @@ def do_sign(account):
                 sign_message = f"📅 执行签到: 今日签到+{int(sign_return/1024/1024)}MB，连签进度({growth_info['cap_sign']['sign_progress']+1}/{growth_info['cap_sign']['sign_target']})✅"
                 message = f"{sign_message}\n{growth_message}"
                 if (
-                    CONFIG_DATA.get("push_config", {}).get("QUARK_SIGN_NOTIFY") == False
+                    str(
+                        CONFIG_DATA.get("push_config", {}).get("QUARK_SIGN_NOTIFY")
+                    ).lower()
+                    == "false"
                     or os.environ.get("QUARK_SIGN_NOTIFY") == "false"
                 ):
                     print(message)