From 0025cd62fe1015e4517118eff3abbf7cae2beac4 Mon Sep 17 00:00:00 2001
From: rjdbcm <ozi.project@outlook.com>
Date: Tue, 2 Jul 2024 23:46:35 -0500
Subject: [PATCH] :bug: CHANGELOG duplicated commit headings fixed

Signed-off-by: rjdbcm <ozi.project@outlook.com>
---
 requirements.in                     |   2 +-
 templates/.parsed_commit_heading.j2 | 142 ++++++++++++++++++++++++++++
 templates/CHANGELOG.md.j2           |   4 +-
 3 files changed, 145 insertions(+), 3 deletions(-)

diff --git a/requirements.in b/requirements.in
index 5aec2c8e..d178140d 100644
--- a/requirements.in
+++ b/requirements.in
@@ -4,7 +4,7 @@ idna>=2
 jinja2>=3
 meson[ninja]>=1.1.0
 ozi-spec~=0.4
-ozi-templates~=2.4.5
+ozi-templates~=2.4.6
 packaging~=24.0
 pip-tools
 prompt_toolkit
diff --git a/templates/.parsed_commit_heading.j2 b/templates/.parsed_commit_heading.j2
index 98d0bd49..7490ba53 100644
--- a/templates/.parsed_commit_heading.j2
+++ b/templates/.parsed_commit_heading.j2
@@ -1,3 +1,74 @@
+{%- filter replace(':art:', '🎨') %}
+{%- filter replace(':zap:', '⚡️') %}
+{%- filter replace(':fire:', '🔥') %}
+{%- filter replace(':bug:', '🐛') %}
+{%- filter replace(':ambulance:', '🚑️') %}
+{%- filter replace(':sparkles:', '✨') %}
+{%- filter replace(':memo:', '📝') %}
+{%- filter replace(':rocket:', '🚀') %}
+{%- filter replace(':tada:', '🎉') %}
+{%- filter replace(':white_check_mark:', '✅') %}
+{%- filter replace(':lock:', '🔒️') %}
+{%- filter replace(':closed_lock_with_key:', '🔐') %}
+{%- filter replace(':bookmark:', '🔖') %}
+{%- filter replace(':rotating_light:', '🚨') %}
+{%- filter replace(':construction:', '🚧') %}
+{%- filter replace(':green_heart:', '💚') %}
+{%- filter replace(':arrow_down:', '⬇️') %}
+{%- filter replace(':arrow_up:', '⬆️') %}
+{%- filter replace(':pushpin:', '📌') %}
+{%- filter replace(':construction_worker:', '👷') %}
+{%- filter replace(':chart_with_upwards_trend:', '📈') %}
+{%- filter replace(':recycle:', '♻️') %}
+{%- filter replace(':heavy_plus_sign:', '➕') %}
+{%- filter replace(':heavy_minus_sign:', '➖') %}
+{%- filter replace(':wrench:', '🔧') %}
+{%- filter replace(':hammer:', '🔨') %}
+{%- filter replace(':globe_with_meridians:', '🌐') %}
+{%- filter replace(':pencil2:', '✏️') %}
+{%- filter replace(':poop:', '💩') %}
+{%- filter replace(':rewind:', '⏪️') %}
+{%- filter replace(':twisted_rightwards_arrows:', '🔀') %}
+{%- filter replace(':package:', '📦️') %}
+{%- filter replace(':alien:', '👽️') %}
+{%- filter replace(':truck:', '🚚') %}
+{%- filter replace(':page_facing_up:', '📄') %}
+{%- filter replace(':boom:', '💥') %}
+{%- filter replace(':bento:', '🍱') %}
+{%- filter replace(':wheelchair:', '♿️') %}
+{%- filter replace(':bulb:', '💡') %}
+{%- filter replace(':beers:', '🍻') %}
+{%- filter replace(':speech_balloon:', '💬') %}
+{%- filter replace(':card_file_box:', '🗃️') %}
+{%- filter replace(':loud_sound:', '🔊') %}
+{%- filter replace(':mute:', '🔇') %}
+{%- filter replace(':busts_in_silhouette:', '👥') %}
+{%- filter replace(':children_crossing:', '🚸') %}
+{%- filter replace(':building_construction:', '🏗️') %}
+{%- filter replace(':clown_face:', '🤡') %}
+{%- filter replace(':egg:', '🥚') %}
+{%- filter replace(':see_no_evil:', '🙈') %}
+{%- filter replace(':camera_flash:', '📸') %}
+{%- filter replace(':alembic:', '⚗️') %}
+{%- filter replace(':mag:', '🔍️') %}
+{%- filter replace(':label:', '🏷️') %}
+{%- filter replace(':seedling:', '🌱') %}
+{%- filter replace(':triangular_flag_on_post:', '🚩') %}
+{%- filter replace(':goal_net:', '🥅') %}
+{%- filter replace(':dizzy:', '💫') %}
+{%- filter replace(':wastebasket:', '🗑️') %}
+{%- filter replace(':passport_control:', '🛂') %}
+{%- filter replace(':adhesive_bandage:', '🩹') %}
+{%- filter replace(':monocle_face:', '🧐') %}
+{%- filter replace(':coffin:', '⚰️') %}
+{%- filter replace(':test_tube:', '🧪') %}
+{%- filter replace(':necktie:', '👔') %}
+{%- filter replace(':stethoscope:', '🩺') %}
+{%- filter replace(':bricks:', '🧱') %}
+{%- filter replace(':technologist:', '🧑‍💻') %}
+{%- filter replace(':money_with_wings:', '💸') %}
+{%- filter replace(':thread:', '🧵') %}
+{%- filter replace(':safety_vest:', '🦺') %}
 {%- if type_ in [':bug:', 'BUG', 'fix'] %}
 ### :bug: Fixed Bugs
 {%- elif type_ in [':memo:', 'DOC', 'docs'] %}
@@ -37,3 +108,74 @@
 {%- else %}
 ### {{ type_ | capitalize }}
 {% endif %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
+{%- endfilter %}
\ No newline at end of file
diff --git a/templates/CHANGELOG.md.j2 b/templates/CHANGELOG.md.j2
index 4064b02c..58d47835 100644
--- a/templates/CHANGELOG.md.j2
+++ b/templates/CHANGELOG.md.j2
@@ -5,6 +5,7 @@
 {#- UNRELEASED -#}
 ## Unreleased
 {% for type_, commits in context.history.unreleased | dictsort %}
+{% include '.parsed_commit_heading.j2' %}
 {% for commit in commits %}{% if type_ != "unknown" %}
 {%- filter replace(':art:', '🎨') %}
 {%- filter replace(':zap:', '⚡️') %}
@@ -77,7 +78,6 @@
 {%- filter replace(':money_with_wings:', '💸') %}
 {%- filter replace(':thread:', '🧵') %}
 {%- filter replace(':safety_vest:', '🦺') %}
-{% include '.parsed_commit_heading.j2' %}
 * {{ commit.commit.message.rstrip()|replace(type_~': ','')|replace(type_,'')|replace('---', '')|replace('\n\nSigned-off-by:', ' —') }}
 ([`{{ commit.commit.hexsha[:7] }}`]({{ commit.commit.hexsha | commit_hash_url }}))
 {%- endfilter %}
@@ -161,6 +161,7 @@
 {% for version, release in context.history.released.items() %}
 ## {{ version.as_tag() }} ({{ release.tagged_date.strftime("%Y-%m-%d") }})
 {% for type_, commits in release["elements"] | dictsort %}
+{% include '.parsed_commit_heading.j2' %}
 {% for commit in commits %}{% if type_ != "unknown" %}
 {%- filter replace(':art:', '🎨') %}
 {%- filter replace(':zap:', '⚡️') %}
@@ -233,7 +234,6 @@
 {%- filter replace(':money_with_wings:', '💸') %}
 {%- filter replace(':thread:', '🧵') %}
 {%- filter replace(':safety_vest:', '🦺') %}
-{% include '.parsed_commit_heading.j2' %}
 * {{ commit.commit.message.rstrip()|replace(type_~': ','')|replace(type_,'')|replace('---', '')|replace('\n\nSigned-off-by:', ' —') }}
 ([`{{ commit.commit.hexsha[:7] }}`]({{ commit.commit.hexsha | commit_hash_url }}))
 {%- endfilter %}