update v0.0.9.0

plugins/send_setu_/send_setu/__init__.py

@@ -9,7 +9,7 @@ from gino.exceptions import UninitializedError
 from utils.utils import (
     is_number,
     get_message_text,
-    get_message_imgs,
+    get_message_img,
 )
 from nonebot.typing import T_State
 from nonebot.adapters.cqhttp import (
@@ -243,7 +243,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     if str(event.message) == "取消":
         await find_setu.finish("取消了操作", at_sender=True)
-    imgs = get_message_imgs(event.json())
+    imgs = get_message_img(event.json())
     if not imgs:
         await find_setu.reject("不搞错了，俺要图！")
     state["img"] = imgs[0]
@@ -253,7 +253,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     if get_message_text(event.json()) in ["帮助"]:
         await find_setu.finish("通过图片获取本地色图id\n\t示例：查色图(图片)")
-    imgs = get_message_imgs(event.json())
+    imgs = get_message_img(event.json())
     if imgs:
         state["img"] = imgs[0]
 

plugins/send_setu_/update_setu/__init__.py

@@ -32,7 +32,7 @@ update_setu = on_command(
 async def _(bot: Bot, event: Event, state: T_State):
     if Config.get_config("send_setu", "DOWNLOAD_SETU"):
         await update_setu.send("开始更新色图...", at_sender=True)
-        await update_setu.send(await update_setu_img(), at_sender=True)
+        await update_setu_img(True)
     else:
         await update_setu.finish("更新色图配置未开启")
 

plugins/send_setu_/update_setu/data_source.py

@@ -90,7 +90,11 @@ headers = {
 }
 
 
-async def update_setu_img():
+async def update_setu_img(flag: bool = False):
+    """
+    更新色图
+    :param flag: 是否手动更新
+    """
     image_list = await Setu.get_all_setu()
     image_list.reverse()
     _success = 0
@@ -105,6 +109,9 @@ async def update_setu_img():
         path.mkdir(exist_ok=True, parents=True)
         rar_path.mkdir(exist_ok=True, parents=True)
         if not local_image.exists() or not image.img_hash:
+            temp_file = rar_path / f"{image.local_id}.jpg"
+            if temp_file.exists():
+                temp_file.unlink()
             url_ = image.img_url
             ws_url = Config.get_config("pixiv", "PIXIV_NGINX_URL")
             if ws_url:
@@ -158,8 +165,7 @@ async def update_setu_img():
                     error_info.append(f"更新色图 {image.local_id}.jpg 错误 {type(e)}: {e}")
         else:
             logger.info(f"更新色图 {image.local_id}.jpg 已存在")
-    error_info = ["无报错.."] if not error_info else error_info
-    if count or _success or error_info:
+    if _success or error_info or flag:
         await get_bot().send_private_msg(
             user_id=int(list(get_bot().config.superusers)[0]),
             message=f'{str(datetime.now()).split(".")[0]} 更新 色图 完成，本地存在 {count} 张，实际更新 {_success} 张，'