From 2c5b3efe8a2a48d420c703cf99cb8e42e0c29e15 Mon Sep 17 00:00:00 2001
From: la-ninpre <leobrekalini@gmail.com>
Date: Thu, 26 Aug 2021 14:36:19 +0300
Subject: restructure music project includes

---
 _includes/music-project-release-by-year.html | 15 +++++++++++++++
 _layouts/music-project.html                  | 26 ++++----------------------
 2 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 _includes/music-project-release-by-year.html

diff --git a/_includes/music-project-release-by-year.html b/_includes/music-project-release-by-year.html
new file mode 100644
index 0000000..0a880b6
--- /dev/null
+++ b/_includes/music-project-release-by-year.html
@@ -0,0 +1,15 @@
+{%- assign releases = include.releases %}
+<div class="music-project-release-list">
+    <h2>{{ include.title }}</h2>
+
+    {% for year_group in releases %}
+        <div class="music-project-release-by_year"
+             id="{{ year_group.name }}">
+            <h3 class="music-project-release-year"
+                id="{{ year_group.name }}">{{ year_group.name }}</h3>
+            {%- for release in year_group.items -%}
+                {% include music-project-release-info.html release=release %}
+            {%- endfor -%}
+        </div>
+    {%- endfor -%}
+</div>
diff --git a/_layouts/music-project.html b/_layouts/music-project.html
index 7e3044f..c43f540 100644
--- a/_layouts/music-project.html
+++ b/_layouts/music-project.html
@@ -42,33 +42,15 @@ layout: default
     group_by_exp: "item", "item.date | date: '%Y'" -%}
     {%- assign releases.size = releases | size %}
     {% unless releases.size == 0 %}
-        <div class="music-project-release-list">
-            <h2>releases</h2>
-
-            {% for year_group in releases %}
-                <div class="music-project-release-by_year"
-                     id="{{ year_group.name }}">
-                    <h3 class="music-project-release-year"
-                        id="{{ year_group.name }}">{{ year_group.name }}</h3>
-                    {%- for release in year_group.items -%}
-                        {% include music-project-release-info.html release=release %}
-                    {%- endfor -%}
-                </div>
-            {%- endfor -%}
-        </div>
+        {% include music-project-release-by-year.html title="releases" releases=releases %}
     {% endunless %}
 
     {%- assign misc_tracks = site.music_titles |
     where_exp: "item", "item.author == page.title and item.r_tag == nil" |
-    sort: "date" -%}
+    sort: "date" |
+    group_by_exp: "item", "item.date | date: '%Y'" -%}
     {%- assign misc_tracks.size = misc_tracks | size %}
     {% unless misc_tracks.size == 0 %}
-        <div class="music-project-release-list">
-            <h2>misc tracks</h2>
-
-            {% for track in misc_tracks %}
-                {% include music-project-release-info.html release=track %}
-            {%- endfor %}
-        </div>
+        {% include music-project-release-by-year.html title="misc tracks" releases=misc_tracks %}
     {% endunless %}
 </div>
-- 
cgit v1.2.3