nonebot-plugin-rollpig 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

nonebot_plugin_rollpig/__init__.py

@@ -1,11 +1,32 @@
-import json, random, datetime
+import json, random, datetime, asyncio, requests
 from pathlib import Path
 
-from nonebot import on_command, require
+from nonebot import on_command, require, on_startup
 from nonebot.adapters.onebot.v11 import Event, MessageSegment
 from nonebot.log import logger
 from nonebot.plugin import PluginMetadata
-import requests
+
+pig_images = []
+
+@on_startup
+async def load_pig_images():
+    global pig_images
+    try:
+        data = await asyncio.to_thread(sync_fetch_pig_data, "https://pighub.top/api/all-images")
+        
+        if data and data.get("images"):
+            pig_images = data["images"]
+            logger.success(f"成功从 PigHub 缓存 {len(pig_images)} 头猪猪")
+        else:
+            logger.warning("PigHub 中找不到猪猪")
+    except requests.exceptions.RequestException as e:
+        logger.error(f"从PigHub中获取猪猪失败: {e}")
+
+def sync_fetch_pig_data(url: str):
+    response = requests.get(url, timeout=30)
+    response.raise_for_status()
+
+    return response.json()
 
 # 确保依赖插件先被 NoneBot 注册
 require("nonebot_plugin_htmlrender")
@@ -20,7 +41,7 @@ __plugin_meta__ = PluginMetadata(
     description="抽取属于自己的小猪",
     usage="""
     今日小猪 - 抽取今天属于你的小猪
-    随机小猪 - 从pighub随机获取一张猪猪图
+    随机小猪 - 从PigHub随机获取一张猪猪图
     """,
     type="application",
     homepage="https://github.com/Bearlele/nonebot-plugin-rollpig",
@@ -41,18 +62,28 @@ roll_pig = on_command("随机小猪", block=True)
 
 @roll_pig.handle()
 async def _(event: Event):
-    try:
-        response = requests.get("https://pighub.top/api/all-images")
-        response.raise_for_status()  # 检查请求是否成功
-        data = response.json()
-        if data and data["images"]:
-            pig = random.choice(data["images"])
-            image_url = "https://pighub.top/data/" + pig["thumbnail"].split("/")[-1]
-            await roll_pig.finish(MessageSegment.image(image_url))
-        else:
-            await roll_pig.finish("没有找到小猪图片")
-    except requests.exceptions.RequestException as e:
-        await roll_pig.finish(f"请求出错：{e}")
+    global pig_images
+    if not pig_images:
+        await roll_pig.finish("猪圈空荡荡，猪猪还没加载出来或者加载失败了...")
+        
+        # 再次尝试
+        try:
+            data = await asyncio.to_thread(sync_fetch_pig_data, "https://pighub.top/api/all-images")
+            if data and data.get("images"):
+                pig_images = data["images"]
+                logger.success(f"成功从 PigHub 缓存 {len(pig_images)} 头猪猪")
+            else:
+                logger.warning("PigHub 中找不到猪猪")
+        except requests.exceptions.RequestException as e:
+            logger.error(f"从PigHub中获取猪猪失败: {e}")
+        
+        if not pig_images:
+            await roll_pig.finish("猪圈空荡荡，猪猪还是没加载出来...")
+            return
+
+    pig = random.choice(pig_images)
+    image_url = "https://pighub.top/data/" + pig["thumbnail"].split("/")[-1]
+    await roll_pig.finish(MessageSegment.image(image_url))
 
 
 def load_json(path, default):
@@ -78,7 +109,7 @@ def find_image_file(pig_id: str) -> Path | None:
 # 载入小猪信息
 PIG_LIST = load_json(PIGINFO_PATH, [])
 if not PIG_LIST:
-    logger.error("小猪信息为空或不存在，请检查资源文件！")
+    logger.error("猪圈空荡荡，请检查资源文件！")
 
 # 主函数
 @cmd.handle()

{nonebot_plugin_rollpig-0.2.3.dist-info → nonebot_plugin_rollpig-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot_plugin_rollpig
-Version: 0.2.3
+Version: 0.2.4
 Summary: 今天是什么小猪
 License: MIT
 License-File: LICENSE

{nonebot_plugin_rollpig-0.2.3.dist-info → nonebot_plugin_rollpig-0.2.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-nonebot_plugin_rollpig/__init__.py,sha256=LQf4_AmGVwpiiVMMMeaeHZCXZ8E_NDvkLqZ4HU6XW-w,4396
+nonebot_plugin_rollpig/__init__.py,sha256=BkTa4KmzREAFDwqm_VaEdQJIPxgzwe26lNcVFXmT7A0,5501
 nonebot_plugin_rollpig/resource/image/android-pig.png,sha256=WwY2rtsABH8YbDDIoQDR6WdHW8qpStm_lF8eXZ4K-Tc,37845
 nonebot_plugin_rollpig/resource/image/apple-pig.png,sha256=HSh8SRguD65ZZLnbnTgtNiAqqNzZKuFijtKIC3TLZDU,41533
 nonebot_plugin_rollpig/resource/image/bacon.png,sha256=7G86_W17C14qCRDKCGuRES4yfidIrIMz2gxOat3Gnn8,55722
@@ -45,7 +45,7 @@ nonebot_plugin_rollpig/resource/image/zhuge-liang.png,sha256=yvF5hNUzBXJIHi-vwg5
 nonebot_plugin_rollpig/resource/image/zombie-pig.png,sha256=fKQlp_kI3x8wMlVUT6U-rilMLpH0TpT_-ViNVWBSbcM,20797
 nonebot_plugin_rollpig/resource/pig.json,sha256=0YHz5eLZOSwo-3Yh44UgXrZ4vTmpvSDMx9Ejh0htlxM,13236
 nonebot_plugin_rollpig/resource/template.html,sha256=vX7vbT3BmmsXhswiUIHqHNLds_CcUQIuZKdnz5bVthc,1060
-nonebot_plugin_rollpig-0.2.3.dist-info/licenses/LICENSE,sha256=zn7XqavdCw11Nln_m8Eu0S7C3rZ9C-VGbqbrVGeSTGg,1087
-nonebot_plugin_rollpig-0.2.3.dist-info/METADATA,sha256=oZINPcuDR7NUb6oIPeN4RYfNuRGw8o5AyFisOp3xy5w,2720
-nonebot_plugin_rollpig-0.2.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-nonebot_plugin_rollpig-0.2.3.dist-info/RECORD,,
+nonebot_plugin_rollpig-0.2.4.dist-info/licenses/LICENSE,sha256=zn7XqavdCw11Nln_m8Eu0S7C3rZ9C-VGbqbrVGeSTGg,1087
+nonebot_plugin_rollpig-0.2.4.dist-info/METADATA,sha256=Ewp0ze1G1_24hTqyDlWkcA-xYhgRH_i9_igiBFRlAng,2720
+nonebot_plugin_rollpig-0.2.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+nonebot_plugin_rollpig-0.2.4.dist-info/RECORD,,