diff --git a/beetsplug/lastgenre/aliases.yaml b/beetsplug/lastgenre/aliases.yaml index fef107f33..4716a9482 100644 --- a/beetsplug/lastgenre/aliases.yaml +++ b/beetsplug/lastgenre/aliases.yaml @@ -1,7 +1,7 @@ # Ampersands / Delimiters drum and bass: - d(rum)?[ &n/]*b(ass)? -rhythm and blues: +r&b: - r(hythm)?[ &n/]*b(lues)? rock and roll: - rock[- ‐'&n/]*roll diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index 4b8c5ba85..bba69ff00 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -624,7 +624,7 @@ - turkish pop - vispop - wonky pop -- rhythm and blues: +- r&b: - funk: - deep funk - go-go diff --git a/beetsplug/lastgenre/genres.txt b/beetsplug/lastgenre/genres.txt index 0550bccd1..18b37cc88 100644 --- a/beetsplug/lastgenre/genres.txt +++ b/beetsplug/lastgenre/genres.txt @@ -1265,8 +1265,7 @@ renaissance music requiem rhapsody rhyming spiritual -rhythm & blues -rhythm and blues +r&b ricercar riot grrrl rock diff --git a/test/plugins/test_lastgenre.py b/test/plugins/test_lastgenre.py index 2d72f377a..3a7666711 100644 --- a/test/plugins/test_lastgenre.py +++ b/test/plugins/test_lastgenre.py @@ -1039,8 +1039,8 @@ class TestAliases: [ ("dnb", "drum and bass"), ("drum n bass", "drum and bass"), - ("r&b", "rhythm and blues"), - ("rnb", "rhythm and blues"), + ("r&b", "r&b"), + ("rnb", "r&b"), ("rock & roll", "rock and roll"), ("rock'n'roll", "rock and roll"), ("kpop", "k-pop"),