From 76c8ea4a3744901f9d7cd8e09a11be5bf49fdd53 Mon Sep 17 00:00:00 2001 From: Thomas Gordon Date: Tue, 2 Sep 2014 16:19:49 -0400 Subject: [PATCH 1/5] Update genres-tree.yaml Scraped https://en.wikipedia.org/wiki/List_of_popular_music_genres for the first time since @KraYmer did back in (apparently) October 2011. This should be much more useful now to those who have genre canonicalization enabled. Script is in public repo of mine :) --- beetsplug/lastgenre/genres-tree.yaml | 1171 +++++++++++++++++--------- 1 file changed, 763 insertions(+), 408 deletions(-) diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index 4a19595bb..8920db20e 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -1,426 +1,781 @@ -- blues: - - african blues - - blues rock: - - punk blues - - country blues - - british blues - - classic female blues - - country blues: - - delta blues: - - electric blues: - - blues rock - - east coast blues - - hill country blues - - jump blues - - swamp blues - - new orleans blues - - dirty blues - - fife and drum blues - - gospel blues - - harmonica blues - - indian blues - - piano blues: - - boogie-woogie: - - boogie rock - - soul blues - - west coast blues -- country: - - alternative country: - - americana - - blues country - - cowpunk - - country rock - - country folk - - country rap: - - country crunk: - - country psycrunk - - deathcountry - - gothic americana - - hellbilly - - nashville sound: - - country pop - - outlaw country - - psychobilly - - punkabilly - - psydeco - - red dirt - - rockabilly - - rock country - - soul country - - techno-country - - texas country: - - progressive country - - bakersfield sound - - bluegrass: - - heavy metal bluegrass - - nu-grass - - old-time bluegrass - - progressive bluegrass - - reactionary bluegrass - - christian country music - - neotraditional country - - western music: - - honky tonk -- easy listening: - - background music - - beautiful music - - elevator music - - furniture music - - lounge music -- electronic: - - ambient: - - ambient house - - ambient techno - - dark ambient - - drone music - - illbient - - isolationism - - lowercase - - breakbeat: - - acid breaks - - baltimore club - - big beat - - breakbeat hardcore - - broken beat - - florida breaks - - nu skool breaks - - 4-beat - - dance: - - eurodance - - hi-nrg - - house: - - acid house - - autumn house - - chicago house - - deep house - - diva house - - fidget house - - french house - - freestyle house - - funky house - - ghetto house - - hardbag - - hip house - - italo house - - latin house - - minimal house - - microhouse - - rave music - - swing house - - tech house - - tribal house - - uk hard house - - us garage - - vocal house - - electronica: - - berlin school - - bitpop - - chip - - chillwave - - downtempo: - - acid jazz - - balearic beat - - chill out - - dubtronica - - ethnic electronica - - moombahton - - new age music - - nu jazz - - trip hop - - folktronica - - glitch - - idm - - plinkerpop - - hardcore techno: - - bouncy house - - bouncy techno - - breakcore - - darkcore - - digital hardcore - - doomcore - - gabba - - happy hardcore - - hardstyle - - jumpstyle - - makina - - speedcore - - terrorcore - - uk hardcore - - jungle: - - drum and bass: - - clownstep - - darkcore - - darkstep - - drumfunk - - drumstep - - hardstep - - intelligent drum and bass - - jump-up - - liquid funk - - neurofunk - - oldschool jungle: - - darkside jungle - - ragga-jungle - - raggacore - - sambass - - trancestep - - progressive: - - progressive breaks - - progressive drum & bass - - progressive house: - - disco house - - dream house - - space house - - progressive techno - - techno: - - acid techno - - detroit techno - - free tekno - - ghettotech - - minimal - - nortec - - rotterdam techno - - schranz / hardtechno - - symphonic techno - - tecno brega - - techno-dnb - - techstep - - toytown techno - - trance: - - acid trance - - classic trance - - dream trance - - euro-trance - - goa trance: - - dark psytrance - - full on - - psyprog - - psybient - - psybreaks - - hard trance - - neo-trance - - tech trance - - uplifting trance: - - orchestral uplifting - - vocal trance: - - nightcore - - uk garage: - - 2-step - - 4x4 - - bassline - - breakstep - - dubstep - - funky - - grime - - speed garage -- folk: - - folk punk - - indie folk - - neofolk - - progressive folk - - anti-folk -- hip hop & rap: - - hip hop: - - alternative hip hop: - - jazz rap - - abstract hip hop - - british hip hop: - - grime - - political hip hop - - turntablism - - us hip hop: - - east coast hip hop: - - conscious rap - - midwest hip hop: - - ghetto house - - ghettotech - - horrorcore - - southern hip hop: - - snap music - - bounce music - - crunk - - chopped and screwed - - west coast hip hop: - - gangsta rap: - - g-funk - - latin rap - - g-funk - - hyphy - - jerkin' - - rap: - - bass rap - - dirty rap - - hardcore rap - - mafioso rap - - party rap - - porn rap - - rap metal - - rap rock - - rapcore -- latin: - - bachata - - brazilian music: - - samba: - - bossa nova: - - tropicalismo - - calypso - - chutney: - - chutney soca - - cuban music: - - salsa - - son cubano - - cumbia - - kompa - - mambo: - - cha-cha-cha - - pachanga - - merengue - - salsa - - soca - - tejano - - zouk -- pop: - - electro pop - - new romantic - - operatic pop - - pop rap - - psychedelic pop - - sunshine pop - - surf pop - - synthpop - - teen pop - - traditional pop music - - turkish pop - - world: - - europop - - indian pop - - latin pop -- r&b: - - contemporary r&b - - doo wop - - funk: - - deep funk - - disco: - - eurodisco - - disco polo - - post disco - - space disco - - boogie - - go-go - - nu-funk - - p-funk - - new jack swing - - soul: - - blue-eyed soul - - brown-eyed soul - - hip hop soul - - motown sound - - neo soul - - northern soul - - psychedelic soul - - smooth soul - - quiet storm - rock: - alternative rock: - britpop: - post-britpop - - dream pop - grunge: - post-grunge - - indie pop - indie rock - - industrial rock + - shoegaze + - dream pop - noise pop - - post-rock - - shoegazer - slowcore - - blues-rock - - chinese rock - - dark cabaret - - desert rock - - electronic rock - - folk rock - - garage rock - - glam rock - - hard rock - - heavy metal: - - black metal - - christian metal - - death metal: - - brutal death metal - - melodic death metal - - technical death metal - - progressive death metal - - doom metal - - drone metal - - folk metal - - funk metal - - glam metal - - gothic metal - - grindcore - - groove metal - - industrial metal - - metalcore: - - deathcore - - mathcore - - melodic metalcore - - djent + - post-punk revival + - post-rock: + - post-metal + - sadcore + - industrial rock + - indie pop: + - dunedin sound + - twee pop - nu metal - - power metal - - progressive metal - - rap metal - - sludge metal - - speed metal - - stoner rock - - symphonic metal - - thrash metal: - - crossover thrash metal - - thrashcore - - weld - - unblack metal - - jazz-rock - - j-rock - math rock - - new wave: - - world fusion - - paisley underground - pop rock - - power pop - - progressive rock: - - new prog - - space rock - - psychedelic rock: - - acid rock - - punk rock: - - anarcho punk: - - crust punk - - deathrock - - hardcore punk: - - post-hardcore - - emo: - - screamo - - pop punk - - post-punk: - - gothic rock - - psychobilly + - garage rock + - electronic rock - rap rock: - rapcore - - rock and roll - - soft rock - - southern rock - surf rock + - glam rock + - art rock + - electronicore + - paisley underground + - experimental rock + - punk rock: + - anarcho punk: + - crust punk: + - d-beat + - riot grrrl + - garage punk + - pop punk + - christian punk + - horror punk + - deathrock + - ska punk: + - ska-core + - skate punk + - grindcore: + - noisegrind + - crustgrind + - art punk + - digital hardcore + - hardcore punk: + - crossover thrash + - powerviolence + - street punk + - post-hardcore: + - emo: + - screamo + - thrashcore + - psychobilly + - folk punk: + - gypsy punk + - cowpunk + - celtic punk + - jazz rock + - southern rock + - christian rock + - visual kei: + - nagoya kei + - chinese rock + - rock and roll + - psychedelic rock: + - raga rock + - acid rock + - freakbeat + - neo-psychedelia + - desert rock + - folk rock + - sufi rock + - beat music + - dark cabaret + - post-punk: + - gothic rock + - no wave + - noise rock + - new wave: + - world fusion + - power pop + - heavy metal: + - industrial metal + - folk metal: + - celtic metal + - medieval metal + - speed metal + - power metal + - rap metal + - funk metal + - alternative metal: + - nu metal + - thrash metal: + - crossover thrash + - groove metal + - christian metal + - death metal: + - goregrind + - melodic death metal + - technical death metal + - gothic metal + - glam metal + - stoner rock + - black metal: + - viking metal + - progressive metal + - drone metal + - metalcore: + - mathcore: + - djent + - deathcore + - symphonic metal + - doom metal + - sludge metal + - hard rock + - progressive rock: + - krautrock + - space rock + - rock in opposition + - new prog + - canterbury scene +- rhythm and blues: + - new jack swing + - soul: + - neo soul + - hip hop soul + - northern soul + - blue-eyed soul + - funk: + - go-go + - p-funk + - deep funk + - disco: + - post-disco + - boogie + - contemporary r&b +- country: + - psychobilly/punkabilly + - texas country + - country soul + - bakersfield sound + - honky tonk + - outlaw country + - gulf and western + - cajun: + - cajun fiddle tunes + - cowboy/western music + - franco-country + - hokum + - rockabilly + - progressive country + - country rock + - dansband music + - close harmony + - australian country music + - lubbock sound + - sertanejo + - zydeco + - instrumental country + - neotraditional country + - classic country + - truck-driving country + - hellbilly music + - americana + - western swing + - bluegrass: + - progressive bluegrass + - reactionary bluegrass + - alternative country: + - cowpunk + - blues country + - traditional country music + - country pop + - red dirt + - country rap + - nashville sound + - christian country music +- caribbean and latin american: + - chutney soca + - soca + - compas + - rasin + - punta rock + - other latin: + - huayno + - tejano + - mariachi + - cumbia + - criolla + - ranchera + - chicha + - brazilian: + - bossa nova + - brega + - samba + - forró + - choro + - funk carioca + - frevo + - música sertaneja + - lambada + - tropicalia + - tecnobrega + - brazilian rock + - pagode + - música popular brasileira + - maracatu + - zouk-lambada + - axé + - samba rock + - timba + - punta + - reggaeton + - dance hall + - zouk + - méringue + - salsa + - chutney + - twoubadou + - calypso + - reggae + - merengue + - baithak gana + - bachata + - bolero + - son + - mambo +- jazz: + - jazz rap + - modal jazz + - cape jazz + - swing + - soul jazz + - gypsy jazz + - neo-bop jazz + - free improvisation + - crossover jazz + - orchestral jazz + - livetronica + - jazz-funk + - bebop + - stride jazz + - acid jazz + - ethno jazz + - continental jazz + - m-base + - vocal jazz + - mainstream jazz + - boogie-woogie + - cubop + - dixieland + - nu jazz + - post-bop + - hard bop + - jazz rock + - kansas city blues + - neo-swing + - european free jazz + - novelty ragtime + - punk jazz + - west coast jazz + - straight-ahead jazz + - free jazz + - jazz blues + - shibuya-kei + - west coast gypsy jazz + - asian american jazz + - ragtime + - free funk + - latin jazz + - british dance band + - bossa nova + - trad jazz + - ska jazz + - kansas city jazz + - jazz fusion + - chamber jazz + - smooth jazz + - avant-garde jazz + - third stream + - cool jazz +- other: + - worldbeat +- pop: + - chanson + - teen pop + - latin ballad + - baroque pop + - traditional pop music + - schlager + - adult contemporary + - country pop + - popera + - jangle pop + - christian pop + - technopop + - turkish pop + - psychedelic pop + - synthpop + - pop rap + - wonky pop + - mexican pop + - soft rock + - louisiana swamp pop + - electropop + - surf pop + - motorpop + - classical crossover + - arab pop + - new romanticism + - disco polo + - sophisti-pop + - sunshine pop + - bubblegum pop + - vispop + - iranian pop + - space age pop + - europop: + - italo disco + - eurobeat + - austropop + - latin pop + - french pop + - italo dance + - laïkó + - balkan pop + - nederpop + - russian pop + - dance-pop + - levenslied +- easy listening: + - furniture music + - lounge music + - new-age music + - middle of the road + - beautiful music + - background music + - elevator music +- avant-garde: + - electroacoustic + - experimental music + - lo-fi + - noise + - musique concrète - ska: - - 2 tone - reggae: - - early reggae - - dub: - - dub poetry - - afro-dub - - rockers - - lovers rock - - dancehall: - - ragga - - reggaeton - - raggamuffin - - roots reggae + - polish reggae + - ragga + - reggae fusion + - dub - rocksteady + - ragga jungle + - 2 tone + - dancehall + - lovers rock +- asian: + - fijiri + - fann at-tanbura + - east asian: + - mandopop + - c-pop + - cantopop + - j-pop + - onkyokei + - k-pop + - taiwanese pop + - hong kong english pop + - anison + - korean pop + - kayōkyoku + - enka + - sawt + - south and southeast asian: + - bhangra + - ragini + - thai pop + - indian pop + - pop sunda + - baila + - filmi + - morlam + - pinoy pop + - manila sound + - luk thung: + - luk krung + - lavani + - dangdut + - bhojpuri + - liwa + - khaliji +- african: + - bikutsi + - mbalax + - afrobeat + - jit + - bongo flava + - hiplife + - jùjú + - kuduro + - benga + - maloya + - coupé-décalé + - kwaito + - zouglou + - mbube + - makossa + - highlife + - genge + - palm-wine + - morna + - taarab + - sakara + - soukous + - mbaqanga + - marrabenta + - museve + - kizomba + - raï + - apala + - cape jazz + - kapuka + - isicathamiya + - kwela + - seggae + - chimurenga + - fuji music + - sega + - semba +- blues: + - african blues + - blues rock + - piedmont blues + - delta blues + - rhythm and blues + - punk blues + - classic female blues + - country blues + - chicago blues + - kansas city blues + - soul blues + - jazz blues + - detroit blues + - electric blues + - west coast blues + - louisiana blues + - british blues + - swamp blues + - hill country blues + - hokum blues + - memphis blues + - st. louis blues + - canadian blues + - blues shouter + - jump blues + - texas blues + - contemporary r&b + - piano blues + - gospel blues +- comedy: + - comedy music + - parody music + - comedy rock +- electronic: + - industrial: + - industrial metal: + - neue deutsche härte + - coldwave + - electronic body music: + - futurepop + - aggrotech + - dark electro + - death industrial + - cybergrind + - noise: + - power electronics + - japanoise + - power noise + - electro-industrial + - industrial rock + - witch house + - chiptune: + - video game music + - bitpop + - yorkshire bleeps and bass + - nintendocore + - game boy music + - progressive: + - progressive techno + - progressive breaks + - progressive house/trance: + - disco house + - dream house + - space house + - progressive drum & bass + - electronica: + - electronic dance music + - skweee + - laptronica + - synthcore + - freestyle music + - glitch + - idm + - electronic art music + - berlin school + - folktronica + - chillwave + - sound art + - house: + - vocal house + - funky house + - latin house + - dutch house + - minimal house + - french house + - deep house + - chicago house + - hardbag + - us garage + - ghetto house + - tech house + - acid house + - italo house + - swing house + - hip house + - electro house + - diva house + - progressive house + - freestyle house + - rave music + - tribal house + - uk hard house + - electronic rock: + - alternative dance: + - madchester + - baggy + - synthpunk + - dark wave + - dance-rock + - indietronica + - new rave + - space rock + - electropunk + - ethereal wave + - electroclash + - electronicore + - dance-punk + - synthpop + - hi-nrg: + - eurobeat + - hard nrg + - new beat + - trance: + - classic trance + - acid trance + - vocal trance + - uplifting trance: + - orchestral uplifting + - dream trance + - goa trance: + - full on + - psyprog + - dark psytrance + - suomisaundi + - psybreaks + - hard trance + - tech trance + - uk garage: + - grime + - breakstep + - bassline + - 2-step + - funky + - dubstep + - trap + - 4x4 + - speed garage + - disco: + - italo disco + - nu-disco + - europop: + - euro disco + - cosmic disco + - disco polo + - space disco + - eurodance: + - bubblegum dance + - italo dance + - turbofolk + - asian underground + - techno: + - techno-dnb + - nortec + - ghettotech + - acid techno + - free tekno + - toytown techno + - detroit techno + - schranz + - technopop + - minimal + - tecno brega + - post-disco: + - boogie + - dance-pop + - ambient: + - lowercase + - drone music + - illbient + - ambient techno + - ambient house + - ambient dub + - dark ambient + - isolationism + - breakbeat: + - acid breaks + - 4-beat + - broken beat + - baltimore club + - big beat + - breakbeat hardcore + - nu skool breaks + - florida breaks + - drum and bass: + - darkcore + - neurofunk + - jump-up + - drumfunk + - techstep + - liquid funk + - darkstep + - drumstep + - sambass + - oldschool jungle: + - darkside jungle + - ragga-jungle + - raggacore + - intelligent drum and bass + - hardstep + - electroacoustic: + - soundscape composition + - acousmatic music + - tape music + - live coding + - musique concrète + - computer music + - live electronics + - field recording + - electroacoustic improvisation + - electro: + - crunk + - electro backbeat + - electropop + - electro-grime + - downtempo: + - dub music + - new-age music + - balearic beat + - dubtronica + - ethnic electronica + - chill out + - nu jazz + - trip hop + - acid jazz + - moombahton + - hardcore: + - darkcore + - hardstyle + - breakcore + - happy hardcore + - dubstyle + - doomcore + - jumpstyle + - uk hardcore + - digital hardcore + - gabber + - bouncy house + - terrorcore + - speedcore + - bouncy techno + - makina +- folk: + - contemporary folk + - sung poetry + - celtic music + - anti-folk + - indie folk + - neofolk + - progressive folk + - industrial folk + - techno-folk + - british folk revival + - filk music + - american folk revival + - psychedelic folk + - freak folk +- hip hop: + - east coast hip hop: + - hardcore hip hop + - brick city club + - baltimore club + - mafioso rap + - new jersey hip hop + - bongo flava + - ghettotech + - chopped and screwed + - lyrical hip hop + - grime + - rap rock: + - rapcore + - rap metal + - industrial hip hop + - electro music + - urban pasifika + - golden age hip hop + - west coast hip hop: + - jerkin' + - hyphy + - g-funk + - chicano rap + - gangsta rap + - alternative hip hop + - chap hop + - cumbia rap + - hiplife + - instrumental hip hop + - hip hop soul + - new jack swing + - motswako + - freestyle music + - ghetto house + - conscious hip hop + - underground hip hop + - avant-garde hip hop + - new school hip hop + - kwaito + - country-rap + - freestyle rap + - hip house + - hyphy + - low bap + - reggaeton + - reggae español/spanish reggae + - songo-salsa + - gangsta rap + - southern hip hop: + - crunk + - miami bass + - houston hip hop: + - chopped and screwed + - atlanta hip hop: + - snap music + - bounce music + - turntablism + - old school hip hop + - jazz rap + - political hip hop + - trip hop + - ragga + - nerdcore + - christian hip hop + - rap opera + - hip pop + - hardcore hip hop + - midwest hip hop: + - detroit hip hop: + - ghettotech + - twin cities hip hop + - horrorcore + - chicago hip hop: + - ghetto house + - st. louis hip hop + - g-funk + - merenrap + - crunkcore + - trap From 0bc3836d52c9245bc046b61c037d71c78ae5a9b5 Mon Sep 17 00:00:00 2001 From: Thomas Gordon Date: Wed, 3 Sep 2014 09:25:13 -0400 Subject: [PATCH 2/5] Alphabetize! Thanks @KraYmer --- beetsplug/lastgenre/genres-tree.yaml | 1494 +++++++++++++------------- 1 file changed, 747 insertions(+), 747 deletions(-) diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index 8920db20e..1e4d1b714 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -1,781 +1,781 @@ +- african: + - afrobeat + - apala + - benga + - bikutsi + - bongo flava + - cape jazz + - chimurenga + - coupé-décalé + - fuji music + - genge + - highlife + - hiplife + - isicathamiya + - jit + - jùjú + - kapuka + - kizomba + - kuduro + - kwaito + - kwela + - makossa + - maloya + - marrabenta + - mbalax + - mbaqanga + - mbube + - morna + - museve + - palm-wine + - raï + - sakara + - sega + - seggae + - semba + - soukous + - taarab + - zouglou +- asian: + - east asian: + - anison + - c-pop + - cantopop + - enka + - hong kong english pop + - j-pop + - k-pop + - kayōkyoku + - korean pop + - mandopop + - onkyokei + - taiwanese pop + - fann at-tanbura + - fijiri + - khaliji + - liwa + - sawt + - south and southeast asian: + - baila + - bhangra + - bhojpuri + - dangdut + - filmi + - indian pop + - lavani + - luk thung: + - luk krung + - manila sound + - morlam + - pinoy pop + - pop sunda + - ragini + - thai pop +- avant-garde: + - electroacoustic + - experimental music + - lo-fi + - musique concrète + - noise +- blues: + - african blues + - blues rock + - blues shouter + - british blues + - canadian blues + - chicago blues + - classic female blues + - contemporary r&b + - country blues + - delta blues + - detroit blues + - electric blues + - gospel blues + - hill country blues + - hokum blues + - jazz blues + - jump blues + - kansas city blues + - louisiana blues + - memphis blues + - piano blues + - piedmont blues + - punk blues + - rhythm and blues + - soul blues + - st. louis blues + - swamp blues + - texas blues + - west coast blues +- caribbean and latin american: + - bachata + - baithak gana + - bolero + - brazilian: + - axé + - bossa nova + - brazilian rock + - brega + - choro + - forró + - frevo + - funk carioca + - lambada + - maracatu + - música popular brasileira + - música sertaneja + - pagode + - samba + - samba rock + - tecnobrega + - tropicalia + - zouk-lambada + - calypso + - chutney + - chutney soca + - compas + - dance hall + - mambo + - merengue + - méringue + - other latin: + - chicha + - criolla + - cumbia + - huayno + - mariachi + - ranchera + - tejano + - punta + - punta rock + - rasin + - reggae + - reggaeton + - salsa + - soca + - son + - timba + - twoubadou + - zouk +- comedy: + - comedy music + - comedy rock + - parody music +- country: + - alternative country: + - cowpunk + - americana + - australian country music + - bakersfield sound + - bluegrass: + - progressive bluegrass + - reactionary bluegrass + - blues country + - cajun: + - cajun fiddle tunes + - christian country music + - classic country + - close harmony + - country pop + - country rap + - country rock + - country soul + - cowboy/western music + - dansband music + - franco-country + - gulf and western + - hellbilly music + - hokum + - honky tonk + - instrumental country + - lubbock sound + - nashville sound + - neotraditional country + - outlaw country + - progressive country + - psychobilly/punkabilly + - red dirt + - rockabilly + - sertanejo + - texas country + - traditional country music + - truck-driving country + - western swing + - zydeco +- easy listening: + - background music + - beautiful music + - elevator music + - furniture music + - lounge music + - middle of the road + - new-age music +- electronic: + - ambient: + - ambient dub + - ambient house + - ambient techno + - dark ambient + - drone music + - illbient + - isolationism + - lowercase + - asian underground + - breakbeat: + - 4-beat + - acid breaks + - baltimore club + - big beat + - breakbeat hardcore + - broken beat + - florida breaks + - nu skool breaks + - chiptune: + - bitpop + - game boy music + - nintendocore + - video game music + - yorkshire bleeps and bass + - disco: + - cosmic disco + - disco polo + - europop: + - euro disco + - italo disco + - nu-disco + - space disco + - downtempo: + - acid jazz + - balearic beat + - chill out + - dub music + - dubtronica + - ethnic electronica + - moombahton + - new-age music + - nu jazz + - trip hop + - drum and bass: + - darkcore + - darkstep + - drumfunk + - drumstep + - hardstep + - intelligent drum and bass + - jump-up + - liquid funk + - neurofunk + - oldschool jungle: + - darkside jungle + - ragga-jungle + - raggacore + - sambass + - techstep + - electro: + - crunk + - electro backbeat + - electro-grime + - electropop + - electroacoustic: + - acousmatic music + - computer music + - electroacoustic improvisation + - field recording + - live coding + - live electronics + - musique concrète + - soundscape composition + - tape music + - electronic rock: + - alternative dance: + - baggy + - madchester + - dance-punk + - dance-rock + - dark wave + - electroclash + - electronicore + - electropunk + - ethereal wave + - indietronica + - new rave + - space rock + - synthpop + - synthpunk + - electronica: + - berlin school + - chillwave + - electronic art music + - electronic dance music + - folktronica + - freestyle music + - glitch + - idm + - laptronica + - skweee + - sound art + - synthcore + - eurodance: + - bubblegum dance + - italo dance + - turbofolk + - hardcore: + - bouncy house + - bouncy techno + - breakcore + - darkcore + - digital hardcore + - doomcore + - dubstyle + - gabber + - happy hardcore + - hardstyle + - jumpstyle + - makina + - speedcore + - terrorcore + - uk hardcore + - hi-nrg: + - eurobeat + - hard nrg + - new beat + - house: + - acid house + - chicago house + - deep house + - diva house + - dutch house + - electro house + - freestyle house + - french house + - funky house + - ghetto house + - hardbag + - hip house + - italo house + - latin house + - minimal house + - progressive house + - rave music + - swing house + - tech house + - tribal house + - uk hard house + - us garage + - vocal house + - industrial: + - aggrotech + - coldwave + - cybergrind + - dark electro + - death industrial + - electro-industrial + - electronic body music: + - futurepop + - industrial metal: + - neue deutsche härte + - industrial rock + - noise: + - japanoise + - power electronics + - power noise + - witch house + - post-disco: + - boogie + - dance-pop + - progressive: + - progressive house/trance: + - disco house + - dream house + - space house + - progressive breaks + - progressive drum & bass + - progressive techno + - techno: + - acid techno + - detroit techno + - free tekno + - ghettotech + - minimal + - nortec + - schranz + - techno-dnb + - technopop + - tecno brega + - toytown techno + - trance: + - acid trance + - classic trance + - dream trance + - goa trance: + - dark psytrance + - full on + - psybreaks + - psyprog + - suomisaundi + - hard trance + - tech trance + - uplifting trance: + - orchestral uplifting + - vocal trance + - uk garage: + - 2-step + - 4x4 + - bassline + - breakstep + - dubstep + - funky + - grime + - speed garage + - trap +- folk: + - american folk revival + - anti-folk + - british folk revival + - celtic music + - contemporary folk + - filk music + - freak folk + - indie folk + - industrial folk + - neofolk + - progressive folk + - psychedelic folk + - sung poetry + - techno-folk +- hip hop: + - alternative hip hop + - avant-garde hip hop + - bongo flava + - chap hop + - chopped and screwed + - christian hip hop + - conscious hip hop + - country-rap + - crunkcore + - cumbia rap + - east coast hip hop: + - baltimore club + - brick city club + - hardcore hip hop + - mafioso rap + - new jersey hip hop + - electro music + - freestyle music + - freestyle rap + - g-funk + - gangsta rap + - ghetto house + - ghettotech + - golden age hip hop + - grime + - hardcore hip hop + - hip hop soul + - hip house + - hip pop + - hiplife + - hyphy + - industrial hip hop + - instrumental hip hop + - jazz rap + - kwaito + - low bap + - lyrical hip hop + - merenrap + - midwest hip hop: + - chicago hip hop: + - ghetto house + - detroit hip hop: + - ghettotech + - horrorcore + - st. louis hip hop + - twin cities hip hop + - motswako + - nerdcore + - new jack swing + - new school hip hop + - old school hip hop + - political hip hop + - ragga + - rap opera + - rap rock: + - rap metal + - rapcore + - reggae español/spanish reggae + - reggaeton + - songo-salsa + - southern hip hop: + - atlanta hip hop: + - snap music + - bounce music + - crunk + - houston hip hop: + - chopped and screwed + - miami bass + - trap + - trip hop + - turntablism + - underground hip hop + - urban pasifika + - west coast hip hop: + - chicano rap + - g-funk + - gangsta rap + - hyphy + - jerkin' +- jazz: + - acid jazz + - asian american jazz + - avant-garde jazz + - bebop + - boogie-woogie + - bossa nova + - british dance band + - cape jazz + - chamber jazz + - continental jazz + - cool jazz + - crossover jazz + - cubop + - dixieland + - ethno jazz + - european free jazz + - free funk + - free improvisation + - free jazz + - gypsy jazz + - hard bop + - jazz blues + - jazz fusion + - jazz rap + - jazz rock + - jazz-funk + - kansas city blues + - kansas city jazz + - latin jazz + - livetronica + - m-base + - mainstream jazz + - modal jazz + - neo-bop jazz + - neo-swing + - novelty ragtime + - nu jazz + - orchestral jazz + - post-bop + - punk jazz + - ragtime + - shibuya-kei + - ska jazz + - smooth jazz + - soul jazz + - straight-ahead jazz + - stride jazz + - swing + - third stream + - trad jazz + - vocal jazz + - west coast gypsy jazz + - west coast jazz +- other: + - worldbeat +- pop: + - adult contemporary + - arab pop + - baroque pop + - bubblegum pop + - chanson + - christian pop + - classical crossover + - country pop + - dance-pop + - disco polo + - electropop + - europop: + - austropop + - balkan pop + - eurobeat + - french pop + - italo dance + - italo disco + - latin pop + - laïkó + - nederpop + - russian pop + - iranian pop + - jangle pop + - latin ballad + - levenslied + - louisiana swamp pop + - mexican pop + - motorpop + - new romanticism + - pop rap + - popera + - psychedelic pop + - schlager + - soft rock + - sophisti-pop + - space age pop + - sunshine pop + - surf pop + - synthpop + - technopop + - teen pop + - traditional pop music + - turkish pop + - vispop + - wonky pop +- rhythm and blues: + - contemporary r&b + - funk: + - deep funk + - disco: + - boogie + - post-disco + - go-go + - p-funk + - new jack swing + - soul: + - blue-eyed soul + - hip hop soul + - neo soul + - northern soul - rock: - alternative rock: - britpop: - post-britpop + - dream pop - grunge: - post-grunge + - indie pop: + - dunedin sound + - twee pop - indie rock - - shoegaze - - dream pop + - industrial rock - noise pop - - slowcore + - nu metal - post-punk revival - post-rock: - post-metal - sadcore - - industrial rock - - indie pop: - - dunedin sound - - twee pop - - nu metal - - math rock - - pop rock - - garage rock - - electronic rock - - rap rock: - - rapcore - - surf rock - - glam rock + - shoegaze + - slowcore - art rock - - electronicore - - paisley underground - - experimental rock - - punk rock: - - anarcho punk: - - crust punk: - - d-beat - - riot grrrl - - garage punk - - pop punk - - christian punk - - horror punk - - deathrock - - ska punk: - - ska-core - - skate punk - - grindcore: - - noisegrind - - crustgrind - - art punk - - digital hardcore - - hardcore punk: - - crossover thrash - - powerviolence - - street punk - - post-hardcore: - - emo: - - screamo - - thrashcore - - psychobilly - - folk punk: - - gypsy punk - - cowpunk - - celtic punk - - jazz rock - - southern rock - - christian rock - - visual kei: - - nagoya kei - - chinese rock - - rock and roll - - psychedelic rock: - - raga rock - - acid rock - - freakbeat - - neo-psychedelia - - desert rock - - folk rock - - sufi rock - beat music + - chinese rock + - christian rock - dark cabaret - - post-punk: - - gothic rock - - no wave - - noise rock - - new wave: - - world fusion - - power pop + - desert rock + - electronic rock + - electronicore + - experimental rock + - folk rock + - garage rock + - glam rock + - hard rock - heavy metal: - - industrial metal - - folk metal: - - celtic metal - - medieval metal - - speed metal - - power metal - - rap metal - - funk metal - alternative metal: - nu metal - - thrash metal: - - crossover thrash - - groove metal + - black metal: + - viking metal - christian metal - death metal: - goregrind - melodic death metal - technical death metal - - gothic metal - - glam metal - - stoner rock - - black metal: - - viking metal - - progressive metal + - doom metal - drone metal + - folk metal: + - celtic metal + - medieval metal + - funk metal + - glam metal + - gothic metal + - industrial metal - metalcore: + - deathcore - mathcore: - djent - - deathcore - - symphonic metal - - doom metal + - power metal + - progressive metal + - rap metal - sludge metal - - hard rock - - progressive rock: - - krautrock - - space rock - - rock in opposition - - new prog - - canterbury scene -- rhythm and blues: - - new jack swing - - soul: - - neo soul - - hip hop soul - - northern soul - - blue-eyed soul - - funk: - - go-go - - p-funk - - deep funk - - disco: - - post-disco - - boogie - - contemporary r&b -- country: - - psychobilly/punkabilly - - texas country - - country soul - - bakersfield sound - - honky tonk - - outlaw country - - gulf and western - - cajun: - - cajun fiddle tunes - - cowboy/western music - - franco-country - - hokum - - rockabilly - - progressive country - - country rock - - dansband music - - close harmony - - australian country music - - lubbock sound - - sertanejo - - zydeco - - instrumental country - - neotraditional country - - classic country - - truck-driving country - - hellbilly music - - americana - - western swing - - bluegrass: - - progressive bluegrass - - reactionary bluegrass - - alternative country: - - cowpunk - - blues country - - traditional country music - - country pop - - red dirt - - country rap - - nashville sound - - christian country music -- caribbean and latin american: - - chutney soca - - soca - - compas - - rasin - - punta rock - - other latin: - - huayno - - tejano - - mariachi - - cumbia - - criolla - - ranchera - - chicha - - brazilian: - - bossa nova - - brega - - samba - - forró - - choro - - funk carioca - - frevo - - música sertaneja - - lambada - - tropicalia - - tecnobrega - - brazilian rock - - pagode - - música popular brasileira - - maracatu - - zouk-lambada - - axé - - samba rock - - timba - - punta - - reggaeton - - dance hall - - zouk - - méringue - - salsa - - chutney - - twoubadou - - calypso - - reggae - - merengue - - baithak gana - - bachata - - bolero - - son - - mambo -- jazz: - - jazz rap - - modal jazz - - cape jazz - - swing - - soul jazz - - gypsy jazz - - neo-bop jazz - - free improvisation - - crossover jazz - - orchestral jazz - - livetronica - - jazz-funk - - bebop - - stride jazz - - acid jazz - - ethno jazz - - continental jazz - - m-base - - vocal jazz - - mainstream jazz - - boogie-woogie - - cubop - - dixieland - - nu jazz - - post-bop - - hard bop + - speed metal + - stoner rock + - symphonic metal + - thrash metal: + - crossover thrash + - groove metal - jazz rock - - kansas city blues - - neo-swing - - european free jazz - - novelty ragtime - - punk jazz - - west coast jazz - - straight-ahead jazz - - free jazz - - jazz blues - - shibuya-kei - - west coast gypsy jazz - - asian american jazz - - ragtime - - free funk - - latin jazz - - british dance band - - bossa nova - - trad jazz - - ska jazz - - kansas city jazz - - jazz fusion - - chamber jazz - - smooth jazz - - avant-garde jazz - - third stream - - cool jazz -- other: - - worldbeat -- pop: - - chanson - - teen pop - - latin ballad - - baroque pop - - traditional pop music - - schlager - - adult contemporary - - country pop - - popera - - jangle pop - - christian pop - - technopop - - turkish pop - - psychedelic pop - - synthpop - - pop rap - - wonky pop - - mexican pop - - soft rock - - louisiana swamp pop - - electropop - - surf pop - - motorpop - - classical crossover - - arab pop - - new romanticism - - disco polo - - sophisti-pop - - sunshine pop - - bubblegum pop - - vispop - - iranian pop - - space age pop - - europop: - - italo disco - - eurobeat - - austropop - - latin pop - - french pop - - italo dance - - laïkó - - balkan pop - - nederpop - - russian pop - - dance-pop - - levenslied -- easy listening: - - furniture music - - lounge music - - new-age music - - middle of the road - - beautiful music - - background music - - elevator music -- avant-garde: - - electroacoustic - - experimental music - - lo-fi - - noise - - musique concrète -- ska: - - reggae: - - polish reggae - - ragga - - reggae fusion - - dub - - rocksteady - - ragga jungle - - 2 tone - - dancehall - - lovers rock -- asian: - - fijiri - - fann at-tanbura - - east asian: - - mandopop - - c-pop - - cantopop - - j-pop - - onkyokei - - k-pop - - taiwanese pop - - hong kong english pop - - anison - - korean pop - - kayōkyoku - - enka - - sawt - - south and southeast asian: - - bhangra - - ragini - - thai pop - - indian pop - - pop sunda - - baila - - filmi - - morlam - - pinoy pop - - manila sound - - luk thung: - - luk krung - - lavani - - dangdut - - bhojpuri - - liwa - - khaliji -- african: - - bikutsi - - mbalax - - afrobeat - - jit - - bongo flava - - hiplife - - jùjú - - kuduro - - benga - - maloya - - coupé-décalé - - kwaito - - zouglou - - mbube - - makossa - - highlife - - genge - - palm-wine - - morna - - taarab - - sakara - - soukous - - mbaqanga - - marrabenta - - museve - - kizomba - - raï - - apala - - cape jazz - - kapuka - - isicathamiya - - kwela - - seggae - - chimurenga - - fuji music - - sega - - semba -- blues: - - african blues - - blues rock - - piedmont blues - - delta blues - - rhythm and blues - - punk blues - - classic female blues - - country blues - - chicago blues - - kansas city blues - - soul blues - - jazz blues - - detroit blues - - electric blues - - west coast blues - - louisiana blues - - british blues - - swamp blues - - hill country blues - - hokum blues - - memphis blues - - st. louis blues - - canadian blues - - blues shouter - - jump blues - - texas blues - - contemporary r&b - - piano blues - - gospel blues -- comedy: - - comedy music - - parody music - - comedy rock -- electronic: - - industrial: - - industrial metal: - - neue deutsche härte - - coldwave - - electronic body music: - - futurepop - - aggrotech - - dark electro - - death industrial - - cybergrind - - noise: - - power electronics - - japanoise - - power noise - - electro-industrial - - industrial rock - - witch house - - chiptune: - - video game music - - bitpop - - yorkshire bleeps and bass - - nintendocore - - game boy music - - progressive: - - progressive techno - - progressive breaks - - progressive house/trance: - - disco house - - dream house - - space house - - progressive drum & bass - - electronica: - - electronic dance music - - skweee - - laptronica - - synthcore - - freestyle music - - glitch - - idm - - electronic art music - - berlin school - - folktronica - - chillwave - - sound art - - house: - - vocal house - - funky house - - latin house - - dutch house - - minimal house - - french house - - deep house - - chicago house - - hardbag - - us garage - - ghetto house - - tech house - - acid house - - italo house - - swing house - - hip house - - electro house - - diva house - - progressive house - - freestyle house - - rave music - - tribal house - - uk hard house - - electronic rock: - - alternative dance: - - madchester - - baggy - - synthpunk - - dark wave - - dance-rock - - indietronica - - new rave + - math rock + - new wave: + - world fusion + - paisley underground + - pop rock + - post-punk: + - gothic rock + - no wave + - noise rock + - power pop + - progressive rock: + - canterbury scene + - krautrock + - new prog + - rock in opposition - space rock - - electropunk - - ethereal wave - - electroclash - - electronicore - - dance-punk - - synthpop - - hi-nrg: - - eurobeat - - hard nrg - - new beat - - trance: - - classic trance - - acid trance - - vocal trance - - uplifting trance: - - orchestral uplifting - - dream trance - - goa trance: - - full on - - psyprog - - dark psytrance - - suomisaundi - - psybreaks - - hard trance - - tech trance - - uk garage: - - grime - - breakstep - - bassline - - 2-step - - funky - - dubstep - - trap - - 4x4 - - speed garage - - disco: - - italo disco - - nu-disco - - europop: - - euro disco - - cosmic disco - - disco polo - - space disco - - eurodance: - - bubblegum dance - - italo dance - - turbofolk - - asian underground - - techno: - - techno-dnb - - nortec - - ghettotech - - acid techno - - free tekno - - toytown techno - - detroit techno - - schranz - - technopop - - minimal - - tecno brega - - post-disco: - - boogie - - dance-pop - - ambient: - - lowercase - - drone music - - illbient - - ambient techno - - ambient house - - ambient dub - - dark ambient - - isolationism - - breakbeat: - - acid breaks - - 4-beat - - broken beat - - baltimore club - - big beat - - breakbeat hardcore - - nu skool breaks - - florida breaks - - drum and bass: - - darkcore - - neurofunk - - jump-up - - drumfunk - - techstep - - liquid funk - - darkstep - - drumstep - - sambass - - oldschool jungle: - - darkside jungle - - ragga-jungle - - raggacore - - intelligent drum and bass - - hardstep - - electroacoustic: - - soundscape composition - - acousmatic music - - tape music - - live coding - - musique concrète - - computer music - - live electronics - - field recording - - electroacoustic improvisation - - electro: - - crunk - - electro backbeat - - electropop - - electro-grime - - downtempo: - - dub music - - new-age music - - balearic beat - - dubtronica - - ethnic electronica - - chill out - - nu jazz - - trip hop - - acid jazz - - moombahton - - hardcore: - - darkcore - - hardstyle - - breakcore - - happy hardcore - - dubstyle - - doomcore - - jumpstyle - - uk hardcore + - psychedelic rock: + - acid rock + - freakbeat + - neo-psychedelia + - raga rock + - punk rock: + - anarcho punk: + - crust punk: + - d-beat + - art punk + - christian punk + - deathrock - digital hardcore - - gabber - - bouncy house - - terrorcore - - speedcore - - bouncy techno - - makina -- folk: - - contemporary folk - - sung poetry - - celtic music - - anti-folk - - indie folk - - neofolk - - progressive folk - - industrial folk - - techno-folk - - british folk revival - - filk music - - american folk revival - - psychedelic folk - - freak folk -- hip hop: - - east coast hip hop: - - hardcore hip hop - - brick city club - - baltimore club - - mafioso rap - - new jersey hip hop - - bongo flava - - ghettotech - - chopped and screwed - - lyrical hip hop - - grime + - folk punk: + - celtic punk + - cowpunk + - gypsy punk + - garage punk + - grindcore: + - crustgrind + - noisegrind + - hardcore punk: + - crossover thrash + - post-hardcore: + - emo: + - screamo + - powerviolence + - street punk + - thrashcore + - horror punk + - pop punk + - psychobilly + - riot grrrl + - ska punk: + - ska-core + - skate punk - rap rock: - rapcore - - rap metal - - industrial hip hop - - electro music - - urban pasifika - - golden age hip hop - - west coast hip hop: - - jerkin' - - hyphy - - g-funk - - chicano rap - - gangsta rap - - alternative hip hop - - chap hop - - cumbia rap - - hiplife - - instrumental hip hop - - hip hop soul - - new jack swing - - motswako - - freestyle music - - ghetto house - - conscious hip hop - - underground hip hop - - avant-garde hip hop - - new school hip hop - - kwaito - - country-rap - - freestyle rap - - hip house - - hyphy - - low bap - - reggaeton - - reggae español/spanish reggae - - songo-salsa - - gangsta rap - - southern hip hop: - - crunk - - miami bass - - houston hip hop: - - chopped and screwed - - atlanta hip hop: - - snap music - - bounce music - - turntablism - - old school hip hop - - jazz rap - - political hip hop - - trip hop + - rock and roll + - southern rock + - sufi rock + - surf rock + - visual kei: + - nagoya kei +- ska: + - 2 tone + - dancehall + - dub + - lovers rock - ragga - - nerdcore - - christian hip hop - - rap opera - - hip pop - - hardcore hip hop - - midwest hip hop: - - detroit hip hop: - - ghettotech - - twin cities hip hop - - horrorcore - - chicago hip hop: - - ghetto house - - st. louis hip hop - - g-funk - - merenrap - - crunkcore - - trap + - ragga jungle + - reggae: + - polish reggae + - reggae fusion + - rocksteady From 4c622966e6af0529a9d4a80fa15dc43d7c2ac61d Mon Sep 17 00:00:00 2001 From: Thomas Gordon Date: Fri, 5 Sep 2014 11:13:29 -0400 Subject: [PATCH 3/5] Update genres-tree.yaml --- beetsplug/lastgenre/genres-tree.yaml | 92 +++++----------------------- 1 file changed, 15 insertions(+), 77 deletions(-) diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index 1e4d1b714..2bf1e07c4 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -1,4 +1,6 @@ - african: + - african heavy metal + - african hip hop - afrobeat - apala - benga @@ -6,14 +8,14 @@ - bongo flava - cape jazz - chimurenga - - coupé-décalé + - coupé-décalé - fuji music - genge - highlife - hiplife - isicathamiya - jit - - jùjú + - jùjú - kapuka - kizomba - kuduro @@ -28,7 +30,7 @@ - morna - museve - palm-wine - - raï + - raï - sakara - sega - seggae @@ -45,7 +47,7 @@ - hong kong english pop - j-pop - k-pop - - kayōkyoku + - kayōkyoku - korean pop - mandopop - onkyokei @@ -72,11 +74,9 @@ - ragini - thai pop - avant-garde: - - electroacoustic - experimental music - lo-fi - - musique concrète - - noise + - musique concrète - blues: - african blues - blues rock @@ -101,7 +101,6 @@ - piano blues - piedmont blues - punk blues - - rhythm and blues - soul blues - st. louis blues - swamp blues @@ -112,18 +111,18 @@ - baithak gana - bolero - brazilian: - - axé + - axé - bossa nova - brazilian rock - brega - choro - - forró + - forró - frevo - funk carioca - lambada - maracatu - - música popular brasileira - - música sertaneja + - música popular brasileira + - música sertaneja - pagode - samba - samba rock @@ -137,7 +136,7 @@ - dance hall - mambo - merengue - - méringue + - méringue - other latin: - chicha - criolla @@ -149,7 +148,6 @@ - punta - punta rock - rasin - - reggae - reggaeton - salsa - soca @@ -239,7 +237,6 @@ - disco: - cosmic disco - disco polo - - europop: - euro disco - italo disco - nu-disco @@ -252,7 +249,6 @@ - dubtronica - ethnic electronica - moombahton - - new-age music - nu jazz - trip hop - drum and bass: @@ -283,7 +279,6 @@ - field recording - live coding - live electronics - - musique concrète - soundscape composition - tape music - electronic rock: @@ -323,7 +318,6 @@ - bouncy house - bouncy techno - breakcore - - darkcore - digital hardcore - doomcore - dubstyle @@ -373,7 +367,7 @@ - electronic body music: - futurepop - industrial metal: - - neue deutsche härte + - neue deutsche härte - industrial rock - noise: - japanoise @@ -446,47 +440,34 @@ - hip hop: - alternative hip hop - avant-garde hip hop - - bongo flava - chap hop - - chopped and screwed - christian hip hop - conscious hip hop - country-rap - crunkcore - cumbia rap - east coast hip hop: - - baltimore club - brick city club - hardcore hip hop - mafioso rap - new jersey hip hop - electro music - - freestyle music - freestyle rap - g-funk - gangsta rap - - ghetto house - - ghettotech - golden age hip hop - - grime - - hardcore hip hop - hip hop soul - - hip house - hip pop - - hiplife - hyphy - industrial hip hop - instrumental hip hop - jazz rap - - kwaito - low bap - lyrical hip hop - merenrap - midwest hip hop: - chicago hip hop: - - ghetto house - detroit hip hop: - - ghettotech - horrorcore - st. louis hip hop - twin cities hip hop @@ -501,37 +482,27 @@ - rap rock: - rap metal - rapcore - - reggae español/spanish reggae - - reggaeton + - reggae español/spanish reggae - songo-salsa - southern hip hop: - atlanta hip hop: - snap music - bounce music - - crunk - houston hip hop: - chopped and screwed - miami bass - - trap - - trip hop - turntablism - underground hip hop - urban pasifika - west coast hip hop: - chicano rap - - g-funk - - gangsta rap - - hyphy - jerkin' - jazz: - - acid jazz - asian american jazz - avant-garde jazz - bebop - boogie-woogie - - bossa nova - british dance band - - cape jazz - chamber jazz - continental jazz - cool jazz @@ -545,12 +516,9 @@ - free jazz - gypsy jazz - hard bop - - jazz blues - jazz fusion - - jazz rap - jazz rock - jazz-funk - - kansas city blues - kansas city jazz - latin jazz - livetronica @@ -560,7 +528,6 @@ - neo-bop jazz - neo-swing - novelty ragtime - - nu jazz - orchestral jazz - post-bop - punk jazz @@ -587,19 +554,12 @@ - chanson - christian pop - classical crossover - - country pop - - dance-pop - - disco polo - - electropop - europop: - austropop - balkan pop - - eurobeat - french pop - - italo dance - - italo disco - latin pop - - laïkó + - laïkó - nederpop - russian pop - iranian pop @@ -619,26 +579,18 @@ - space age pop - sunshine pop - surf pop - - synthpop - - technopop - teen pop - traditional pop music - turkish pop - vispop - wonky pop - rhythm and blues: - - contemporary r&b - funk: - deep funk - - disco: - - boogie - - post-disco - go-go - p-funk - - new jack swing - soul: - blue-eyed soul - - hip hop soul - neo soul - northern soul - rock: @@ -652,7 +604,6 @@ - dunedin sound - twee pop - indie rock - - industrial rock - noise pop - nu metal - post-punk revival @@ -667,8 +618,6 @@ - christian rock - dark cabaret - desert rock - - electronic rock - - electronicore - experimental rock - folk rock - garage rock @@ -676,7 +625,6 @@ - hard rock - heavy metal: - alternative metal: - - nu metal - black metal: - viking metal - christian metal @@ -692,14 +640,12 @@ - funk metal - glam metal - gothic metal - - industrial metal - metalcore: - deathcore - mathcore: - djent - power metal - progressive metal - - rap metal - sludge metal - speed metal - stoner rock @@ -707,7 +653,6 @@ - thrash metal: - crossover thrash - groove metal - - jazz rock - math rock - new wave: - world fusion @@ -723,7 +668,6 @@ - krautrock - new prog - rock in opposition - - space rock - psychedelic rock: - acid rock - freakbeat @@ -736,17 +680,14 @@ - art punk - christian punk - deathrock - - digital hardcore - folk punk: - celtic punk - - cowpunk - gypsy punk - garage punk - grindcore: - crustgrind - noisegrind - hardcore punk: - - crossover thrash - post-hardcore: - emo: - screamo @@ -760,8 +701,6 @@ - ska punk: - ska-core - skate punk - - rap rock: - - rapcore - rock and roll - southern rock - sufi rock @@ -773,7 +712,6 @@ - dancehall - dub - lovers rock - - ragga - ragga jungle - reggae: - polish reggae From 98adb35e3f402a51e339285d7b21c1ef827559e7 Mon Sep 17 00:00:00 2001 From: Thomas Gordon Date: Sat, 6 Sep 2014 08:51:31 -0400 Subject: [PATCH 4/5] Change expected result for compatibility with updated genres-tree.yaml --- test/test_lastgenre.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_lastgenre.py b/test/test_lastgenre.py index 74ef402c7..62f20491b 100644 --- a/test/test_lastgenre.py +++ b/test/test_lastgenre.py @@ -70,7 +70,7 @@ class LastGenrePluginTest(unittest.TestCase, TestHelper): """ self._setup_config(canonical=True, whitelist=True, count=99) self.assertEqual(self.plugin._resolve_genres(['delta blues']), - 'Delta Blues, Country Blues, Blues') + 'Delta Blues, Blues') def test_whitelist_custom(self): """Keep only genres that are in the whitelist. From f910ac6a632d20932f86c597bbd6178239f6ca2c Mon Sep 17 00:00:00 2001 From: Thomas Gordon Date: Sat, 6 Sep 2014 14:14:15 -0400 Subject: [PATCH 5/5] Correct busted encoding hopefully --- beetsplug/lastgenre/genres-tree.yaml | 1438 +++++++++++++------------- 1 file changed, 719 insertions(+), 719 deletions(-) diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml index 2bf1e07c4..6f701f829 100644 --- a/beetsplug/lastgenre/genres-tree.yaml +++ b/beetsplug/lastgenre/genres-tree.yaml @@ -1,719 +1,719 @@ -- african: - - african heavy metal - - african hip hop - - afrobeat - - apala - - benga - - bikutsi - - bongo flava - - cape jazz - - chimurenga - - coupé-décalé - - fuji music - - genge - - highlife - - hiplife - - isicathamiya - - jit - - jùjú - - kapuka - - kizomba - - kuduro - - kwaito - - kwela - - makossa - - maloya - - marrabenta - - mbalax - - mbaqanga - - mbube - - morna - - museve - - palm-wine - - raï - - sakara - - sega - - seggae - - semba - - soukous - - taarab - - zouglou -- asian: - - east asian: - - anison - - c-pop - - cantopop - - enka - - hong kong english pop - - j-pop - - k-pop - - kayōkyoku - - korean pop - - mandopop - - onkyokei - - taiwanese pop - - fann at-tanbura - - fijiri - - khaliji - - liwa - - sawt - - south and southeast asian: - - baila - - bhangra - - bhojpuri - - dangdut - - filmi - - indian pop - - lavani - - luk thung: - - luk krung - - manila sound - - morlam - - pinoy pop - - pop sunda - - ragini - - thai pop -- avant-garde: - - experimental music - - lo-fi - - musique concrète -- blues: - - african blues - - blues rock - - blues shouter - - british blues - - canadian blues - - chicago blues - - classic female blues - - contemporary r&b - - country blues - - delta blues - - detroit blues - - electric blues - - gospel blues - - hill country blues - - hokum blues - - jazz blues - - jump blues - - kansas city blues - - louisiana blues - - memphis blues - - piano blues - - piedmont blues - - punk blues - - soul blues - - st. louis blues - - swamp blues - - texas blues - - west coast blues -- caribbean and latin american: - - bachata - - baithak gana - - bolero - - brazilian: - - axé - - bossa nova - - brazilian rock - - brega - - choro - - forró - - frevo - - funk carioca - - lambada - - maracatu - - música popular brasileira - - música sertaneja - - pagode - - samba - - samba rock - - tecnobrega - - tropicalia - - zouk-lambada - - calypso - - chutney - - chutney soca - - compas - - dance hall - - mambo - - merengue - - méringue - - other latin: - - chicha - - criolla - - cumbia - - huayno - - mariachi - - ranchera - - tejano - - punta - - punta rock - - rasin - - reggaeton - - salsa - - soca - - son - - timba - - twoubadou - - zouk -- comedy: - - comedy music - - comedy rock - - parody music -- country: - - alternative country: - - cowpunk - - americana - - australian country music - - bakersfield sound - - bluegrass: - - progressive bluegrass - - reactionary bluegrass - - blues country - - cajun: - - cajun fiddle tunes - - christian country music - - classic country - - close harmony - - country pop - - country rap - - country rock - - country soul - - cowboy/western music - - dansband music - - franco-country - - gulf and western - - hellbilly music - - hokum - - honky tonk - - instrumental country - - lubbock sound - - nashville sound - - neotraditional country - - outlaw country - - progressive country - - psychobilly/punkabilly - - red dirt - - rockabilly - - sertanejo - - texas country - - traditional country music - - truck-driving country - - western swing - - zydeco -- easy listening: - - background music - - beautiful music - - elevator music - - furniture music - - lounge music - - middle of the road - - new-age music -- electronic: - - ambient: - - ambient dub - - ambient house - - ambient techno - - dark ambient - - drone music - - illbient - - isolationism - - lowercase - - asian underground - - breakbeat: - - 4-beat - - acid breaks - - baltimore club - - big beat - - breakbeat hardcore - - broken beat - - florida breaks - - nu skool breaks - - chiptune: - - bitpop - - game boy music - - nintendocore - - video game music - - yorkshire bleeps and bass - - disco: - - cosmic disco - - disco polo - - euro disco - - italo disco - - nu-disco - - space disco - - downtempo: - - acid jazz - - balearic beat - - chill out - - dub music - - dubtronica - - ethnic electronica - - moombahton - - nu jazz - - trip hop - - drum and bass: - - darkcore - - darkstep - - drumfunk - - drumstep - - hardstep - - intelligent drum and bass - - jump-up - - liquid funk - - neurofunk - - oldschool jungle: - - darkside jungle - - ragga-jungle - - raggacore - - sambass - - techstep - - electro: - - crunk - - electro backbeat - - electro-grime - - electropop - - electroacoustic: - - acousmatic music - - computer music - - electroacoustic improvisation - - field recording - - live coding - - live electronics - - soundscape composition - - tape music - - electronic rock: - - alternative dance: - - baggy - - madchester - - dance-punk - - dance-rock - - dark wave - - electroclash - - electronicore - - electropunk - - ethereal wave - - indietronica - - new rave - - space rock - - synthpop - - synthpunk - - electronica: - - berlin school - - chillwave - - electronic art music - - electronic dance music - - folktronica - - freestyle music - - glitch - - idm - - laptronica - - skweee - - sound art - - synthcore - - eurodance: - - bubblegum dance - - italo dance - - turbofolk - - hardcore: - - bouncy house - - bouncy techno - - breakcore - - digital hardcore - - doomcore - - dubstyle - - gabber - - happy hardcore - - hardstyle - - jumpstyle - - makina - - speedcore - - terrorcore - - uk hardcore - - hi-nrg: - - eurobeat - - hard nrg - - new beat - - house: - - acid house - - chicago house - - deep house - - diva house - - dutch house - - electro house - - freestyle house - - french house - - funky house - - ghetto house - - hardbag - - hip house - - italo house - - latin house - - minimal house - - progressive house - - rave music - - swing house - - tech house - - tribal house - - uk hard house - - us garage - - vocal house - - industrial: - - aggrotech - - coldwave - - cybergrind - - dark electro - - death industrial - - electro-industrial - - electronic body music: - - futurepop - - industrial metal: - - neue deutsche härte - - industrial rock - - noise: - - japanoise - - power electronics - - power noise - - witch house - - post-disco: - - boogie - - dance-pop - - progressive: - - progressive house/trance: - - disco house - - dream house - - space house - - progressive breaks - - progressive drum & bass - - progressive techno - - techno: - - acid techno - - detroit techno - - free tekno - - ghettotech - - minimal - - nortec - - schranz - - techno-dnb - - technopop - - tecno brega - - toytown techno - - trance: - - acid trance - - classic trance - - dream trance - - goa trance: - - dark psytrance - - full on - - psybreaks - - psyprog - - suomisaundi - - hard trance - - tech trance - - uplifting trance: - - orchestral uplifting - - vocal trance - - uk garage: - - 2-step - - 4x4 - - bassline - - breakstep - - dubstep - - funky - - grime - - speed garage - - trap -- folk: - - american folk revival - - anti-folk - - british folk revival - - celtic music - - contemporary folk - - filk music - - freak folk - - indie folk - - industrial folk - - neofolk - - progressive folk - - psychedelic folk - - sung poetry - - techno-folk -- hip hop: - - alternative hip hop - - avant-garde hip hop - - chap hop - - christian hip hop - - conscious hip hop - - country-rap - - crunkcore - - cumbia rap - - east coast hip hop: - - brick city club - - hardcore hip hop - - mafioso rap - - new jersey hip hop - - electro music - - freestyle rap - - g-funk - - gangsta rap - - golden age hip hop - - hip hop soul - - hip pop - - hyphy - - industrial hip hop - - instrumental hip hop - - jazz rap - - low bap - - lyrical hip hop - - merenrap - - midwest hip hop: - - chicago hip hop: - - detroit hip hop: - - horrorcore - - st. louis hip hop - - twin cities hip hop - - motswako - - nerdcore - - new jack swing - - 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: - - snap music - - bounce music - - houston hip hop: - - chopped and screwed - - miami bass - - turntablism - - underground hip hop - - urban pasifika - - west coast hip hop: - - chicano rap - - jerkin' -- jazz: - - asian american jazz - - avant-garde jazz - - bebop - - boogie-woogie - - british dance band - - chamber jazz - - continental jazz - - cool jazz - - crossover jazz - - cubop - - dixieland - - ethno jazz - - european free jazz - - free funk - - free improvisation - - free jazz - - gypsy jazz - - hard bop - - jazz fusion - - jazz rock - - jazz-funk - - kansas city jazz - - latin jazz - - livetronica - - m-base - - mainstream jazz - - modal jazz - - neo-bop jazz - - neo-swing - - novelty ragtime - - orchestral jazz - - post-bop - - punk jazz - - ragtime - - shibuya-kei - - ska jazz - - smooth jazz - - soul jazz - - straight-ahead jazz - - stride jazz - - swing - - third stream - - trad jazz - - vocal jazz - - west coast gypsy jazz - - west coast jazz -- other: - - worldbeat -- pop: - - adult contemporary - - arab pop - - baroque pop - - bubblegum pop - - chanson - - christian pop - - classical crossover - - europop: - - austropop - - balkan pop - - french pop - - latin pop - - laïkó - - nederpop - - russian pop - - iranian pop - - jangle pop - - latin ballad - - levenslied - - louisiana swamp pop - - mexican pop - - motorpop - - new romanticism - - pop rap - - popera - - psychedelic pop - - schlager - - soft rock - - sophisti-pop - - space age pop - - sunshine pop - - surf pop - - teen pop - - traditional pop music - - turkish pop - - vispop - - wonky pop -- rhythm and blues: - - funk: - - deep funk - - go-go - - p-funk - - soul: - - blue-eyed soul - - neo soul - - northern soul -- rock: - - alternative rock: - - britpop: - - post-britpop - - dream pop - - grunge: - - post-grunge - - indie pop: - - dunedin sound - - twee pop - - indie rock - - noise pop - - nu metal - - post-punk revival - - post-rock: - - post-metal - - sadcore - - shoegaze - - slowcore - - art rock - - beat music - - chinese rock - - christian rock - - dark cabaret - - desert rock - - experimental rock - - folk rock - - garage rock - - glam rock - - hard rock - - heavy metal: - - alternative metal: - - black metal: - - viking metal - - christian metal - - death metal: - - goregrind - - melodic death metal - - technical death metal - - doom metal - - drone metal - - folk metal: - - celtic metal - - medieval metal - - funk metal - - glam metal - - gothic metal - - metalcore: - - deathcore - - mathcore: - - djent - - power metal - - progressive metal - - sludge metal - - speed metal - - stoner rock - - symphonic metal - - thrash metal: - - crossover thrash - - groove metal - - math rock - - new wave: - - world fusion - - paisley underground - - pop rock - - post-punk: - - gothic rock - - no wave - - noise rock - - power pop - - progressive rock: - - canterbury scene - - krautrock - - new prog - - rock in opposition - - psychedelic rock: - - acid rock - - freakbeat - - neo-psychedelia - - raga rock - - punk rock: - - anarcho punk: - - crust punk: - - d-beat - - art punk - - christian punk - - deathrock - - folk punk: - - celtic punk - - gypsy punk - - garage punk - - grindcore: - - crustgrind - - noisegrind - - hardcore punk: - - post-hardcore: - - emo: - - screamo - - powerviolence - - street punk - - thrashcore - - horror punk - - pop punk - - psychobilly - - riot grrrl - - ska punk: - - ska-core - - skate punk - - rock and roll - - southern rock - - sufi rock - - surf rock - - visual kei: - - nagoya kei -- ska: - - 2 tone - - dancehall - - dub - - lovers rock - - ragga jungle - - reggae: - - polish reggae - - reggae fusion - - rocksteady +- african: + - african heavy metal + - african hip hop + - afrobeat + - apala + - benga + - bikutsi + - bongo flava + - cape jazz + - chimurenga + - coupé-décalé + - fuji music + - genge + - highlife + - hiplife + - isicathamiya + - jit + - jùjú + - kapuka + - kizomba + - kuduro + - kwaito + - kwela + - makossa + - maloya + - marrabenta + - mbalax + - mbaqanga + - mbube + - morna + - museve + - palm-wine + - raï + - sakara + - sega + - seggae + - semba + - soukous + - taarab + - zouglou +- asian: + - east asian: + - anison + - c-pop + - cantopop + - enka + - hong kong english pop + - j-pop + - k-pop + - kayōkyoku + - korean pop + - mandopop + - onkyokei + - taiwanese pop + - fann at-tanbura + - fijiri + - khaliji + - liwa + - sawt + - south and southeast asian: + - baila + - bhangra + - bhojpuri + - dangdut + - filmi + - indian pop + - lavani + - luk thung: + - luk krung + - manila sound + - morlam + - pinoy pop + - pop sunda + - ragini + - thai pop +- avant-garde: + - experimental music + - lo-fi + - musique concrète +- blues: + - african blues + - blues rock + - blues shouter + - british blues + - canadian blues + - chicago blues + - classic female blues + - contemporary r&b + - country blues + - delta blues + - detroit blues + - electric blues + - gospel blues + - hill country blues + - hokum blues + - jazz blues + - jump blues + - kansas city blues + - louisiana blues + - memphis blues + - piano blues + - piedmont blues + - punk blues + - soul blues + - st. louis blues + - swamp blues + - texas blues + - west coast blues +- caribbean and latin american: + - bachata + - baithak gana + - bolero + - brazilian: + - axé + - bossa nova + - brazilian rock + - brega + - choro + - forró + - frevo + - funk carioca + - lambada + - maracatu + - música popular brasileira + - música sertaneja + - pagode + - samba + - samba rock + - tecnobrega + - tropicalia + - zouk-lambada + - calypso + - chutney + - chutney soca + - compas + - dance hall + - mambo + - merengue + - méringue + - other latin: + - chicha + - criolla + - cumbia + - huayno + - mariachi + - ranchera + - tejano + - punta + - punta rock + - rasin + - reggae + - reggaeton + - salsa + - soca + - son + - timba + - twoubadou + - zouk +- comedy: + - comedy music + - comedy rock + - parody music +- country: + - alternative country: + - cowpunk + - americana + - australian country music + - bakersfield sound + - bluegrass: + - progressive bluegrass + - reactionary bluegrass + - blues country + - cajun: + - cajun fiddle tunes + - christian country music + - classic country + - close harmony + - country pop + - country rap + - country rock + - country soul + - cowboy/western music + - dansband music + - franco-country + - gulf and western + - hellbilly music + - hokum + - honky tonk + - instrumental country + - lubbock sound + - nashville sound + - neotraditional country + - outlaw country + - progressive country + - psychobilly/punkabilly + - red dirt + - rockabilly + - sertanejo + - texas country + - traditional country music + - truck-driving country + - western swing + - zydeco +- easy listening: + - background music + - beautiful music + - elevator music + - furniture music + - lounge music + - middle of the road + - new-age music +- electronic: + - ambient: + - ambient dub + - ambient house + - ambient techno + - dark ambient + - drone music + - illbient + - isolationism + - lowercase + - asian underground + - breakbeat: + - 4-beat + - acid breaks + - baltimore club + - big beat + - breakbeat hardcore + - broken beat + - florida breaks + - nu skool breaks + - chiptune: + - bitpop + - game boy music + - nintendocore + - video game music + - yorkshire bleeps and bass + - disco: + - cosmic disco + - disco polo + - euro disco + - italo disco + - nu-disco + - space disco + - downtempo: + - acid jazz + - balearic beat + - chill out + - dub music + - dubtronica + - ethnic electronica + - moombahton + - nu jazz + - trip hop + - drum and bass: + - darkcore + - darkstep + - drumfunk + - drumstep + - hardstep + - intelligent drum and bass + - jump-up + - liquid funk + - neurofunk + - oldschool jungle: + - darkside jungle + - ragga-jungle + - raggacore + - sambass + - techstep + - electro: + - crunk + - electro backbeat + - electro-grime + - electropop + - electroacoustic: + - acousmatic music + - computer music + - electroacoustic improvisation + - field recording + - live coding + - live electronics + - soundscape composition + - tape music + - electronic rock: + - alternative dance: + - baggy + - madchester + - dance-punk + - dance-rock + - dark wave + - electroclash + - electronicore + - electropunk + - ethereal wave + - indietronica + - new rave + - space rock + - synthpop + - synthpunk + - electronica: + - berlin school + - chillwave + - electronic art music + - electronic dance music + - folktronica + - freestyle music + - glitch + - idm + - laptronica + - skweee + - sound art + - synthcore + - eurodance: + - bubblegum dance + - italo dance + - turbofolk + - hardcore: + - bouncy house + - bouncy techno + - breakcore + - digital hardcore + - doomcore + - dubstyle + - gabber + - happy hardcore + - hardstyle + - jumpstyle + - makina + - speedcore + - terrorcore + - uk hardcore + - hi-nrg: + - eurobeat + - hard nrg + - new beat + - house: + - acid house + - chicago house + - deep house + - diva house + - dutch house + - electro house + - freestyle house + - french house + - funky house + - ghetto house + - hardbag + - hip house + - italo house + - latin house + - minimal house + - progressive house + - rave music + - swing house + - tech house + - tribal house + - uk hard house + - us garage + - vocal house + - industrial: + - aggrotech + - coldwave + - cybergrind + - dark electro + - death industrial + - electro-industrial + - electronic body music: + - futurepop + - industrial metal: + - neue deutsche härte + - industrial rock + - noise: + - japanoise + - power electronics + - power noise + - witch house + - post-disco: + - boogie + - dance-pop + - progressive: + - progressive house/trance: + - disco house + - dream house + - space house + - progressive breaks + - progressive drum & bass + - progressive techno + - techno: + - acid techno + - detroit techno + - free tekno + - ghettotech + - minimal + - nortec + - schranz + - techno-dnb + - technopop + - tecno brega + - toytown techno + - trance: + - acid trance + - classic trance + - dream trance + - goa trance: + - dark psytrance + - full on + - psybreaks + - psyprog + - suomisaundi + - hard trance + - tech trance + - uplifting trance: + - orchestral uplifting + - vocal trance + - uk garage: + - 2-step + - 4x4 + - bassline + - breakstep + - dubstep + - funky + - grime + - speed garage + - trap +- folk: + - american folk revival + - anti-folk + - british folk revival + - celtic music + - contemporary folk + - filk music + - freak folk + - indie folk + - industrial folk + - neofolk + - progressive folk + - psychedelic folk + - sung poetry + - techno-folk +- hip hop: + - alternative hip hop + - avant-garde hip hop + - chap hop + - christian hip hop + - conscious hip hop + - country-rap + - crunkcore + - cumbia rap + - east coast hip hop: + - brick city club + - hardcore hip hop + - mafioso rap + - new jersey hip hop + - electro music + - freestyle rap + - g-funk + - gangsta rap + - golden age hip hop + - hip hop soul + - hip pop + - hyphy + - industrial hip hop + - instrumental hip hop + - jazz rap + - low bap + - lyrical hip hop + - merenrap + - midwest hip hop: + - chicago hip hop: + - detroit hip hop: + - horrorcore + - st. louis hip hop + - twin cities hip hop + - motswako + - nerdcore + - new jack swing + - 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: + - snap music + - bounce music + - houston hip hop: + - chopped and screwed + - miami bass + - turntablism + - underground hip hop + - urban pasifika + - west coast hip hop: + - chicano rap + - jerkin' +- jazz: + - asian american jazz + - avant-garde jazz + - bebop + - boogie-woogie + - british dance band + - chamber jazz + - continental jazz + - cool jazz + - crossover jazz + - cubop + - dixieland + - ethno jazz + - european free jazz + - free funk + - free improvisation + - free jazz + - gypsy jazz + - hard bop + - jazz fusion + - jazz rock + - jazz-funk + - kansas city jazz + - latin jazz + - livetronica + - m-base + - mainstream jazz + - modal jazz + - neo-bop jazz + - neo-swing + - novelty ragtime + - orchestral jazz + - post-bop + - punk jazz + - ragtime + - shibuya-kei + - ska jazz + - smooth jazz + - soul jazz + - straight-ahead jazz + - stride jazz + - swing + - third stream + - trad jazz + - vocal jazz + - west coast gypsy jazz + - west coast jazz +- other: + - worldbeat +- pop: + - adult contemporary + - arab pop + - baroque pop + - bubblegum pop + - chanson + - christian pop + - classical crossover + - europop: + - austropop + - balkan pop + - french pop + - latin pop + - laïkó + - nederpop + - russian pop + - iranian pop + - jangle pop + - latin ballad + - levenslied + - louisiana swamp pop + - mexican pop + - motorpop + - new romanticism + - pop rap + - popera + - psychedelic pop + - schlager + - soft rock + - sophisti-pop + - space age pop + - sunshine pop + - surf pop + - teen pop + - traditional pop music + - turkish pop + - vispop + - wonky pop +- rhythm and blues: + - funk: + - deep funk + - go-go + - p-funk + - soul: + - blue-eyed soul + - neo soul + - northern soul +- rock: + - alternative rock: + - britpop: + - post-britpop + - dream pop + - grunge: + - post-grunge + - indie pop: + - dunedin sound + - twee pop + - indie rock + - noise pop + - nu metal + - post-punk revival + - post-rock: + - post-metal + - sadcore + - shoegaze + - slowcore + - art rock + - beat music + - chinese rock + - christian rock + - dark cabaret + - desert rock + - experimental rock + - folk rock + - garage rock + - glam rock + - hard rock + - heavy metal: + - alternative metal: + - black metal: + - viking metal + - christian metal + - death metal: + - goregrind + - melodic death metal + - technical death metal + - doom metal + - drone metal + - folk metal: + - celtic metal + - medieval metal + - funk metal + - glam metal + - gothic metal + - metalcore: + - deathcore + - mathcore: + - djent + - power metal + - progressive metal + - sludge metal + - speed metal + - stoner rock + - symphonic metal + - thrash metal: + - crossover thrash + - groove metal + - math rock + - new wave: + - world fusion + - paisley underground + - pop rock + - post-punk: + - gothic rock + - no wave + - noise rock + - power pop + - progressive rock: + - canterbury scene + - krautrock + - new prog + - rock in opposition + - psychedelic rock: + - acid rock + - freakbeat + - neo-psychedelia + - raga rock + - punk rock: + - anarcho punk: + - crust punk: + - d-beat + - art punk + - christian punk + - deathrock + - folk punk: + - celtic punk + - gypsy punk + - garage punk + - grindcore: + - crustgrind + - noisegrind + - hardcore punk: + - post-hardcore: + - emo: + - screamo + - powerviolence + - street punk + - thrashcore + - horror punk + - pop punk + - psychobilly + - riot grrrl + - ska punk: + - ska-core + - skate punk + - rock and roll + - southern rock + - sufi rock + - surf rock + - visual kei: + - nagoya kei +- ska: + - 2 tone + - dancehall + - dub + - lovers rock + - ragga jungle + - polish reggae + - reggae fusion + - rocksteady