Merge pull request #5 from Kyomotoi/main

sync main

2 files changed, 12 insertions, 8 deletions

diff --git a/ATRI/plugins/saucenao/__init__.py b/ATRI/plugins/saucenao/__init__.py
index d3ad38f..071af98 100644
--- a/ATRI/plugins/saucenao/__init__.py
+++ b/ATRI/plugins/saucenao/__init__.py
@@ -1,4 +1,3 @@
-from re import findall
 from random import choice
 
 from nonebot.adapters.onebot.v11 import MessageEvent, Message, MessageSegment
diff --git a/ATRI/plugins/saucenao/data_source.py b/ATRI/plugins/saucenao/data_source.py
index 80b6b52..8350839 100644
--- a/ATRI/plugins/saucenao/data_source.py
+++ b/ATRI/plugins/saucenao/data_source.py
@@ -1,28 +1,33 @@
 from random import choice
 
-from ATRI.service import Service
+from ATRI.service import Service, ServiceTools
 from ATRI.rule import is_in_service
 from ATRI.exceptions import RequestError
 from ATRI.utils import request
+from ATRI.config import SauceNAO as sa
+from ATRI.log import logger as log
 
-URL = "https://saucenao.com/search.php"
 
-__doc__ = """
-以图搜图，仅限二刺螈
-"""
+URL = "https://saucenao.com/search.php"
 
 
 class SaouceNao(Service):
     def __init__(
         self,
-        api_key: str = None,
+        api_key: str = str(),
         output_type=2,
         testmode=1,
         dbmaski=32768,
         db=5,
         numres=5,
     ):
-        Service.__init__(self, "以图搜图", __doc__, rule=is_in_service("以图搜图"))
+        Service.__init__(self, "以图搜图", "以图搜图，仅限二刺螈", rule=is_in_service("以图搜图"))
+
+        if not sa.key:
+            data = ServiceTools.load_service("以图搜图")
+            data["enabled"] = False
+            ServiceTools.save_service(data, "以图搜图")
+            log.warning("插件 SauceNao 所需的 key 未配置，将被全局禁用，后续填写请手动启用")
 
         params = dict()
         params["api_key"] = api_key