Normalize psytrance

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:

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

beetsplug/lastgenre/genres.txt

@@ -1210,6 +1210,7 @@ psychedelic pop
 psychedelic rock
 psychedelic soul
 psychobilly
+psytrance
 punk blues
 punk cabaret
 punk jazz

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"),
         ],