From 730c997f7d056f1d74b5acee6ce0605824ac7bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0ar=C5=ABnas=20Nejus?= <snejus@protonmail.com>
Date: Thu, 9 Jul 2026 14:06:21 +0100
Subject: [PATCH] Fix old school aliases

---
 beetsplug/lastgenre/aliases.yaml     | 4 +++-
 beetsplug/lastgenre/genres-tree.yaml | 1 +
 beetsplug/lastgenre/genres.txt       | 3 ++-
 test/plugins/test_lastgenre.py       | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/beetsplug/lastgenre/aliases.yaml b/beetsplug/lastgenre/aliases.yaml
index d3332321d..c991f7a16 100644
--- a/beetsplug/lastgenre/aliases.yaml
+++ b/beetsplug/lastgenre/aliases.yaml
@@ -31,7 +31,9 @@ synth-pop:
 nu \1:
     - nu[ -]*(disco|jazz|metal|soul)
 
-# Old School spellings: old-skool-jungle/-hardcore, oldschool hip-hop
+# Old School spellings: old-school death metal, oldschool hip-hop, old-skool-jungle/-hardcore
+old school death metal:
+    - old[ -]*(?:school|skool)[ -]+death[ -]*metal
 old school hip hop:
     - old[ -]*(?:school|skool)[ -]+hip[ -]*hop
 old school \1:
diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml
index cc7f4f373..c52d1eee8 100644
--- a/beetsplug/lastgenre/genres-tree.yaml
+++ b/beetsplug/lastgenre/genres-tree.yaml
@@ -676,6 +676,7 @@
             - death/doom
             - goregrind
             - melodic death metal
+            - old school death metal
             - technical death metal
         - doom metal:
             - epic doom metal
diff --git a/beetsplug/lastgenre/genres.txt b/beetsplug/lastgenre/genres.txt
index 05e2070e0..c13bf5399 100644
--- a/beetsplug/lastgenre/genres.txt
+++ b/beetsplug/lastgenre/genres.txt
@@ -1095,9 +1095,10 @@ nyatiti
 néo kýma
 obscuro
 oi!
+old school death metal
+old school hardcore
 old school hip hop
 old school jungle
-old school hardcore
 old-time
 oldies
 olonkho
diff --git a/test/plugins/test_lastgenre.py b/test/plugins/test_lastgenre.py
index 4009c4660..6a6987017 100644
--- a/test/plugins/test_lastgenre.py
+++ b/test/plugins/test_lastgenre.py
@@ -1094,6 +1094,9 @@ class TestAliases:
             ("psy rock", "psychedelic rock"),
             ("psych-pop", "psychedelic pop"),
             ("disney", "disney"),
+            ("old-school death-metal", "old school death metal"),
+            ("old-skool-hip-hop", "old school hip hop"),
+            ("old school-jungle", "old school jungle"),
         ],
     )
     def test_default_alias_patterns(self, config, input_genre, expected_genre):