From b454bc013bf482ee905760753aac536e8e46a6a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0ar=C5=ABnas=20Nejus?= <snejus@protonmail.com>
Date: Thu, 9 Jul 2026 12:15:33 +0100
Subject: [PATCH] Normalize psytrance

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

diff --git a/beetsplug/lastgenre/aliases.yaml b/beetsplug/lastgenre/aliases.yaml
index 648562cfa..3be8ef2c1 100644
--- a/beetsplug/lastgenre/aliases.yaml
+++ b/beetsplug/lastgenre/aliases.yaml
@@ -84,6 +84,8 @@ traditional folk:
 # psy folk, psych-pop, psychedelic-rock, psychedelic soul, but not psychedelic (standalone)
 psychedelic \1:
     - psy(?:ch(?:edelic)?)?[ -]*(folk|pop|rock|soul)
+psytrance:
+    - psy[ -]*trance
 ska jazz:
     - ska[ -]*jazz
 dixieland:
diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml
index 8e5bce727..4b8c5ba85 100644
--- a/beetsplug/lastgenre/genres-tree.yaml
+++ b/beetsplug/lastgenre/genres-tree.yaml
@@ -440,9 +440,10 @@
         - acid trance
         - classic trance
         - dream trance
-        - goa trance:
+        - psytrance:
             - dark psytrance
             - full on
+            - goa trance
             - psybreaks
             - psyprog
             - suomisaundi
diff --git a/beetsplug/lastgenre/genres.txt b/beetsplug/lastgenre/genres.txt
index 8bcebc06f..0550bccd1 100644
--- a/beetsplug/lastgenre/genres.txt
+++ b/beetsplug/lastgenre/genres.txt
@@ -1210,6 +1210,7 @@ psychedelic pop
 psychedelic rock
 psychedelic soul
 psychobilly
+psytrance
 punk blues
 punk cabaret
 punk jazz
diff --git a/test/plugins/test_lastgenre.py b/test/plugins/test_lastgenre.py
index 5ae605aa3..5a1106033 100644
--- a/test/plugins/test_lastgenre.py
+++ b/test/plugins/test_lastgenre.py
@@ -1094,6 +1094,7 @@ class TestAliases:
             ("indie rock", "indie rock"),
             ("juke/footwork", "juke/footwork"),
             ("Funk / Soul", "funk / soul"),
+            ("psy-trance", "psytrance"),
             ("psy rock", "psychedelic rock"),
             ("psych-pop", "psychedelic pop"),
         ],