From d9fc4659b8e731805c9dfee565b8a5d638a0d3e7 Mon Sep 17 00:00:00 2001
From: Cp0204 <Cp0204@qq.com>
Date: Tue, 15 Apr 2025 03:08:44 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E4=BC=98=E5=8C=96=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=90=9C=E7=B4=A2=E6=9D=A5=E6=BA=90=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 优化 CloudSaver 启用判断逻辑
- 搜索增加来源信息显示
---
 app/run.py               | 20 +++++++++++---------
 app/templates/index.html |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/run.py b/app/run.py
index b9f8f25..84f97f4 100644
--- a/app/run.py
+++ b/app/run.py
@@ -46,7 +46,7 @@ PYTHON_PATH = "python3" if os.path.exists("/usr/bin/python3") else "python"
 SCRIPT_PATH = os.environ.get("SCRIPT_PATH", "./quark_auto_save.py")
 CONFIG_PATH = os.environ.get("CONFIG_PATH", "./config/quark_config.json")
 PLUGIN_FLAGS = os.environ.get("PLUGIN_FLAGS", "")
-DEBUG = os.environ.get("DEBUG", False)
+DEBUG = os.environ.get("DEBUG", "false").lower() == "true"
 
 config_data = {}
 task_plugins_config_default = {}
@@ -86,10 +86,7 @@ def get_login_token():
 
 def is_login():
     login_token = get_login_token()
-    if (
-        session.get("token") == login_token
-        or request.args.get("token") == login_token
-    ):
+    if session.get("token") == login_token or request.args.get("token") == login_token:
         return True
     else:
         return False
@@ -224,7 +221,12 @@ def get_task_suggestions():
     query = request.args.get("q", "").lower()
     deep = request.args.get("d", "").lower()
     try:
-        if cs_data := config_data.get("source", {}).get("cloudsaver", {}):
+        cs_data = config_data.get("source", {}).get("cloudsaver", {})
+        if (
+            cs_data.get("server")
+            and cs_data.get("username")
+            and cs_data.get("password")
+        ):
             cs = CloudSaver(cs_data.get("server"))
             cs.set_auth(
                 cs_data.get("username", ""),
@@ -237,16 +239,16 @@ def get_task_suggestions():
                     cs_data["token"] = search.get("new_token")
                     Config.write_json(CONFIG_PATH, config_data)
                 search_results = cs.clean_search_results(search.get("data"))
-                return jsonify({"success": True, "data": search_results})
+                return jsonify({"success": True, "source": "CloudSaver", "data": search_results})
             else:
                 return jsonify({"success": True, "message": search.get("message")})
         else:
             base_url = base64.b64decode("aHR0cHM6Ly9zLjkxNzc4OC54eXo=").decode()
             url = f"{base_url}/task_suggestions?q={query}&d={deep}"
             response = requests.get(url)
-            return jsonify({"success": True, "data": response.json()})
+            return jsonify({"success": True, "source": "网络公开", "data": response.json()})
     except Exception as e:
-        return jsonify({"success": False, "message": str(e)})
+        return jsonify({"success": True, "message": f"error: {str(e)}"})
 
 
 @app.route("/get_share_detail")
diff --git a/app/templates/index.html b/app/templates/index.html
index ae45480..d6d3afd 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -272,7 +272,7 @@
                       <div class="input-group">
                         <input type="text" name="taskname[]" class="form-control" v-model="task.taskname" placeholder="必填" @focus="smart_param.showSuggestions=true;focusTaskname(index, task)" @input="changeTaskname(index, task)">
                         <div class="dropdown-menu show task-suggestions" v-if="smart_param.showSuggestions && smart_param.taskSuggestions.success && smart_param.index === index">
-                          <div class="text-muted text-center" style="font-size:12px;">{{ smart_param.taskSuggestions.message ? smart_param.taskSuggestions.message : smart_param.taskSuggestions.data.length ? "以下资源来自网络公开搜索，请自行辨识，如有侵权请联系资源方" : "未搜索到资源" }}</div>
+                          <div class="text-muted text-center" style="font-size:12px;">{{ smart_param.taskSuggestions.message ? smart_param.taskSuggestions.message : smart_param.taskSuggestions.data.length ? `以下资源来自 ${smart_param.taskSuggestions.source} 搜索，请自行辨识，如有侵权请联系资源方` : "未搜索到资源" }}</div>
                           <div v-for="suggestion in smart_param.taskSuggestions.data" :key="suggestion.taskname" class="dropdown-item" @click.prevent="selectSuggestion(task, suggestion)" style="cursor: pointer;font-size: 12px;" :title="suggestion.content">
                             <span v-html="suggestion.verify ? '✅': '❔'"></span> {{ suggestion.taskname }}
                             <small class="text-muted">