图片内容，将图片地址缓存到redis，然后通过随机redis快速提取路径。减少等待时间
This commit is contained in:
liuwei
@@ -5,8 +5,10 @@ import os
|
||||
import random
|
||||
from typing import Dict, Any, List, Optional, Tuple
|
||||
|
||||
from db.connection import DBConnectionManager
|
||||
from plugin_common.message_plugin_interface import MessagePluginInterface
|
||||
from plugin_common.plugin_interface import PluginStatus
|
||||
from plugins.xiuren_image.images_cache import ImageCacheManager
|
||||
from utils.decorator.plugin_decorators import plugin_stats_decorator
|
||||
from utils.revoke.message_auto_revoke import MessageAutoRevoke
|
||||
from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
|
||||
@@ -50,19 +52,19 @@ class XiurenImagePlugin(MessagePluginInterface):
|
||||
"""初始化插件"""
|
||||
self.LOG = logger
|
||||
self.LOG.info(f"正在初始化 {self.name} 插件...")
|
||||
|
||||
|
||||
# 保存上下文对象
|
||||
self.event_system = context.get("event_system")
|
||||
|
||||
self._commands = self._config.get("XiurenImage", {}).get("command", ["图来", "秀人"])
|
||||
self.command_format = self._config.get("XiurenImage", {}).get("command-format", "图来")
|
||||
self.enable = self._config.get("XiurenImage", {}).get("enable", True)
|
||||
|
||||
|
||||
# 从配置获取图片文件夹，如果配置中有值则使用配置值
|
||||
config_image_folder = self._config.get("XiurenImage", {}).get("image_folder")
|
||||
if config_image_folder:
|
||||
self.image_folder = config_image_folder
|
||||
|
||||
|
||||
# 检查图片文件夹是否存在
|
||||
try:
|
||||
if not os.path.exists(self.image_folder):
|
||||
@@ -70,7 +72,7 @@ class XiurenImagePlugin(MessagePluginInterface):
|
||||
os.makedirs(self.image_folder, exist_ok=True)
|
||||
except Exception as e:
|
||||
self.LOG.error(f"创建图片文件夹失败: {e}")
|
||||
|
||||
|
||||
self.LOG.info(f"[{self.name}] 插件初始化完成，指令：{self._commands}，图片目录：{self.image_folder}")
|
||||
return True
|
||||
|
||||
@@ -114,6 +116,7 @@ class XiurenImagePlugin(MessagePluginInterface):
|
||||
try:
|
||||
# 获取随机图片
|
||||
pic_path = self._get_random_pic()
|
||||
self.LOG.info(f"返回图片地址：{pic_path}")
|
||||
if not pic_path:
|
||||
client_msg_id, create_time, new_msg_id = await bot.send_text_message((roomid if roomid else sender),
|
||||
f"❌未找到图片资源",
|
||||
@@ -135,54 +138,71 @@ class XiurenImagePlugin(MessagePluginInterface):
|
||||
return False, f"处理出错: {e}"
|
||||
|
||||
def _get_random_pic(self) -> Optional[str]:
|
||||
"""获取随机图片路径"""
|
||||
"""
|
||||
从 Redis 随机获取图片路径
|
||||
"""
|
||||
redis_key = ImageCacheManager.IMAGE_KEY_PREFIX + "all"
|
||||
try:
|
||||
# 获取图片文件夹中的所有图片
|
||||
if not os.path.exists(self.image_folder):
|
||||
self.LOG.error(f"图片文件夹不存在: {self.image_folder}")
|
||||
img = DBConnectionManager.get_instance().get_redis_connection().srandmember(redis_key)
|
||||
if img:
|
||||
# redis 返回 bytes，转字符串
|
||||
return img.decode('utf-8') if isinstance(img, bytes) else img
|
||||
else:
|
||||
self.LOG.warning("Redis 中没有图片数据")
|
||||
return None
|
||||
|
||||
# 检查读取权限
|
||||
if not os.access(self.image_folder, os.R_OK):
|
||||
self.LOG.error(f"没有图片文件夹的读取权限: {self.image_folder}")
|
||||
return None
|
||||
|
||||
self.LOG.debug(f"扫描图片目录: {self.image_folder} (包括子目录)")
|
||||
|
||||
image_extensions = {'.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff', '.webp'}
|
||||
image_files = []
|
||||
|
||||
# 使用 os.walk() 递归遍历所有子目录
|
||||
try:
|
||||
for root, _, files in os.walk(self.image_folder):
|
||||
for file in files:
|
||||
try:
|
||||
_, ext = os.path.splitext(file)
|
||||
if ext.lower() in image_extensions:
|
||||
full_path = os.path.join(root, file)
|
||||
# 检查文件是否可读
|
||||
if os.access(full_path, os.R_OK):
|
||||
image_files.append(full_path)
|
||||
else:
|
||||
self.LOG.warning(f"文件无法读取: {full_path}")
|
||||
except Exception as file_err:
|
||||
self.LOG.warning(f"处理文件时出错: {file} - {file_err}")
|
||||
except Exception as walk_err:
|
||||
self.LOG.error(f"遍历目录时出错: {walk_err}")
|
||||
return None
|
||||
|
||||
if not image_files:
|
||||
self.LOG.warning("在目录中未找到图片文件(包括子目录)")
|
||||
return None
|
||||
|
||||
# 随机选择一张图片
|
||||
try:
|
||||
random_pic = random.choice(image_files)
|
||||
return random_pic # 直接返回路径，不需要再调用os.path.abspath
|
||||
except Exception as choice_err:
|
||||
self.LOG.error(f"选择随机图片时出错: {choice_err}")
|
||||
return None
|
||||
|
||||
except Exception as e:
|
||||
self.LOG.error(f"获取随机图片出错: {e}")
|
||||
self.LOG.error(f"从 Redis 获取随机图片失败: {e}")
|
||||
return None
|
||||
|
||||
# def _get_random_pic(self) -> Optional[str]:
|
||||
# """获取随机图片路径"""
|
||||
# try:
|
||||
# # 获取图片文件夹中的所有图片
|
||||
# if not os.path.exists(self.image_folder):
|
||||
# self.LOG.error(f"图片文件夹不存在: {self.image_folder}")
|
||||
# return None
|
||||
#
|
||||
# # 检查读取权限
|
||||
# if not os.access(self.image_folder, os.R_OK):
|
||||
# self.LOG.error(f"没有图片文件夹的读取权限: {self.image_folder}")
|
||||
# return None
|
||||
#
|
||||
# self.LOG.debug(f"扫描图片目录: {self.image_folder} (包括子目录)")
|
||||
#
|
||||
# image_extensions = {'.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff', '.webp'}
|
||||
# image_files = []
|
||||
#
|
||||
# # 使用 os.walk() 递归遍历所有子目录
|
||||
# try:
|
||||
# for root, _, files in os.walk(self.image_folder):
|
||||
# for file in files:
|
||||
# try:
|
||||
# _, ext = os.path.splitext(file)
|
||||
# if ext.lower() in image_extensions:
|
||||
# full_path = os.path.join(root, file)
|
||||
# # 检查文件是否可读
|
||||
# if os.access(full_path, os.R_OK):
|
||||
# image_files.append(full_path)
|
||||
# else:
|
||||
# self.LOG.warning(f"文件无法读取: {full_path}")
|
||||
# except Exception as file_err:
|
||||
# self.LOG.warning(f"处理文件时出错: {file} - {file_err}")
|
||||
# except Exception as walk_err:
|
||||
# self.LOG.error(f"遍历目录时出错: {walk_err}")
|
||||
# return None
|
||||
#
|
||||
# if not image_files:
|
||||
# self.LOG.warning("在目录中未找到图片文件(包括子目录)")
|
||||
# return None
|
||||
#
|
||||
# # 随机选择一张图片
|
||||
# try:
|
||||
# random_pic = random.choice(image_files)
|
||||
# return random_pic # 直接返回路径，不需要再调用os.path.abspath
|
||||
# except Exception as choice_err:
|
||||
# self.LOG.error(f"选择随机图片时出错: {choice_err}")
|
||||
# return None
|
||||
#
|
||||
# except Exception as e:
|
||||
# self.LOG.error(f"获取随机图片出错: {e}")
|
||||
# return None
|
||||
|
||||
Reference in New Issue
Block a user