diff --git a/plugins/xiuren_image/main.py b/plugins/xiuren_image/main.py index ec2990e..72212d6 100644 --- a/plugins/xiuren_image/main.py +++ b/plugins/xiuren_image/main.py @@ -43,28 +43,36 @@ class XiurenImagePlugin(MessagePluginInterface): def __init__(self): super().__init__() - self.image_folder = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), - "xiuren") + # 使用Path对象处理路径,自动适应不同操作系统 + self.image_folder = str(Path(Path(__file__).parent.parent.parent, "xiuren")) def initialize(self, context: Dict[str, Any]) -> bool: """初始化插件""" self.LOG = logger self.LOG.info(f"正在初始化 {self.name} 插件...") - + # 保存上下文对象 self.event_system = context.get("event_system") self.message_util = context.get("message_util") - + 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) - self.image_folder = self._config.get("XiurenImage", {}).get("image_folder") + + # 从配置获取图片文件夹,如果配置中有值则使用配置值 + config_image_folder = self._config.get("XiurenImage", {}).get("image_folder") + if config_image_folder: + self.image_folder = config_image_folder + # 检查图片文件夹是否存在 - if not os.path.exists(self.image_folder): - self.LOG.warning(f"图片文件夹不存在: {self.image_folder}") - os.makedirs(self.image_folder, exist_ok=True) - - self.LOG.info(f"[{self.name}] 插件初始化完成,指令:{self._commands}") + try: + if not os.path.exists(self.image_folder): + self.LOG.warning(f"图片文件夹不存在: {self.image_folder}") + 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 def start(self) -> bool: @@ -134,36 +142,48 @@ class XiurenImagePlugin(MessagePluginInterface): 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 = [] - if not os.path.exists(self.image_folder): - print(f"Error: Directory '{self.image_folder}' does not exist.") - return None - - if not os.access(self.image_folder, os.R_OK): - print(f"Error: No read access to directory '{self.image_folder}'.") - return None - - print(f"Scanning directory: {self.image_folder} (including subdirectories)") - + # 使用 os.walk() 递归遍历所有子目录 - for root, _, files in os.walk(self.image_folder): - for file in files: - _, ext = os.path.splitext(file) - if ext.lower() in image_extensions: - full_path = os.path.join(root, file) - image_files.append(full_path) - + 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: - print("No image files found in the directory (including subdirectories).") + self.LOG.warning("在目录中未找到图片文件(包括子目录)") return None + # 随机选择一张图片 - random_pic = random.choice(image_files) - if random_pic: - return os.path.abspath(random_pic) - else: + 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