diff --git a/packages/domain/ass_subtitle_builder.py b/packages/domain/ass_subtitle_builder.py index b3b0b1c93..a5aaad7c1 100755 --- a/packages/domain/ass_subtitle_builder.py +++ b/packages/domain/ass_subtitle_builder.py @@ -24,6 +24,17 @@ TITLE_MARGIN_TOP = 120 TITLE_MARGIN_BOTTOM = 60 TITLE_MARGIN_SIDE = 40 +# 字体名称映射:前端中文字体名 → 服务器实际注册名(ffmpeg/ASS 通过注册名匹配字体) +FONT_NAME_MAP: dict[str, str] = { + "思源黑体": "Noto Sans CJK SC", + "思源宋体": "Noto Serif CJK SC", + "苹方": "Noto Sans CJK SC", + "PingFang": "Noto Sans CJK SC", + "微软雅黑": "Noto Sans CJK SC", + "楷体": "Noto Serif CJK SC", + "华康俪金黑": "Noto Sans CJK SC", +} + # ── 颜色转换 ────────────────────────────────────────────────────────────────── @@ -117,6 +128,9 @@ def build_ass_style( bold_val = -1 if bold else 0 italic_val = -1 if italic else 0 + # 字体名称映射:前端中文字体名 → 服务器注册名,未命中则原样使用 + actual_font = FONT_NAME_MAP.get(font_name, font_name) + # BackColour 用于阴影(BorderStyle=1 时 outline + shadow) back_color = primary_color @@ -124,7 +138,7 @@ def build_ass_style( shadow_depth = shadow_offset[1] if shadow_blur > 0 else 0 return ( - f"Style: {style_name},{font_name},{font_size},{primary_color}," + f"Style: {style_name},{actual_font},{font_size},{primary_color}," f"&H000000FF,{outline_color},{back_color}," f"{bold_val},{italic_val},0,0,100,100,0,0," f"1,{outline_width},{shadow_depth},{alignment}," diff --git a/tests/unit/test_ass_subtitle_builder.py b/tests/unit/test_ass_subtitle_builder.py index c45273f8d..9e0d63783 100755 --- a/tests/unit/test_ass_subtitle_builder.py +++ b/tests/unit/test_ass_subtitle_builder.py @@ -79,7 +79,7 @@ class TestBuildAssStyle: def test_minimal_style(self): result = build_ass_style("TestStyle") assert result.startswith("Style: TestStyle,") - assert "思源黑体" in result + assert "Noto Sans CJK SC" in result assert ",48," in result def test_custom_font_size(self): @@ -153,6 +153,28 @@ class TestBuildAssStyle: assert len(parts) == 23 + def test_font_name_mapping_siyuan(self): + """思源黑体 → Noto Sans CJK SC""" + result = build_ass_style("Test", font_name="思源黑体") + assert "Noto Sans CJK SC" in result + + def test_font_name_mapping_apple(self): + """苹方 → Noto Sans CJK SC""" + result = build_ass_style("Test", font_name="苹方") + assert "Noto Sans CJK SC" in result + + def test_font_name_mapping_msyh(self): + """微软雅黑 → Noto Sans CJK SC""" + result = build_ass_style("Test", font_name="微软雅黑") + assert "Noto Sans CJK SC" in result + + def test_font_name_mapping_unknown_passthrough(self): + """未映射字体原样使用""" + result = build_ass_style("Test", font_name="CustomFont") + assert "CustomFont" in result + + + # ── 文本转义 ──────────────────────────────────────────────────────────────────