From ba22befda1b7554f560d4986dda0efecc0ec9bff Mon Sep 17 00:00:00 2001
From: jinye_huang <jinye_huang@foxmail.com>
Date: Sun, 27 Apr 2025 16:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BA=86=E9=80=89=E5=9B=BE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simple_collage.cpython-312.pyc            | Bin 39988 -> 35060 bytes
 core/simple_collage.py                        | 245 ++++++------------
 .../tweet_generator.cpython-312.pyc           | Bin 34533 -> 34533 bytes
 3 files changed, 73 insertions(+), 172 deletions(-)

diff --git a/core/__pycache__/simple_collage.cpython-312.pyc b/core/__pycache__/simple_collage.cpython-312.pyc
index f3a325bfdb223ca6cf02308fdaf1dffd1011ff93..ad0f3c3b6cb038988e282691e7efef8db9a6498e 100644
GIT binary patch
delta 8550
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
LqCAl=M;8Ad4C@B`

delta 12666
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

diff --git a/core/simple_collage.py b/core/simple_collage.py
index 19955a6..4892f7d 100644
--- a/core/simple_collage.py
+++ b/core/simple_collage.py
@@ -6,14 +6,11 @@ import math
 from pathlib import Path
 from PIL import Image, ImageDraw, ImageEnhance, ImageFilter, ImageOps
 import logging # Import logging module
-import re
 
 class ImageCollageCreator:
     def __init__(self, ):
         """初始化拼图创建器"""
-        self.collage_style = None
-        self.created_collages = []
-        
+
         # 定义可用拼接样式
         self.collage_styles = [
             "grid_2x2",       # 标准2x2网格
@@ -136,121 +133,33 @@ class ImageCollageCreator:
             print(f"增强图片效果时出错: {str(e)}")
             return img
     
-    def find_directory_fuzzy_match(self, base_dir, target_name):
-        """
-        对图片目录进行模糊匹配，查找最匹配目标名称的目录
-        
-        Args:
-            base_dir: 基础目录路径
-            target_name: 目标对象名称
-            
-        Returns:
-            tuple: (最佳匹配目录路径, 匹配分数) 如果没有匹配则返回 (None, 0)
-        """
-        logging.info(f"尝试对图片目录进行模糊匹配: {target_name}")
-        
-        try:
-            # 1. 获取base_dir下的所有目录
-            all_dirs = [d for d in os.listdir(base_dir) 
-                       if os.path.isdir(os.path.join(base_dir, d))]
-            logging.info(f"找到 {len(all_dirs)} 个图片目录可用于模糊匹配")
-            
-            if not all_dirs:
-                logging.warning(f"基础目录 {base_dir} 下没有可用于匹配的子目录")
-                return None, 0
-            
-            # 2. 提取对象名称中的关键词
-            # 首先通过常见分隔符分割（+、空格、_、-等）
-            parts = re.split(r'[+\s_\-]', target_name)
-            keywords = []
-            for part in parts:
-                # 只保留长度大于1的有意义关键词
-                if len(part) > 1:
-                    keywords.append(part)
-            
-            # 尝试匹配更短的语义单元（例如中文的2-3个字的词语）
-            for i in range(len(target_name) - 1):
-                keyword = target_name[i:i+2]  # 提取2个字符
-                if len(keyword) == 2 and all('\u4e00' <= c <= '\u9fff' for c in keyword):
-                    keywords.append(keyword)
-            
-            logging.info(f"用于目录模糊匹配的关键词: {keywords}")
-            
-            # 3. 对每个目录进行评分
-            dir_scores = {}
-            for directory in all_dirs:
-                score = 0
-                dir_lower = directory.lower()
-                # 为每个匹配的关键词增加分数
-                for keyword in keywords:
-                    if keyword.lower() in dir_lower:
-                        score += 1
-                
-                # 如果得分大于0（至少匹配一个关键词），记录该目录
-                if score > 0:
-                    dir_scores[directory] = score
-            
-            # 4. 选择得分最高的目录
-            if dir_scores:
-                best_match = max(dir_scores.items(), key=lambda x: x[1])
-                found_dir = best_match[0]
-                score = best_match[1]
-                logging.info(f"模糊匹配成功！匹配目录: {found_dir}，匹配分数: {score}")
-                return os.path.join(base_dir, found_dir), score
-            else:
-                logging.warning(f"模糊匹配未找到任何包含关键词的目录")
-                return None, 0
-                
-        except Exception as e:
-            logging.exception(f"目录模糊匹配过程中出错: {e}")
-            return None, 0
-    
     def create_collage_with_style(self, input_dir, style=None, target_size=None):
-        """
-        创建特定样式的照片拼贴。
-        如果input_dir不存在，会尝试进行模糊匹配。
+        """创建指定样式的拼接画布
         
-        Args:
-            input_dir: 包含图片的目录路径或目标对象名称
-            style: 拼贴画样式，例如"grid_2x2", "overlap"等
-            target_size: 拼贴画目标尺寸，例如(900, 1200)
+        参数:
+            input_dir: 输入图片目录路径
+            style: 拼贴样式，如不指定则随机选择
+            target_size: 目标尺寸，默认为(900, 1200)
             
-        Returns:
-            tuple: (PIL.Image 拼贴画对象, 使用的图片文件列表)
+        返回:
+            tuple: (拼贴图, 选择的图片名称列表)，如果创建失败则返回(None, [])
         """
+        logging.info(f"--- Starting Collage Creation for Directory: {input_dir} ---") # Start Log
         try:
-            # 使用默认样式如果未指定
-            if style is None:
-                if self.collage_style is None:
-                    style = "grid_2x2"
-                else:
-                    style = self.collage_style
-            logging.info(f"Using collage style: {style}")
-
-            # 使用默认尺寸如果未指定
+            # 设置默认尺寸为3:4比例
             if target_size is None:
-                target_size = (900, 1200)  # 默认尺寸
+                target_size = (900, 1200)  # 3:4比例
+                
+            # 如果没有指定样式，随机选择一种
+            if style is None or style not in self.collage_styles:
+                style = random.choice(self.collage_styles)
             logging.info(f"Using collage style: {style} with target size: {target_size}")
             
-            # 检查输入目录是否存在
-            if not os.path.exists(input_dir) or not os.path.isdir(input_dir):
-                # 尝试从输入路径获取基础目录和对象名称
-                base_dir = os.path.dirname(input_dir)
-                object_name = os.path.basename(input_dir)
-                
-                # 如果基础目录存在，尝试模糊匹配
-                if os.path.exists(base_dir) and os.path.isdir(base_dir):
-                    matched_dir, score = self.find_directory_fuzzy_match(base_dir, object_name)
-                    if matched_dir and score > 0:
-                        logging.info(f"使用模糊匹配的图片目录: {matched_dir}")
-                        input_dir = matched_dir
-                    else:
-                        logging.error(f"无法找到匹配的图片目录: {input_dir}")
-                        return None, []
-                else:
-                    logging.error(f"输入目录不存在且无法进行模糊匹配: {input_dir}")
-                    return None, []
-
+            # 检查目录是否存在
+            if not os.path.exists(input_dir):
+                logging.error(f"Input directory does not exist: {input_dir}")
+                return None, []
+            
             # 支持的图片格式
             image_extensions = ('.jpg', '.jpeg', '.png', '.bmp')
             
@@ -781,82 +690,74 @@ class ImageCollageCreator:
 
 def process_directory(directory_path, style=None, target_size=(900, 1200), output_count=1):
     """
-    处理目录中的图片并创建指定数量的拼贴图
+    处理指定目录中的图片，创建指定数量的拼贴图。
     
-    如果给定的目录不存在，会尝试进行模糊匹配。
-    
-    Args:
-        directory_path: 图片目录路径或目标对象名称
-        style: 拼贴画样式，例如"grid_2x2"，如果为None则随机选择
-        target_size: 拼贴画尺寸，默认为(900, 1200)
-        output_count: 要生成的拼贴画数量
-    
-    Returns:
-        list: 成功创建的拼贴图列表 (PIL Image对象)
+    参数:
+        directory_path: 包含图片的目录路径
+        target_size: 拼贴图目标尺寸，默认为 (900, 1200)
+        output_count: 需要生成的拼贴图数量，默认为 1
+        
+    返回:
+        tuple: (拼贴图列表, 使用的图片名称列表的列表)，如果生成失败，返回 ([], [])
+              拼贴图列表是PIL.Image对象列表
+              图片名称列表是一个列表的列表，每个子列表包含一张拼贴图使用的图片文件名
     """
     logging.info(f"处理目录中的图片并创建 {output_count} 个拼贴图: {directory_path}")
     
-    # 创建拼贴图实例
+    # 创建 ImageCollageCreator 实例
     collage_creator = ImageCollageCreator()
+    collage_images = []
+    used_image_names = []  # 存储每个拼贴图使用的图片文件名
     
-    # 如果指定了样式，设置样式
-    if style:
-        collage_creator.set_collage_style(style)
-        
     # 检查目录是否存在
-    if not os.path.exists(directory_path) or not os.path.isdir(directory_path):
-        # 尝试从路径获取基础目录和对象名称
-        base_dir = os.path.dirname(directory_path)
-        object_name = os.path.basename(directory_path)
+    if not os.path.exists(directory_path):
+        logging.error(f"目录不存在: {directory_path}")
+        return [], []
         
-        # 如果基础目录存在，尝试模糊匹配
-        if os.path.exists(base_dir) and os.path.isdir(base_dir):
-            matched_dir, score = collage_creator.find_directory_fuzzy_match(base_dir, object_name)
-            if matched_dir and score > 0:
-                logging.info(f"使用模糊匹配的图片目录: {matched_dir}")
-                directory_path = matched_dir
-            else:
-                logging.error(f"无法找到匹配的图片目录: {directory_path}")
-                return []
-        else:
-            logging.error(f"输入目录不存在且无法进行模糊匹配: {directory_path}")
-            return []
+    # 支持的图片格式
+    image_extensions = ('.jpg', '.jpeg', '.png', '.bmp')
     
-    # 获取有效图片文件列表
-    image_extensions = ('.jpg', '.jpeg', '.png', '.webp', '.bmp', '.gif')
+    # 获取目录中的所有有效图片文件
     try:
         all_files = os.listdir(directory_path)
-        image_files = [f for f in all_files 
-                     if f.lower().endswith(image_extensions) and os.path.isfile(os.path.join(directory_path, f))]
-        logging.info(f"目录中找到 {len(image_files)} 个有效图片文件")
-        
-        if not image_files:
-            logging.warning(f"目录中未找到有效图片: {directory_path}")
-            return []
+        all_images_names = [f for f in all_files 
+                           if f.lower().endswith(image_extensions) and os.path.isfile(os.path.join(directory_path, f))]
+                           
+        if not all_images_names:
+            logging.error(f"目录中没有有效的图片文件: {directory_path}")
+            return [], []
+            
+        logging.info(f"目录中找到 {len(all_images_names)} 个有效图片文件")
     except Exception as e:
-        logging.exception(f"无法读取目录 {directory_path}: {e}")
-        return []
+        logging.exception(f"列出目录内容时出错: {e}")
+        return [], []
         
-    # 创建指定数量的拼贴图
-    created_collages = []
+    # 尝试创建请求数量的拼贴图
     for i in range(output_count):
-        # 如果指定了样式，则使用指定样式；否则让create_collage_with_style自行选择
-        if style:
-            collage, used_images = collage_creator.create_collage_with_style(directory_path, style=style, target_size=target_size)
-        else:
-            # 随机选择一种样式
-            available_styles = collage_creator.collage_styles
-            random_style = random.choice(available_styles)
-            collage, used_images = collage_creator.create_collage_with_style(directory_path, style=random_style, target_size=target_size)
+        try:
+            # 创建拼贴图，使用指定样式
+            collage, selected_images_names = collage_creator.create_collage_with_style(
+                directory_path, 
+                style=style,
+                target_size=target_size
+            )
             
-        if collage:
-            created_collages.append(collage)
-            logging.info(f"成功创建拼贴图 {len(created_collages)}/{output_count}")
-        else:
-            logging.warning(f"创建拼贴图 {i+1}/{output_count} 失败")
-            
-    logging.info(f"已处理目录 {directory_path}，成功创建 {len(created_collages)}/{output_count} 个拼贴图")
-    return created_collages
+            if collage:
+                collage_images.append(collage)
+                
+                # 从输出日志中解析出使用的图片名称
+                # 由于我们修改了create_collage_with_style来打印选择的图片
+                # 可能需要进一步修改为直接返回选择的图片
+                used_image_names.append(selected_images_names)
+                
+                logging.info(f"成功创建拼贴图 {i+1}/{output_count}")
+            else:
+                logging.error(f"无法创建拼贴图 {i+1}/{output_count}")
+        except Exception as e:
+            logging.exception(f"创建拼贴图 {i+1}/{output_count} 时发生异常: {e}")
+    
+    logging.info(f"已处理目录 {directory_path}，成功创建 {len(collage_images)}/{output_count} 个拼贴图")
+    return collage_images, used_image_names
 
 def find_main_subject(image):
     # ... (keep the existing implementation) ...
diff --git a/utils/__pycache__/tweet_generator.cpython-312.pyc b/utils/__pycache__/tweet_generator.cpython-312.pyc
index 03cf21d5037db0e1dc03d75d48060300187537b4..116e488886a2159c40e541162ca62cb8d3ff5708 100644
GIT binary patch
delta 21
bcmaFb%k;FDiR&~kFBbz4I6U3Rb-N7!P#Fg!

delta 21
bcmaFb%k;FDiR&~kFBbz4#9Z9Sb-N7!P+bQr