💩 优化代码

11 files changed, 21 insertions, 30 deletions

diff --git a/ATRI/log.py b/ATRI/log.py
index 39a4864..77f16ef 100644
--- a/ATRI/log.py
+++ b/ATRI/log.py
@@ -8,7 +8,7 @@ from .config import BotSelfConfig
 
 
 LOGGER_DIR = Path(".") / "data" / "logs"
-LOGGER_DIR.parent.mkdir(exist_ok=True, parents=True)
+LOGGER_DIR.mkdir(exist_ok=True, parents=True)
 
 NOW_TIME = datetime.now().strftime("%Y%m%d-%H")
 
diff --git a/ATRI/plugins/broadcast.py b/ATRI/plugins/broadcast.py
index 07315f2..a6351a2 100644
--- a/ATRI/plugins/broadcast.py
+++ b/ATRI/plugins/broadcast.py
@@ -1,4 +1,3 @@
-import os
 import json
 import random
 import asyncio
@@ -17,7 +16,8 @@ from ATRI.rule import to_bot
 
 
 BC_PATH = Path(".") / "data" / "database" / "broadcast"
-os.makedirs(BC_PATH, exist_ok=True)
+BC_PATH.mkdir(parents=True, exist_ok=True)
+
 
 _BROADCAST_BACK = """
 广播报告：
diff --git a/ATRI/plugins/console/driver/__init__.py b/ATRI/plugins/console/driver/__init__.py
index fe4398a..c438214 100644
--- a/ATRI/plugins/console/driver/__init__.py
+++ b/ATRI/plugins/console/driver/__init__.py
@@ -1,8 +1,8 @@
-from nonebot import get_driver
 from nonebot.drivers.fastapi import Driver
 
 from fastapi.middleware.cors import CORSMiddleware
 
+from ATRI import driver
 from .view import (
     handle_auther,
     handle_base_uri,
@@ -52,5 +52,4 @@ def register_routes(driver: Driver):
 
 
 def init():
-    driver = get_driver()
     register_routes(driver)  # type: ignore
diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py
index 37c18a4..763b137 100644
--- a/ATRI/plugins/essential.py
+++ b/ATRI/plugins/essential.py
@@ -1,4 +1,3 @@
-import os
 import json
 import shutil
 import asyncio
@@ -44,9 +43,9 @@ bots = nonebot.get_bots()
 ESSENTIAL_DIR = Path(".") / "data" / "database" / "essential"
 MANEGE_DIR = Path(".") / "data" / "database" / "manege"
 TEMP_PATH = Path(".") / "data" / "temp"
-os.makedirs(ESSENTIAL_DIR, exist_ok=True)
-os.makedirs(MANEGE_DIR, exist_ok=True)
-os.makedirs(TEMP_PATH, exist_ok=True)
+ESSENTIAL_DIR.mkdir(parents=True, exist_ok=True)
+MANEGE_DIR.mkdir(parents=True, exist_ok=True)
+TEMP_PATH.mkdir(parents=True, exist_ok=True)
 
 
 @driver.on_startup
@@ -368,7 +367,7 @@ async def _():
 async def _clear_cache():
     try:
         shutil.rmtree(TEMP_PATH)
-        os.makedirs(TEMP_PATH, exist_ok=True)
+        TEMP_PATH.mkdir(parents=True, exist_ok=True)
     except Exception:
         log.warning("清除缓存失败，请手动清除：data/temp")
 
diff --git a/ATRI/plugins/help/data_source.py b/ATRI/plugins/help/data_source.py
index e3dd1ff..d926417 100644
--- a/ATRI/plugins/help/data_source.py
+++ b/ATRI/plugins/help/data_source.py
@@ -9,6 +9,7 @@ from ATRI.service import Service, SERVICES_DIR, ServiceTools
 from ATRI.config import BotSelfConfig
 from ATRI.exceptions import ReadFileError
 
+
 SERVICE_INFO_FORMAT = """
 服务名：{service}
 说明：{docs}
diff --git a/ATRI/plugins/kimo/data_source.py b/ATRI/plugins/kimo/data_source.py
index fb3f3f3..025f999 100644
--- a/ATRI/plugins/kimo/data_source.py
+++ b/ATRI/plugins/kimo/data_source.py
@@ -1,4 +1,3 @@
-import os
 import json
 from pathlib import Path
 from jieba import posseg
@@ -12,7 +11,7 @@ from ATRI.exceptions import ReadFileError, WriteFileError
 
 
 CHAT_PATH = Path(".") / "data" / "database" / "kimo"
-os.makedirs(CHAT_PATH, exist_ok=True)
+CHAT_PATH.mkdir(parents=True, exist_ok=True)
 KIMO_URL = "https://cdn.jsdelivr.net/gh/Kyomotoi/AnimeThesaurus/data.json"
 
 
diff --git a/ATRI/plugins/manage/data_source.py b/ATRI/plugins/manage/data_source.py
index 395a165..1d870e6 100644
--- a/ATRI/plugins/manage/data_source.py
+++ b/ATRI/plugins/manage/data_source.py
@@ -1,4 +1,3 @@
-import os
 import json
 from pathlib import Path
 from datetime import datetime
@@ -9,8 +8,9 @@ from ATRI.exceptions import ReadFileError, load_error
 
 MANAGE_DIR = Path(".") / "data" / "database" / "manege"
 ESSENTIAL_DIR = Path(".") / "data" / "database" / "essential"
-os.makedirs(MANAGE_DIR, exist_ok=True)
-os.makedirs(ESSENTIAL_DIR, exist_ok=True)
+MANAGE_DIR.mkdir(parents=True, exist_ok=True)
+ESSENTIAL_DIR.mkdir(parents=True, exist_ok=True)
+
 
 TRACK_BACK_FORMAT = """Track ID：{track_id}
 Prompt: {prompt}
diff --git a/ATRI/plugins/polaroid/data_source.py b/ATRI/plugins/polaroid/data_source.py
index d4df4fe..3575342 100644
--- a/ATRI/plugins/polaroid/data_source.py
+++ b/ATRI/plugins/polaroid/data_source.py
@@ -1,5 +1,4 @@
-import asyncio
-
+from ATRI import driver
 from ATRI.service import Service
 from ATRI.rule import is_in_service
 from ATRI.utils import request
@@ -56,5 +55,4 @@ async def init_source():
                 raise WriteFileError("装载资源失败")
 
 
-loop = asyncio.get_event_loop()
-loop.create_task(init_source())
+driver().on_startup(init_source)
diff --git a/ATRI/plugins/setu/tf_dealer.py b/ATRI/plugins/setu/tf_dealer.py
index 58b4337..a6bd3f0 100644
--- a/ATRI/plugins/setu/tf_dealer.py
+++ b/ATRI/plugins/setu/tf_dealer.py
@@ -1,5 +1,4 @@
 import io
-import os
 import re
 import asyncio
 import skimage
@@ -18,8 +17,8 @@ from ATRI.exceptions import RequestError, WriteFileError
 
 SETU_PATH = Path(".") / "data" / "database" / "setu"
 TEMP_PATH = Path(".") / "data" / "temp"
-os.makedirs(SETU_PATH, exist_ok=True)
-os.makedirs(TEMP_PATH, exist_ok=True)
+SETU_PATH.mkdir(parents=True, exist_ok=True)
+TEMP_PATH.mkdir(parents=True, exist_ok=True)
 
 
 MODULE_URL = "https://cdn.jsdelivr.net/gh/Kyomotoi/CDN@master/project/ATRI/nsfw.tflite"
diff --git a/ATRI/plugins/wife/data_source.py b/ATRI/plugins/wife/data_source.py
index 9ba1e93..7074f93 100644
--- a/ATRI/plugins/wife/data_source.py
+++ b/ATRI/plugins/wife/data_source.py
@@ -1,4 +1,3 @@
-import os
 import json
 from random import choice
 from pathlib import Path
@@ -9,7 +8,7 @@ from ATRI.rule import is_in_service
 
 
 WIFE_DIR = Path(".") / "data" / "database" / "wife"
-os.makedirs(WIFE_DIR, exist_ok=True)
+WIFE_DIR.mkdir(parents=True, exist_ok=True)
 
 
 class Wife(Service):
@@ -38,7 +37,7 @@ class Wife(Service):
                 ),
             ]
         )
-        result = MessageSegment.at(user_id) + content
+        result = MessageSegment.at(user_id) + content  # type: ignore
         return result
 
     @staticmethod
diff --git a/ATRI/service.py b/ATRI/service.py
index c52f5ca..043ff67 100644
--- a/ATRI/service.py
+++ b/ATRI/service.py
@@ -1,4 +1,3 @@
-import os
 import re
 import json
 from pathlib import Path
@@ -20,10 +19,8 @@ from nonebot.rule import Rule, command, keyword, regex
 from ATRI.exceptions import ReadFileError, WriteFileError
 
 
-SERVICE_DIR = Path(".") / "data" / "service"
-SERVICES_DIR = SERVICE_DIR / "services"
-os.makedirs(SERVICE_DIR, exist_ok=True)
-os.makedirs(SERVICES_DIR, exist_ok=True)
+SERVICES_DIR = Path(".") / "data" / "services"
+SERVICES_DIR.mkdir(parents=True, exist_ok=True)
 
 
 class ServiceInfo(BaseModel):