♻️ 去除不必要的 async/await

Author: NekoAria

YetAnotherPicSearch/__init__.py

@@ -65,7 +65,7 @@ async def image_search(
         ensure_ascii=False,
     )
     image_md5 = re.search("[A-F0-9]{32}", url)[0]  # type: ignore
-    _result = await exist_in_cache(db, image_md5, mode)
+    _result = exist_in_cache(db, image_md5, mode)
     cached = bool(_result)
     if purge or not _result:
         result_dict: Dict[str, Any] = {}
@@ -82,7 +82,7 @@ async def image_search(
         db.upsert(
             _result.__dict__, (Query().image_md5 == image_md5) & (Query().mode == mode)
         )
-    await clear_expired_cache(db)
+    clear_expired_cache(db)
     db.close()
     if mode == "a2d":
         final_res = _result.ascii2d
@@ -91,15 +91,15 @@ async def image_search(
     else:
         final_res = _result.saucenao
     if cached and not purge:
-        return [f"[缓存] {i}" for i in final_res]  # type: ignore
+        return [f"[缓存] {i}" for i in final_res]
     return final_res
 
 
-async def get_image_urls(msg: Message) -> List[str]:
+def get_image_urls(msg: Message) -> List[str]:
     return [i.data["url"] for i in msg if i.type == "image" and i.data.get("url")]
 
 
-async def get_args(msg: Message) -> Tuple[str, bool]:
+def get_args(msg: Message) -> Tuple[str, bool]:
     mode = "all"
     plain_text = msg.extract_plain_text()
     args = ["a2d", "pixiv", "danbooru", "doujin", "anime", "ex"]
@@ -115,10 +115,10 @@ async def get_args(msg: Message) -> Tuple[str, bool]:
 @IMAGE_SEARCH_MODE.got("IMAGES", prompt="请发送图片及搜索类型（可选）")
 async def handle_image_search(bot: Bot, event: MessageEvent) -> None:
     message = event.reply.message if event.reply else event.message
-    image_urls = await get_image_urls(message)
+    image_urls = get_image_urls(message)
     if not image_urls:
         await IMAGE_SEARCH_MODE.reject()
-    mode, purge = await get_args(event.message)
+    mode, purge = get_args(event.message)
     for i in image_urls:
         msg_list = await image_search(i, mode, purge, config.proxy)
         if isinstance(event, PrivateMessageEvent):

YetAnotherPicSearch/ascii2d.py

@@ -20,7 +20,7 @@ async def get_final_res(res: Ascii2DResponse) -> str:
                 thumbnail = await handle_img(res.raw[0].thumbnail, proxy, hide_img)
                 _url = ""
                 if res.raw[0]:
-                    _url = await shorten_url(res.raw[0].url)
+                    _url = shorten_url(res.raw[0].url)
                 res_list = [
                     f"{thumbnail}",
                     f"{res.raw[0].title}" if res.raw[0].title else "",

YetAnotherPicSearch/cache.py

@@ -9,7 +9,7 @@
 from .result import Result
 
 
-async def exist_in_cache(db: TinyDB, image_md5: str, mode: str) -> Optional[Result]:
+def exist_in_cache(db: TinyDB, image_md5: str, mode: str) -> Optional[Result]:
     result: Optional[Result] = None
     cache_result: List[Document] = db.search(
         (Query().image_md5 == image_md5) & (Query().mode == mode)
@@ -22,6 +22,6 @@ async def exist_in_cache(db: TinyDB, image_md5: str, mode: str) -> Optional[Resu
     return result
 
 
-async def clear_expired_cache(db: TinyDB) -> None:
+def clear_expired_cache(db: TinyDB) -> None:
     expired_date = arrow.now().shift(days=-config.cache_expire).for_json()
     db.remove(Query().update_at < expired_date)

YetAnotherPicSearch/result.py

@@ -3,10 +3,9 @@
 
 class Result:
     def __init__(self, mapping: Dict[str, Any]):
-        self.ascii2d: Optional[List[str]] = []
-        self.saucenao: Optional[List[str]] = []
-        self.whatanime: Optional[List[str]] = []
-        self.ex: Optional[List[str]] = []
+        self.ascii2d: List[str] = []
+        self.saucenao: List[str] = []
+        self.ex: List[str] = []
         self.image_md5: Optional[str] = None
         self.update_at: Optional[str] = None
         self.mode: str = "all"

YetAnotherPicSearch/saucenao.py

@@ -44,15 +44,15 @@ async def saucenao_search(
                         selected_res.url = i
             thumbnail = await handle_img(selected_res.thumbnail, proxy, hide_img)
             if selected_res.origin["data"].get("source"):
-                source = await shorten_url(selected_res.origin["data"]["source"])
+                source = shorten_url(selected_res.origin["data"]["source"])
             else:
-                source = await shorten_url(await get_source(selected_res.url, proxy))
+                source = shorten_url(await get_source(selected_res.url, proxy))
             # 如果结果为 doujin ，尝试返回日文标题而不是英文标题
             if selected_res.index_id == saucenao_db["doujin"] and selected_res.origin[
                 "data"
             ].get("jp_name"):
                 selected_res.title = selected_res.origin["data"]["jp_name"]
-            _url = await shorten_url(selected_res.url)
+            _url = shorten_url(selected_res.url)
             res_list = [
                 f"SauceNAO（{selected_res.similarity}%）",
                 f"{thumbnail}",

YetAnotherPicSearch/utils.py

@@ -17,7 +17,7 @@ async def get_pic_base64_by_url(
     async with aiohttp.ClientSession(headers=headers) as session:
         async with session.get(url, proxy=proxy) as resp:
             if resp.status == 200:
-                return base64.b64encode(await resp.read()).decode("utf-8")
+                return base64.b64encode(await resp.read()).decode()
     return ""
 
 
@@ -57,7 +57,7 @@ async def get_source(url: str, proxy: Optional[str]) -> str:
     return str(source)
 
 
-async def shorten_url(url: str) -> str:
+def shorten_url(url: str) -> str:
     pid_search = re.compile(
         r"(?:pixiv.+(?:illust_id=|artworks/)|/img-original/img/(?:\d+/){6})(\d+)"
     )