From 004fb7d1c8998660da0064e24cb803f40e7fb0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Thu, 29 Oct 2015 04:44:15 +0100 Subject: [PATCH 1/6] lastgenre: Fix up `ragga jungle`. * Move `ragga jungle` to beneath `oldschool jungle`. * Remove `ragga-jungle` which isn't recognised by the genre whitelist. https://en.wikipedia.org/wiki/Ragga_jungle --- beetsplug/lastgenre/genres-tree.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index c1b1a081b..4ee1475ea 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -291,7 +291,7 @@ - neurofunk - oldschool jungle: - darkside jungle - - ragga-jungle + - ragga jungle - raggacore - sambass - techstep @@ -740,7 +740,6 @@ - dancehall - dub - lovers rock - - ragga jungle - - polish reggae + - polish reggae - reggae fusion - rocksteady From b187251a7e6d7ab06e5fc3b9eb38437cf7c6e6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Thu, 29 Oct 2015 04:53:14 +0100 Subject: [PATCH 2/6] lastgenre: Remove `dance hall` and `polish reggae`. Neither of the two are recognised in the genres.txt whitelist. --- beetsplug/lastgenre/genres-tree.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index 4ee1475ea..2f6a049ab 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -133,7 +133,6 @@ - chutney - chutney soca - compas - - dance hall - mambo - merengue - méringue @@ -740,6 +739,5 @@ - dancehall - dub - lovers rock - - polish reggae - reggae fusion - rocksteady From 1678c1d847b9f50bd54f775c050a08af86ac2ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Thu, 29 Oct 2015 04:55:57 +0100 Subject: [PATCH 3/6] =?UTF-8?q?lastgenre:=20Replace=20top-level=20genre=20?= =?UTF-8?q?`ska`=20with=20`reggae`=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … and move relevant genres from the tree to be children of the `reggae` top-level genre as well as add `roots reggae` to the list. See discussion at https://github.com/sampsyo/beets/issues/1661 --- beetsplug/lastgenre/genres-tree.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index 2f6a049ab..955f921a0 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -147,7 +147,6 @@ - punta - punta rock - rasin - - reggae - reggaeton - salsa - soca @@ -504,12 +503,10 @@ - new school hip hop - old school hip hop - political hip hop - - ragga - rap opera - rap rock: - rap metal - rapcore - - reggae español/spanish reggae - songo-salsa - southern hip hop: - atlanta hip hop: @@ -734,10 +731,14 @@ - surf rock - visual kei: - nagoya kei -- ska: - - 2 tone - - dancehall - - dub - - lovers rock +- reggae: + - roots reggae - reggae fusion - - rocksteady + - reggae español/spanish reggae + - lovers rock + - ragga + - dancehall + - ska: + - 2 tone + - dub + - rocksteady From 1aa808f37beccc33c6a29fcff8f0f098122a95ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Thu, 29 Oct 2015 04:58:44 +0100 Subject: [PATCH 4/6] lastgenre: Add `raggamuffin`. Already recognised by the genres.txt whitelist, and is a more proper term for `ragga`. https://en.wikipedia.org/wiki/Ragga --- beetsplug/lastgenre/genres-tree.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index 955f921a0..616058eff 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -736,7 +736,8 @@ - reggae fusion - reggae español/spanish reggae - lovers rock - - ragga + - raggamuffin: + - ragga - dancehall - ska: - 2 tone From 5f5365021d0745c7c696ba31daf221ba1d3c0703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Thu, 29 Oct 2015 05:00:33 +0100 Subject: [PATCH 5/6] lastgenre: Clean up Spanish reggae in the genre list. * Add missing subgenres to whitelist and tree. * Use proper terminology. * Add English term as child of Spanish one. Source: https://en.wikipedia.org/wiki/Reggae_en_Espa%C3%B1ol --- beetsplug/lastgenre/genres-tree.yaml | 6 +++++- beetsplug/lastgenre/genres.txt | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index 616058eff..a09f7e6b3 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -734,7 +734,11 @@ - reggae: - roots reggae - reggae fusion - - reggae español/spanish reggae + - reggae en español: + - spanish reggae + - reggae 110 + - reggae bultrón + - romantic flow - lovers rock - raggamuffin: - ragga diff --git a/beetsplug/lastgenre/genres.txt b/beetsplug/lastgenre/genres.txt index 64e583bfa..914ee1290 100644 --- a/beetsplug/lastgenre/genres.txt +++ b/beetsplug/lastgenre/genres.txt @@ -1224,6 +1224,9 @@ rebetiko red dirt reel reggae +reggae 110 +reggae bultrón +reggae en español reggae fusion reggae highlife reggaefusion @@ -1247,6 +1250,7 @@ rock opera rockabilly rocksteady rococo +romantic flow romantic period in music rondeaux ronggeng From 41cbb47918d61465b005cec142129c5d3a4f7cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Thu, 29 Oct 2015 05:04:59 +0100 Subject: [PATCH 6/6] Add changelog entry for #1661. --- docs/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index c247aa429..4eafe9c90 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -14,6 +14,8 @@ Fixes: and name in quick succession. The importer would fail to detect them as duplicates, claiming that there were "empty albums" in the database even when there were not. :bug:`1652` +* :doc:`plugins/lastgenre`: Clean up the reggae related genres somewhat. + Thanks to :user:`Freso`. :bug:`1661` 1.3.15 (October 17, 2015)