feat: 移除图片适配模式功能
移除图片 fit 和 background 参数支持,简化图片渲染逻辑。系统恢复到直接使用 python-pptx 原生图片添加功能,图片将被拉伸到指定尺寸。 变更内容: - 移除 ImageElement 的 fit 和 background 字段 - 移除 metadata.dpi 配置 - 删除 utils/image_utils.py 图片处理工具模块 - 删除 validators/image_config.py 验证器 - 简化 PPTX 和 HTML 渲染器的图片处理逻辑 - HTML 渲染器使用硬编码 DPI=96(Web 标准) - 删除相关测试文件(单元测试、集成测试、e2e 测试) - 更新规格文档和用户文档 - 保留 Pillow 依赖用于未来可能的图片处理需求 影响: - 删除 11 个文件 - 修改 10 个文件 - 净减少 1558 行代码 - 所有 402 个测试通过 Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,101 +0,0 @@
|
||||
"""
|
||||
图片配置验证器
|
||||
|
||||
验证图片元素的 fit、background、dpi 等参数。
|
||||
"""
|
||||
|
||||
from typing import List
|
||||
from validators.result import ValidationIssue
|
||||
import re
|
||||
|
||||
|
||||
def validate_fit_value(fit: str) -> List[ValidationIssue]:
|
||||
"""
|
||||
验证 fit 参数值
|
||||
|
||||
Args:
|
||||
fit: fit 参数值
|
||||
|
||||
Returns:
|
||||
验证问题列表
|
||||
"""
|
||||
issues = []
|
||||
valid_fits = ['stretch', 'contain', 'cover', 'center']
|
||||
|
||||
if fit not in valid_fits:
|
||||
issues.append(ValidationIssue(
|
||||
level="ERROR",
|
||||
message=f"无效的 fit 值: {fit} (支持: {', '.join(valid_fits)})",
|
||||
location="",
|
||||
code="INVALID_FIT_VALUE"
|
||||
))
|
||||
|
||||
return issues
|
||||
|
||||
|
||||
def validate_background_color(color: str) -> List[ValidationIssue]:
|
||||
"""
|
||||
验证背景颜色格式
|
||||
|
||||
Args:
|
||||
color: 颜色字符串
|
||||
|
||||
Returns:
|
||||
验证问题列表
|
||||
"""
|
||||
issues = []
|
||||
|
||||
# 检查类型
|
||||
if not isinstance(color, str):
|
||||
issues.append(ValidationIssue(
|
||||
level="ERROR",
|
||||
message=f"无效的背景颜色格式: {color} (应为 #RRGGBB 或 #RGB)",
|
||||
location="",
|
||||
code="INVALID_COLOR_FORMAT"
|
||||
))
|
||||
return issues
|
||||
|
||||
pattern = r'^#([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})$'
|
||||
|
||||
if not re.match(pattern, color):
|
||||
issues.append(ValidationIssue(
|
||||
level="ERROR",
|
||||
message=f"无效的背景颜色格式: {color} (应为 #RRGGBB 或 #RGB)",
|
||||
location="",
|
||||
code="INVALID_COLOR_FORMAT"
|
||||
))
|
||||
|
||||
return issues
|
||||
|
||||
|
||||
def validate_dpi_value(dpi: int) -> List[ValidationIssue]:
|
||||
"""
|
||||
验证 DPI 值
|
||||
|
||||
Args:
|
||||
dpi: DPI 值
|
||||
|
||||
Returns:
|
||||
验证问题列表
|
||||
"""
|
||||
issues = []
|
||||
|
||||
# 检查类型
|
||||
if not isinstance(dpi, int):
|
||||
issues.append(ValidationIssue(
|
||||
level="ERROR",
|
||||
message=f"DPI 值必须是整数: {dpi}",
|
||||
location="",
|
||||
code="INVALID_DPI_TYPE"
|
||||
))
|
||||
return issues
|
||||
|
||||
if dpi < 72 or dpi > 300:
|
||||
issues.append(ValidationIssue(
|
||||
level="WARNING",
|
||||
message=f"DPI 值可能不合适: {dpi} (建议范围: 72-300)",
|
||||
location="",
|
||||
code="DPI_OUT_OF_RANGE"
|
||||
))
|
||||
|
||||
return issues
|
||||
@@ -9,7 +9,6 @@ from loaders.yaml_loader import load_yaml_file, validate_presentation_yaml, YAML
|
||||
from validators.result import ValidationResult, ValidationIssue
|
||||
from validators.geometry import GeometryValidator
|
||||
from validators.resource import ResourceValidator
|
||||
from validators.image_config import validate_dpi_value
|
||||
from core.elements import create_element
|
||||
|
||||
|
||||
@@ -71,12 +70,6 @@ class Validator:
|
||||
size_str = data.get("metadata", {}).get("size", "16:9")
|
||||
slide_width, slide_height = self.SLIDE_SIZES.get(size_str, (10, 5.625))
|
||||
|
||||
# 验证 DPI 配置
|
||||
dpi = data.get("metadata", {}).get("dpi")
|
||||
if dpi is not None:
|
||||
dpi_issues = validate_dpi_value(dpi)
|
||||
self._categorize_issues(dpi_issues, errors, warnings, infos)
|
||||
|
||||
# 初始化子验证器
|
||||
geometry_validator = GeometryValidator(slide_width, slide_height)
|
||||
resource_validator = ResourceValidator(
|
||||
|
||||
Reference in New Issue
Block a user