fix(auto-release-notes.py): fix duplicate blank-line

Signed-off-by: samzong <[email protected]>

Author: samzong

.github/workflows/auto-release-notes.yaml

@@ -27,6 +27,11 @@ jobs:
       - name: Install dependencies
         run: pip install requests pandas pyyaml jq
 
+      - name: Show auto-release-notes.py
+        run: |
+          echo "==== scripts/auto-release-notes.py ===="
+          cat scripts/auto-release-notes.py
+
       - name: Prepare branch
         id: prepare_branch
         run: |

scripts/auto-release-notes.py

@@ -195,7 +195,6 @@ def get_release_info(data, filename="rel-notes.md"):
         "无更新类型": "",
     }
 
-    # 定义模板
     header_template = Template(
         dedent(
             """\
@@ -217,49 +216,61 @@ def get_release_info(data, filename="rel-notes.md"):
     entry_with_baseline_template = Template("- [$primary_func] $baseline")
     entry_without_baseline_template = Template("- [$primary_func]")
 
-    def ensure_blank_line(lines_list):
-        if lines_list and lines_list[-1] != "":
+    def emit(lines_list, line=""):
+        line = "" if line is None else line
+        if line == "":
+            if lines_list and lines_list[-1] == "":
+                return
             lines_list.append("")
+        else:
+            lines_list.append(line.rstrip())
 
     lines = header_template.substitute().splitlines()
-    ensure_blank_line(lines)
 
     for pub_date, modules in result.items():
-        ensure_blank_line(lines)
-        lines.append(pub_date_template.substitute(pub_date=pub_date))
-        ensure_blank_line(lines)
+        emit(lines, "")
+        emit(lines, pub_date_template.substitute(pub_date=pub_date))
+        emit(lines, "")
         for module, versions in modules.items():
             for version, update_types in versions.items():
-                lines.append(
-                    module_version_template.substitute(module=module, version=version)
+                emit(
+                    lines,
+                    module_version_template.substitute(module=module, version=version),
                 )
-                ensure_blank_line(lines)
+                emit(lines, "")
                 for update_type in ["新功能", "增强优化", "故障修复", "无更新类型"]:
-                    if update_type in update_types:
-                        entries = update_types[update_type]
-                        if update_type != "无更新类型":
-                            lines.append(
-                                update_type_template.substitute(
-                                    emoji_title=emoji_map[update_type]
-                                )
+                    if update_type not in update_types:
+                        continue
+                    entries = update_types[update_type]
+                    if not entries:
+                        continue
+                    if update_type != "无更新类型":
+                        emit(
+                            lines,
+                            update_type_template.substitute(
+                                emoji_title=emoji_map[update_type]
+                            ),
+                        )
+                        emit(lines, "")
+                    for primary_func, entry in entries:
+                        baseline = entry.get("基线参数", "")
+                        if baseline:
+                            emit(
+                                lines,
+                                entry_with_baseline_template.substitute(
+                                    primary_func=primary_func, baseline=baseline
+                                ),
                             )
-                            ensure_blank_line(lines)
-                        for primary_func, entry in entries:
-                            baseline = entry.get("基线参数", "")
-                            if baseline:
-                                lines.append(
-                                    entry_with_baseline_template.substitute(
-                                        primary_func=primary_func, baseline=baseline
-                                    )
-                                )
-                            else:
-                                lines.append(
-                                    entry_without_baseline_template.substitute(
-                                        primary_func=primary_func
-                                    )
-                                )
-                        ensure_blank_line(lines)
-    if lines and lines[-1] == "":
+                        else:
+                            emit(
+                                lines,
+                                entry_without_baseline_template.substitute(
+                                    primary_func=primary_func
+                                ),
+                            )
+                    emit(lines, "")
+
+    while lines and lines[-1] == "":
         lines.pop()
 
     md_content = "\n".join(lines) + "\n"