From 8474e13ebb99f1115cf48041e39528327288c9d0 Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Sun, 27 Mar 2022 15:25:59 +0800 Subject: =?UTF-8?q?=F0=9F=9A=A8=20=E5=AE=89=E6=8A=9A=20pylance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/saucenao/data_source.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ATRI/plugins/saucenao') diff --git a/ATRI/plugins/saucenao/data_source.py b/ATRI/plugins/saucenao/data_source.py index 80b6b52..738c647 100644 --- a/ATRI/plugins/saucenao/data_source.py +++ b/ATRI/plugins/saucenao/data_source.py @@ -5,24 +5,21 @@ from ATRI.rule import is_in_service from ATRI.exceptions import RequestError from ATRI.utils import request -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("以图搜图")) params = dict() params["api_key"] = api_key -- cgit v1.2.3 From f1ce42da9027f416561ecabe34e0f5592bdfdd3e Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Mon, 4 Apr 2022 17:08:28 +0800 Subject: =?UTF-8?q?=E2=9A=B0=EF=B8=8F=20=E6=B8=85=E9=99=A4=E6=9C=AA?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/saucenao/__init__.py | 1 - 1 file changed, 1 deletion(-) (limited to 'ATRI/plugins/saucenao') 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 -- cgit v1.2.3 From 080df928cb3fa8b23481211c8c1072453e89b774 Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Mon, 4 Apr 2022 17:09:31 +0800 Subject: =?UTF-8?q?=F0=9F=9A=B8=20=E5=A2=9E=E5=8A=A0=E5=AF=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8F=92=E4=BB=B6=E6=89=80=E9=9C=80key=E7=9A=84?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/saucenao/data_source.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'ATRI/plugins/saucenao') diff --git a/ATRI/plugins/saucenao/data_source.py b/ATRI/plugins/saucenao/data_source.py index 738c647..9e2bd75 100644 --- a/ATRI/plugins/saucenao/data_source.py +++ b/ATRI/plugins/saucenao/data_source.py @@ -1,9 +1,11 @@ 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" @@ -21,6 +23,12 @@ class SaouceNao(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("key 未配置，本插件将被禁用") + params = dict() params["api_key"] = api_key params["output_type"] = output_type -- cgit v1.2.3 From 770e5d7b5888f15a4d328a5b21ed15f84cd8da7e Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Tue, 5 Apr 2022 15:20:25 +0800 Subject: =?UTF-8?q?=F0=9F=93=B1=20=E6=98=8E=E7=A1=AE=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/saucenao/data_source.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ATRI/plugins/saucenao') diff --git a/ATRI/plugins/saucenao/data_source.py b/ATRI/plugins/saucenao/data_source.py index 9e2bd75..8350839 100644 --- a/ATRI/plugins/saucenao/data_source.py +++ b/ATRI/plugins/saucenao/data_source.py @@ -27,7 +27,7 @@ class SaouceNao(Service): data = ServiceTools.load_service("以图搜图") data["enabled"] = False ServiceTools.save_service(data, "以图搜图") - log.warning("key 未配置，本插件将被禁用") + log.warning("插件 SauceNao 所需的 key 未配置，将被全局禁用，后续填写请手动启用") params = dict() params["api_key"] = api_key -- cgit v1.2.3