summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ATRI/plugins/anime_search.py4
-rw-r--r--ATRI/plugins/bilibili_dynamic/api.py2
-rw-r--r--ATRI/plugins/broadcast.py2
-rw-r--r--ATRI/plugins/code_runner/data_source.py4
-rw-r--r--ATRI/plugins/console/data_source.py2
-rw-r--r--ATRI/plugins/console/driver/api.py10
-rw-r--r--ATRI/plugins/funny/data_source.py6
-rw-r--r--ATRI/plugins/help/__init__.py2
-rw-r--r--ATRI/plugins/help/data_source.py5
-rw-r--r--ATRI/plugins/kimo/__init__.py2
-rw-r--r--ATRI/plugins/kimo/data_source.py8
-rw-r--r--ATRI/plugins/manage/__init__.py8
-rw-r--r--ATRI/plugins/manage/data_source.py30
-rw-r--r--ATRI/plugins/polaroid/data_source.py4
-rw-r--r--ATRI/plugins/repo.py2
-rw-r--r--ATRI/plugins/saucenao/data_source.py4
-rw-r--r--ATRI/plugins/status/data_source.py2
-rw-r--r--ATRI/service.py4
-rw-r--r--ATRI/utils/__init__.py2
-rw-r--r--ATRI/utils/check_update.py4
20 files changed, 53 insertions, 54 deletions
diff --git a/ATRI/plugins/anime_search.py b/ATRI/plugins/anime_search.py
index 773748d..670c766 100644
--- a/ATRI/plugins/anime_search.py
+++ b/ATRI/plugins/anime_search.py
@@ -24,7 +24,7 @@ class Anime(Service):
aim = URL + url
try:
res = await request.get(aim)
- except RequestError:
+ except Exception:
raise RequestError("Request failed!")
result = res.json()
return result
@@ -34,7 +34,7 @@ class Anime(Service):
data = await cls._request(url)
try:
data = data["result"]
- except:
+ except Exception:
return "没有相似的结果呢..."
d = dict()
diff --git a/ATRI/plugins/bilibili_dynamic/api.py b/ATRI/plugins/bilibili_dynamic/api.py
index a455805..25410ac 100644
--- a/ATRI/plugins/bilibili_dynamic/api.py
+++ b/ATRI/plugins/bilibili_dynamic/api.py
@@ -14,7 +14,7 @@ class API:
try:
resp = await request.get(url, params=params, headers=headers)
- except RequestError:
+ except Exception:
raise RequestError("Request failed!")
return resp.json()
diff --git a/ATRI/plugins/broadcast.py b/ATRI/plugins/broadcast.py
index a6351a2..4b05056 100644
--- a/ATRI/plugins/broadcast.py
+++ b/ATRI/plugins/broadcast.py
@@ -81,7 +81,7 @@ async def _(bot: Bot, event: MessageEvent, s_msg: str = ArgPlainText("bc_msg")):
try:
await bot.send_group_msg(group_id=group_id, message=w_msg)
su_g.append(group_id)
- except:
+ except Exception:
fl_g.append(group_id)
await asyncio.sleep(random.randint(2, 3))
diff --git a/ATRI/plugins/code_runner/data_source.py b/ATRI/plugins/code_runner/data_source.py
index 87ae792..d5df230 100644
--- a/ATRI/plugins/code_runner/data_source.py
+++ b/ATRI/plugins/code_runner/data_source.py
@@ -64,7 +64,7 @@ class CodeRunner(Service):
try:
_ = args[1]
- except:
+ except Exception:
return "请检查键入内容...需要帮助：/code help"
lang = args[0].replace("\r", "")
@@ -90,7 +90,7 @@ class CodeRunner(Service):
try:
res = await request.post(url, json=js)
- except RequestError:
+ except Exception:
raise RequestError("Request failed!")
payload = res.json()
diff --git a/ATRI/plugins/console/data_source.py b/ATRI/plugins/console/data_source.py
index f6bbf16..eb1ddd2 100644
--- a/ATRI/plugins/console/data_source.py
+++ b/ATRI/plugins/console/data_source.py
@@ -48,7 +48,7 @@ class Console(Service):
try:
with open(df, "w", encoding="utf-8") as w:
w.write(json.dumps({}))
- except WriteFileError:
+ except Exception:
raise WriteFileError("Writing file: " + str(df) + " failed!")
base_data: dict = json.loads(df.read_bytes())
diff --git a/ATRI/plugins/console/driver/api.py b/ATRI/plugins/console/driver/api.py
index d83f98b..452d063 100644
--- a/ATRI/plugins/console/driver/api.py
+++ b/ATRI/plugins/console/driver/api.py
@@ -6,7 +6,7 @@ from pathlib import Path
from datetime import datetime
from ATRI.service import ServiceTools, SERVICES_DIR
-from ATRI.exceptions import GetStatusError, ReadFileError, WriteFileError
+from ATRI.exceptions import GetStatusError
from ..models import PlatformRuntimeInfo, BotRuntimeInfo, ServiceInfo
@@ -33,7 +33,7 @@ def get_processing_data() -> tuple:
datetime.utcfromtimestamp(now).replace(microsecond=0)
- datetime.utcfromtimestamp(b).replace(microsecond=0)
)
- except GetStatusError:
+ except Exception:
raise GetStatusError("Getting runtime failed.")
if p_cpu > 90: # type: ignore
@@ -97,7 +97,7 @@ def control_service(
) -> tuple:
try:
serv_data = ServiceTools().load_service(serv_name)
- except ReadFileError:
+ except Exception:
return False, dict()
if is_enab != 1:
@@ -128,7 +128,7 @@ def control_service(
try:
ServiceTools().save_service(serv_data, serv_name)
- except WriteFileError:
+ except Exception:
return False, dict()
return True, serv_data
@@ -187,7 +187,7 @@ def edit_block_list(is_enab: bool, user_id: str, group_id: str) -> tuple:
path = MANEGE_DIR / g_f
with open(path, "w", encoding="utf-8") as w:
w.write(json.dumps(g_d))
- except WriteFileError:
+ except Exception:
return False, dict()
return True, {"user": u_d, "group": g_d}
diff --git a/ATRI/plugins/funny/data_source.py b/ATRI/plugins/funny/data_source.py
index 739f1b4..1385c91 100644
--- a/ATRI/plugins/funny/data_source.py
+++ b/ATRI/plugins/funny/data_source.py
@@ -79,7 +79,7 @@ class Funny(Service):
try:
data = await request.post(url, params=params)
data = data.json()
- except RequestError:
+ except Exception:
raise RequestError("Request failed!")
text = Translate(data["text"]).to_simple().replace("今天", day)
@@ -92,7 +92,7 @@ class Funny(Service):
try:
data = await request.post(url, params=params)
data = data.json()
- except RequestError:
+ except Exception:
raise RequestError("Request failed!")
result = Translate(data["text"]).to_simple().replace("今天", day)
@@ -108,7 +108,7 @@ class Funny(Service):
try:
data = await request.post(url, params=params)
data = data.json()
- except RequestError:
+ except Exception:
raise RequestError("Request failed!")
text = Translate(data["text"]).to_simple().replace("今天", day)
diff --git a/ATRI/plugins/help/__init__.py b/ATRI/plugins/help/__init__.py
index c6f915e..a9663eb 100644
--- a/ATRI/plugins/help/__init__.py
+++ b/ATRI/plugins/help/__init__.py
@@ -36,7 +36,7 @@ async def _ready_service_info(event: MessageEvent):
try:
service = msg[1]
- except:
+ except Exception:
service = "idk"
try:
diff --git a/ATRI/plugins/help/data_source.py b/ATRI/plugins/help/data_source.py
index d926417..2573bf4 100644
--- a/ATRI/plugins/help/data_source.py
+++ b/ATRI/plugins/help/data_source.py
@@ -7,7 +7,6 @@ from ATRI import __version__
from ATRI.rule import to_bot
from ATRI.service import Service, SERVICES_DIR, ServiceTools
from ATRI.config import BotSelfConfig
-from ATRI.exceptions import ReadFileError
SERVICE_INFO_FORMAT = """
@@ -84,7 +83,7 @@ class Helper(Service):
def service_info(service: str) -> str:
try:
data = ServiceTools().load_service(service)
- except ReadFileError:
+ except Exception:
return "请检查是否输入错误呢...@bot 帮助 [服务]"
service_name = data.get("service", "error")
@@ -106,7 +105,7 @@ class Helper(Service):
def cmd_info(service: str, cmd: str) -> str:
try:
data = ServiceTools().load_service(service)
- except ReadFileError:
+ except Exception:
return "请检查是否输入错误..."
cmd_list: dict = data["cmd_list"]
diff --git a/ATRI/plugins/kimo/__init__.py b/ATRI/plugins/kimo/__init__.py
index 31ecab1..cca4063 100644
--- a/ATRI/plugins/kimo/__init__.py
+++ b/ATRI/plugins/kimo/__init__.py
@@ -56,5 +56,5 @@ async def _deal_name(event: MessageEvent, new_name: str = ArgPlainText("name")):
async def _check_kimo():
try:
await Kimo().update_data()
- except BaseException:
+ except Exception:
pass
diff --git a/ATRI/plugins/kimo/data_source.py b/ATRI/plugins/kimo/data_source.py
index e93c68c..e110ba9 100644
--- a/ATRI/plugins/kimo/data_source.py
+++ b/ATRI/plugins/kimo/data_source.py
@@ -38,7 +38,7 @@ class Kimo(Service):
with open(path, "w", encoding="utf-8") as w:
w.write(json.dumps(data, indent=4))
log.info("生成完成")
- except WriteFileError:
+ except Exception:
raise WriteFileError("Writing kimo words failed!")
@classmethod
@@ -84,7 +84,7 @@ class Kimo(Service):
try:
with open(path, "w", encoding="utf-8") as w:
w.write(json.dumps(data, indent=4))
- except ReadFileError:
+ except Exception:
raise ReadFileError("Update user name failed!")
@staticmethod
@@ -99,7 +99,7 @@ class Kimo(Service):
data = json.loads(path.read_bytes())
try:
result = data[user_id]
- except BaseException:
+ except Exception:
result = "你"
return result
@@ -117,7 +117,7 @@ class Kimo(Service):
try:
if b[0] == b[1]:
a = b[0]
- except BaseException:
+ except Exception:
pass
if a in data:
repo = data.get(a, str())
diff --git a/ATRI/plugins/manage/__init__.py b/ATRI/plugins/manage/__init__.py
index befbdf1..672ba97 100644
--- a/ATRI/plugins/manage/__init__.py
+++ b/ATRI/plugins/manage/__init__.py
@@ -290,7 +290,7 @@ async def _deal_approve_friend_add(
try:
await bot.set_friend_add_request(flag=apply_code, approve=True)
- except BaseException:
+ except Exception:
await approve_friend_add.finish("同意失败...尝试下手动？")
data = Manage().load_friend_apply_list()
data.pop(apply_code)
@@ -320,7 +320,7 @@ async def _deal_refuse_friend_add(
try:
await bot.set_friend_add_request(flag=apply_code, approve=False)
- except BaseException:
+ except Exception:
await refuse_friend_add.finish("拒绝失败...尝试下手动？")
data = Manage().load_friend_apply_list()
data.pop(apply_code)
@@ -371,7 +371,7 @@ async def _deal_approve_group_invite(
await bot.set_group_add_request(
flag=apply_code, sub_type="invite", approve=True
)
- except BaseException:
+ except Exception:
await approve_group_invite.finish("同意失败...尝试下手动？")
data = Manage().load_invite_apply_list()
data.pop(apply_code)
@@ -403,7 +403,7 @@ async def _deal_refuse_group_invite(
await bot.set_group_add_request(
flag=apply_code, sub_type="invite", approve=False
)
- except BaseException:
+ except Exception:
await refuse_group_invite.finish("拒绝失败...（可能是小群免验证）尝试下手动？")
data = Manage().load_invite_apply_list()
data.pop(apply_code)
diff --git a/ATRI/plugins/manage/data_source.py b/ATRI/plugins/manage/data_source.py
index 1d870e6..92dcc42 100644
--- a/ATRI/plugins/manage/data_source.py
+++ b/ATRI/plugins/manage/data_source.py
@@ -3,7 +3,7 @@ from pathlib import Path
from datetime import datetime
from ATRI.service import Service, ServiceTools
-from ATRI.exceptions import ReadFileError, load_error
+from ATRI.exceptions import load_error
MANAGE_DIR = Path(".") / "data" / "database" / "manege"
@@ -41,7 +41,7 @@ class Manage(Service):
return dict()
try:
data = json.loads(path.read_bytes())
- except BaseException:
+ except Exception:
data = dict()
return data
@@ -75,7 +75,7 @@ class Manage(Service):
try:
data = json.loads(path.read_bytes())
- except BaseException:
+ except Exception:
data = dict()
return data
@@ -98,7 +98,7 @@ class Manage(Service):
try:
cls._save_block_user_list(data)
return True
- except BaseException:
+ except Exception:
return False
@classmethod
@@ -111,7 +111,7 @@ class Manage(Service):
data.pop(user_id)
cls._save_block_user_list(data)
return True
- except BaseException:
+ except Exception:
return False
@classmethod
@@ -122,7 +122,7 @@ class Manage(Service):
try:
cls._save_block_group_list(data)
return True
- except BaseException:
+ except Exception:
return False
@classmethod
@@ -135,7 +135,7 @@ class Manage(Service):
data.pop(group_id)
cls._save_block_group_list(data)
return True
- except BaseException:
+ except Exception:
return False
@staticmethod
@@ -145,7 +145,7 @@ class Manage(Service):
"""
try:
data = ServiceTools().load_service(service)
- except BaseException:
+ except Exception:
return False
data["enabled"] = is_enabled
ServiceTools().save_service(data, service)
@@ -158,14 +158,14 @@ class Manage(Service):
"""
try:
data = ServiceTools().load_service(service)
- except BaseException:
+ except Exception:
return False
temp_list: list = data.get("disable_user", list())
if is_enabled:
try:
temp_list.remove(user_id)
- except BaseException:
+ except Exception:
return False
else:
if user_id in temp_list:
@@ -185,14 +185,14 @@ class Manage(Service):
"""
try:
data = ServiceTools().load_service(service)
- except:
+ except Exception:
return False
temp_list: list = data.get("disable_group", list())
if is_enabled:
try:
temp_list.remove(group_id)
- except:
+ except Exception:
return False
else:
if group_id in temp_list:
@@ -215,7 +215,7 @@ class Manage(Service):
try:
data = json.loads(path.read_bytes())
- except:
+ except Exception:
data = dict()
return data
@@ -241,7 +241,7 @@ class Manage(Service):
try:
data = json.loads(path.read_bytes())
- except BaseException:
+ except Exception:
data = dict()
return data
@@ -260,7 +260,7 @@ class Manage(Service):
async def track_error(track_id: str) -> str:
try:
data = load_error(track_id)
- except ReadFileError:
+ except Exception:
return "请检查ID是否正确..."
prompt = data.get("prompt", "ignore")
diff --git a/ATRI/plugins/polaroid/data_source.py b/ATRI/plugins/polaroid/data_source.py
index f1c44b0..a90d148 100644
--- a/ATRI/plugins/polaroid/data_source.py
+++ b/ATRI/plugins/polaroid/data_source.py
@@ -19,7 +19,7 @@ class Polaroid(Service):
async def _request(cls, user_id: str) -> bytes:
try:
res = await request.get(TENCENT_AVATER_URL.format(user_id=user_id))
- except RequestError:
+ except Exception:
raise RequestError("Request failed!")
data = res.read()
return data
@@ -51,7 +51,7 @@ async def init_source():
with open(path, "wb") as w:
w.write(data.read())
log.info("所需资源装载完成")
- except WriteFileError:
+ except Exception:
raise WriteFileError("装载资源失败")
diff --git a/ATRI/plugins/repo.py b/ATRI/plugins/repo.py
index 7087afa..7e0c160 100644
--- a/ATRI/plugins/repo.py
+++ b/ATRI/plugins/repo.py
@@ -45,7 +45,7 @@ async def _deal_repo(
for superuser in BotSelfConfig.superusers:
try:
await bot.send_private_msg(user_id=superuser, message=repo_0)
- except BaseException:
+ except Exception:
await reporter.finish("发送失败了呢...")
await reporter.finish("吾辈的心愿已由咱转告维护者！")
diff --git a/ATRI/plugins/saucenao/data_source.py b/ATRI/plugins/saucenao/data_source.py
index 521a957..eaeafed 100644
--- a/ATRI/plugins/saucenao/data_source.py
+++ b/ATRI/plugins/saucenao/data_source.py
@@ -34,7 +34,7 @@ class SauceNao(Service):
self.params["url"] = url
try:
res = await request.get(URL, params=self.params)
- except RequestError:
+ except Exception:
raise RequestError("Request failed!")
data = res.json()
return data
@@ -43,7 +43,7 @@ class SauceNao(Service):
data = await self._request(url)
try:
res = data.get("results", "result")
- except:
+ except Exception:
return "没有相似的结果呢..."
r = list()
diff --git a/ATRI/plugins/status/data_source.py b/ATRI/plugins/status/data_source.py
index ddd3568..74d2c77 100644
--- a/ATRI/plugins/status/data_source.py
+++ b/ATRI/plugins/status/data_source.py
@@ -56,7 +56,7 @@ class Status(Service):
datetime.utcfromtimestamp(now).replace(microsecond=0)
- datetime.utcfromtimestamp(b).replace(microsecond=0)
)
- except GetStatusError:
+ except Exception:
raise GetStatusError("Failed to get status.")
msg = "アトリは、高性能ですから！"
diff --git a/ATRI/service.py b/ATRI/service.py
index 043ff67..d539c93 100644
--- a/ATRI/service.py
+++ b/ATRI/service.py
@@ -98,7 +98,7 @@ class Service:
try:
with open(path, "w", encoding="utf-8") as w:
w.write(json.dumps(data.dict(), indent=4))
- except WriteFileError:
+ except Exception:
raise WriteFileError("Write service info failed!")
def save_service(self, service_data: dict, service: str) -> None:
@@ -119,7 +119,7 @@ class Service:
try:
data = json.loads(path.read_bytes())
- except ReadFileError:
+ except Exception:
with open(path, "w", encoding="utf-8") as w:
w.write(json.dumps({}))
self._generate_service_config(service, self.docs)
diff --git a/ATRI/utils/__init__.py b/ATRI/utils/__init__.py
index 29c9f05..65e3ec1 100644
--- a/ATRI/utils/__init__.py
+++ b/ATRI/utils/__init__.py
@@ -122,7 +122,7 @@ class FileDealer:
async def _reader(self) -> AsyncTextIOWrapper:
try:
tar = await aiofiles.open(self.path, "r", encoding=self.encoding)
- except FileNotFoundError:
+ except Exception:
raise FileNotFoundError(f"File({self.path}) not find!")
return tar
diff --git a/ATRI/utils/check_update.py b/ATRI/utils/check_update.py
index a8575ab..16b61ad 100644
--- a/ATRI/utils/check_update.py
+++ b/ATRI/utils/check_update.py
@@ -22,7 +22,7 @@ class CheckUpdate:
async def show_latest_commit_info(cls) -> str:
try:
data = await cls._get_commits_info()
- except RequestError:
+ except Exception:
raise RequestError("Getting commit info timeout...")
try:
@@ -41,7 +41,7 @@ class CheckUpdate:
async def show_latest_version(cls) -> tuple:
try:
data = await cls._get_release_info()
- except RequestError:
+ except Exception:
raise RequestError("Getting release list timeout...")
try:
Powered by cgit, Theme cgit-dark created by Ted Yin, updated by Mole Shang.