♿️ 优化报错信息

5 files changed, 23 insertions, 27 deletions

diff --git a/ATRI/exceptions.py b/ATRI/exceptions.py
index 8ce6a85..4d52ff3 100644
--- a/ATRI/exceptions.py
+++ b/ATRI/exceptions.py
@@ -62,12 +62,12 @@ class InvalidConfigured(BaseBotException):
     prompt = "无效配置"
 
 
-class WriteError(BaseBotException):
+class WriteFileError(BaseBotException):
     prompt = "写入错误"
 
 
-class LoadingError(BaseBotException):
-    prompt = "加载错误"
+class ReadFileError(BaseBotException):
+    prompt = "读取文件失败"
 
 
 class RequestError(BaseBotException):
@@ -78,10 +78,6 @@ class GetStatusError(BaseBotException):
     prompt = "获取状态失败"
 
 
-class ReadFileError(BaseBotException):
-    prompt = "读取文件失败"
-
-
 class FormatError(BaseBotException):
     prompt = "格式错误"
 
diff --git a/ATRI/plugins/kimo/data_source.py b/ATRI/plugins/kimo/data_source.py
index 6dd448a..fb3f3f3 100644
--- a/ATRI/plugins/kimo/data_source.py
+++ b/ATRI/plugins/kimo/data_source.py
@@ -8,7 +8,7 @@ from ATRI.service import Service
 from ATRI.rule import to_bot, is_in_service
 from ATRI.log import logger as log
 from ATRI.utils import request
-from ATRI.exceptions import ReadFileError, WriteError
+from ATRI.exceptions import ReadFileError, WriteFileError
 
 
 CHAT_PATH = Path(".") / "data" / "database" / "kimo"
@@ -39,8 +39,8 @@ class Kimo(Service):
                 with open(path, "w", encoding="utf-8") as w:
                     w.write(json.dumps(data, indent=4))
                 log.info("生成完成")
-            except WriteError:
-                raise WriteError("Writing kimo words failed!")
+            except WriteFileError:
+                raise WriteFileError("Writing kimo words failed!")
 
     @classmethod
     async def _load_data(cls) -> dict:
diff --git a/ATRI/plugins/polaroid/data_source.py b/ATRI/plugins/polaroid/data_source.py
index 82e0337..d4df4fe 100644
--- a/ATRI/plugins/polaroid/data_source.py
+++ b/ATRI/plugins/polaroid/data_source.py
@@ -4,7 +4,7 @@ from ATRI.service import Service
 from ATRI.rule import is_in_service
 from ATRI.utils import request
 from ATRI.log import logger as log
-from ATRI.exceptions import RequestError, WriteError
+from ATRI.exceptions import RequestError, WriteFileError
 from .image_dealer import image_dealer
 
 
@@ -52,8 +52,8 @@ async def init_source():
                 with open(path, "wb") as w:
                     w.write(data.read())
                 log.info("所需资源装载完成")
-            except WriteError:
-                raise WriteError("装载资源失败")
+            except WriteFileError:
+                raise WriteFileError("装载资源失败")
 
 
 loop = asyncio.get_event_loop()
diff --git a/ATRI/plugins/setu/tf_dealer.py b/ATRI/plugins/setu/tf_dealer.py
index f966636..58b4337 100644
--- a/ATRI/plugins/setu/tf_dealer.py
+++ b/ATRI/plugins/setu/tf_dealer.py
@@ -13,7 +13,7 @@ import tensorflow as tf
 
 from ATRI.log import logger as log
 from ATRI.utils import request
-from ATRI.exceptions import RequestError, WriteError
+from ATRI.exceptions import RequestError, WriteFileError
 
 
 SETU_PATH = Path(".") / "data" / "database" / "setu"
@@ -60,8 +60,8 @@ async def detect_image(url: str, file_size: int) -> list:
         path = TEMP_PATH / f"{file_name}.jpg"
         with open(path, "wb") as f:
             f.write(req.read())
-    except WriteError:
-        raise WriteError("Writing file failed!")
+    except WriteFileError:
+        raise WriteFileError("Writing file failed!")
 
     await init_module()
     model_path = str((SETU_PATH / "nsfw.tflite").absolute())
@@ -107,8 +107,8 @@ async def init_module():
             with open(path, "wb") as w:
                 w.write(data.read())
             log.info("模型装载完成")
-        except WriteError:
-            raise WriteError("NSFW TF module init failed!")
+        except WriteFileError:
+            raise WriteFileError("NSFW TF module init failed!")
 
 
 loop = asyncio.get_event_loop()
diff --git a/ATRI/service.py b/ATRI/service.py
index c9509df..c52f5ca 100644
--- a/ATRI/service.py
+++ b/ATRI/service.py
@@ -17,7 +17,7 @@ from nonebot.typing import (
 )
 from nonebot.rule import Rule, command, keyword, regex
 
-from ATRI.exceptions import ReadFileError, WriteError
+from ATRI.exceptions import ReadFileError, WriteFileError
 
 
 SERVICE_DIR = Path(".") / "data" / "service"
@@ -101,8 +101,8 @@ class Service:
         try:
             with open(path, "w", encoding="utf-8") as w:
                 w.write(json.dumps(data.dict(), indent=4))
-        except WriteError:
-            raise WriteError("Write service info failed!")
+        except WriteFileError:
+            raise WriteFileError("Write service info failed!")
 
     def save_service(self, service_data: dict, service: str) -> None:
         if not service:
@@ -304,9 +304,9 @@ class ServiceTools(object):
         path = SERVICES_DIR / f"{service}.json"
         if not path.is_file():
             raise ReadFileError(
-                f"Can't find service: ({service}) file.\n"
-                "Please delete all file in data/service/services.\n"
-                "Next reboot bot."
+                f"Can't find service file: {service}\n"
+                "Please delete all file in data/service/services\n"
+                "And reboot bot."
             )
 
         with open(path, "w", encoding="utf-8") as w:
@@ -317,9 +317,9 @@ class ServiceTools(object):
         path = SERVICES_DIR / f"{service}.json"
         if not path.is_file():
             raise ReadFileError(
-                f"Can't find service: ({service}) file.\n"
-                "Please delete all file in data/service/services.\n"
-                "Next reboot bot."
+                f"Can't find service file: {service}\n"
+                "Please delete all file in data/service/services\n"
+                "And reboot bot."
             )
 
         with open(path, "r", encoding="utf-8") as r: