From 685d5ed2b6311ba9274ea16df3bd16b8db8be794 Mon Sep 17 00:00:00 2001 From: wakingrufus Date: Fri, 13 Dec 2024 20:48:52 -0600 Subject: [PATCH 1/3] start on 2024 lists --- .../wakingrufus/website/music/Music2023.kt | 6 +- .../wakingrufus/website/music/Music2024.kt | 69 +++++++++++++++++++ 2 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt diff --git a/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2023.kt b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2023.kt index d44d140..7a438c1 100644 --- a/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2023.kt +++ b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2023.kt @@ -46,6 +46,9 @@ val bestMusic2023 = bestMusicOf(2023) { album("Systemic", "Divide and Dissolve") { link("https://divideanddissolve.bandcamp.com/album/systemic") } + track("& the Charm", "Avalon Emerson") { + link("https://avalonemerson.bandcamp.com/album/the-charm") + } // tracks track("Insomnia", "Parannoul") { @@ -78,9 +81,6 @@ val bestMusic2023 = bestMusicOf(2023) { track("Waaba Gwa\u200Ḇ\u200Bsoo ", "Saltwater Hank") { link("https://saltwaterhank.bandcamp.com/track/waaba-gwa-soo") } - track("Hot Evening", "Avalon Emerson") { - link("https://avalonemerson.bandcamp.com/track/hot-evening") - } track("City", "Drinking Boys and Girls Choir") { link("https://band-dbgc.bandcamp.com/track/city") } diff --git a/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt new file mode 100644 index 0000000..3d0d845 --- /dev/null +++ b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt @@ -0,0 +1,69 @@ +package com.github.wakingrufus.website.music + +val bestMusic2024 = bestMusicOf(2024) { + albumOfTheYear("The Past is Still Alive", "Hurray for the Riff Raff") { + link("https://hftrr.bandcamp.com/album/the-past-is-still-alive") + } + // albums + album("Below the Waste", "Goat Girl") { + link("https://goatgirl.bandcamp.com/album/below-the-waste") + } + album("Letter to Self", "SPRINTS") { + link("https://sprintsmusic.bandcamp.com/album/letter-to-self") + } + album("Absolute Elsewhere", "Blood Incantation") { + link("") + } + album("RATKING", "Brimheim") { + link("") + } + album("Sonido Cósmico", "Hermanos Gutiérrez") { + link("") + } + album("Funeral for Justice", "Mdou Moctar"){ + link("") + } + album("The Promised Land?", "Black Sites"){ + link("") + } + album("Championne (EP)", "Championne"){ + link("") + } + album("Mahal", "Glass Beams") + album("Ngélar", "LAIR"){ + link("") + } + album("Codes","Anja Huwe") + album( + "Synthesizing the Silk Roads: Uzbek Disco, Tajik Folktronica, Uyghur Rock & Tatar Jazz from 1980s Soviet Central Asia", + "Various Artists" + ) + + + // tracks + track("Gasoline", "I AM THE INTIMIDATOR"){ + link("") + } + track("No Hiding Place", "Jake Blount & Mali Obomsawin") { + link("") + } + track("The Devil in Me", "DIR EN GREY") { + link("") + } + track("Crooked Road", "Fantastic Negrito") { + link("") + } + track("Daydream Repeat","Four Tet"){ + link("") + } + track("Bul Bul Bul", "Kit Sebastian") + track("Seeds", "Melt-Banana") + track("황금빛 강 (Gold River)", "Parannoul") + track("No Se Siente Normal","Sol y Santi") + track("Sinner", "Elsy Wameyo") + track("A Love International","Khruangbin") + track("Wipeout","COALTAR OF THE DEEPERS") + +} + +val music2024 = bestMusic2024.toHtmlPage() From 5dfa7ba911f007abbdfd37b1300923fb7e978069 Mon Sep 17 00:00:00 2001 From: wakingrufus Date: Fri, 20 Dec 2024 14:02:19 -0600 Subject: [PATCH 2/3] more work on 2024 music list --- .../wakingrufus/website/music/Music2024.kt | 63 +++++++++++-------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt index 3d0d845..03700d8 100644 --- a/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt +++ b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt @@ -12,57 +12,70 @@ val bestMusic2024 = bestMusicOf(2024) { link("https://sprintsmusic.bandcamp.com/album/letter-to-self") } album("Absolute Elsewhere", "Blood Incantation") { - link("") + link("https://bloodincantation.bandcamp.com/album/absolute-elsewhere") } album("RATKING", "Brimheim") { - link("") + link("https://brimheim.bandcamp.com/album/ratking") + } + album("XII: A gyönyörű álmok ezután jönnek", "Thy Catafalque") { + link("https://thycatafalqueuk.bandcamp.com/album/xii-a-gy-ny-r-lmok-ezut-n-j-nnek") } album("Sonido Cósmico", "Hermanos Gutiérrez") { - link("") + link("https://hermanosgutierrez.bandcamp.com/album/sonido-c-smico") } - album("Funeral for Justice", "Mdou Moctar"){ - link("") + album("Funeral for Justice", "Mdou Moctar") { + link("https://mdoumoctar.bandcamp.com/album/funeral-for-justice") } - album("The Promised Land?", "Black Sites"){ - link("") + album("The Promised Land?", "Black Sites") { + link("https://blacksites.bandcamp.com/album/the-promised-land") } - album("Championne (EP)", "Championne"){ - link("") + album("Championne (EP)", "Championne") { + link("https://championne.bandcamp.com/album/championne") } - album("Mahal", "Glass Beams") - album("Ngélar", "LAIR"){ - link("") + album("Mahal", "Glass Beams") { + link("https://glassbeams.bandcamp.com/album/mahal") + } + album("Ngélar", "LAIR") { + link("https://lairggb.bandcamp.com/album/ng-lar") + } + album("Codes", "Anja Huwe") { + link("https://xmaldeutschland.bandcamp.com/album/codes") } - album("Codes","Anja Huwe") album( "Synthesizing the Silk Roads: Uzbek Disco, Tajik Folktronica, Uyghur Rock & Tatar Jazz from 1980s Soviet Central Asia", "Various Artists" - ) + ) { + link( + "https://ostinatorecords.bandcamp.com/album/synthesizing-the-silk-roads-uzbek-disco-tajik-folktronica-uyghur-rock-tatar-jazz-from-1980s-soviet-central-asia" + ) + } // tracks - track("Gasoline", "I AM THE INTIMIDATOR"){ - link("") + track("Gasoline", "I AM THE INTIMIDATOR") { + link("https://iamtheintimidator.bandcamp.com/track/gasoline") } track("No Hiding Place", "Jake Blount & Mali Obomsawin") { - link("") + link("https://jakeblountmusic.bandcamp.com/track/no-hiding-place") } track("The Devil in Me", "DIR EN GREY") { link("") } track("Crooked Road", "Fantastic Negrito") { - link("") + link("https://fantasticnegritomusic.bandcamp.com/track/crooked-road") } - track("Daydream Repeat","Four Tet"){ - link("") + track("Daydream Repeat", "Four Tet") { + link("https://fourtet.bandcamp.com/track/daydream-repeat-2") + } + track("Bul Bul Bul", "Kit Sebastian") { + link("https://kitsebastian.bandcamp.com/track/bul-bul-bul") } - track("Bul Bul Bul", "Kit Sebastian") track("Seeds", "Melt-Banana") - track("황금빛 강 (Gold River)", "Parannoul") - track("No Se Siente Normal","Sol y Santi") + track("황금빛 강 (Gold River)", "Parannoul") { link("https://parannoul.bandcamp.com/track/gold-river") } + track("No Se Siente Normal", "Sol y Santi") track("Sinner", "Elsy Wameyo") - track("A Love International","Khruangbin") - track("Wipeout","COALTAR OF THE DEEPERS") + track("A Love International", "Khruangbin") + track("Wipeout", "COALTAR OF THE DEEPERS") } From 6b0418e39493c7be967b626823456aa93902a7b2 Mon Sep 17 00:00:00 2001 From: wakingrufus Date: Sat, 21 Dec 2024 11:08:10 -0600 Subject: [PATCH 3/3] finish 2024 music list --- .../github/wakingrufus/website/MyWebsite.kt | 2 + .../wakingrufus/website/music/Music2024.kt | 43 ++++++++++++++----- .../website/music/MusicListHtml.kt | 13 +++++- 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/personal-site/src/main/kotlin/com/github/wakingrufus/website/MyWebsite.kt b/personal-site/src/main/kotlin/com/github/wakingrufus/website/MyWebsite.kt index ed53284..512de4a 100644 --- a/personal-site/src/main/kotlin/com/github/wakingrufus/website/MyWebsite.kt +++ b/personal-site/src/main/kotlin/com/github/wakingrufus/website/MyWebsite.kt @@ -23,6 +23,7 @@ import com.github.wakingrufus.website.music.music2020 import com.github.wakingrufus.website.music.music2021 import com.github.wakingrufus.website.music.music2022 import com.github.wakingrufus.website.music.music2023 +import com.github.wakingrufus.website.music.music2024 import com.github.wakingrufus.website.slideshows.functionalKotlinSlideshow import com.github.wakingrufus.website.slideshows.kotlin2019Slideshow import com.github.wakingrufus.website.slideshows.staticWebSlideshow @@ -116,6 +117,7 @@ class MyWebsite { page(music2021) page(music2022) page(music2023) + page(music2024) page(criterion2021) page(criterion2022) diff --git a/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt index 03700d8..2796954 100644 --- a/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt +++ b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/Music2024.kt @@ -3,22 +3,32 @@ package com.github.wakingrufus.website.music val bestMusic2024 = bestMusicOf(2024) { albumOfTheYear("The Past is Still Alive", "Hurray for the Riff Raff") { link("https://hftrr.bandcamp.com/album/the-past-is-still-alive") + review( + """Come for "Alibi", a catchy tune about supporting someone through their addiction, +while struggling with your own tendencies to become an enabler. +Stay for "Ogallala", which hit me hard with: + "I used to think I was born into the wrong generation. Now I know I was right on time to watch the world burn." +""" + ) } // albums - album("Below the Waste", "Goat Girl") { - link("https://goatgirl.bandcamp.com/album/below-the-waste") - } album("Letter to Self", "SPRINTS") { link("https://sprintsmusic.bandcamp.com/album/letter-to-self") + review("This we a close runner up for AOTY for me. I highly recommend this album from an Irish post-punk band") + } + album("Below the Waste", "Goat Girl") { + link("https://goatgirl.bandcamp.com/album/below-the-waste") } album("Absolute Elsewhere", "Blood Incantation") { link("https://bloodincantation.bandcamp.com/album/absolute-elsewhere") + tag("Metal") } album("RATKING", "Brimheim") { link("https://brimheim.bandcamp.com/album/ratking") } album("XII: A gyönyörű álmok ezután jönnek", "Thy Catafalque") { link("https://thycatafalqueuk.bandcamp.com/album/xii-a-gy-ny-r-lmok-ezut-n-j-nnek") + tag("Metal") } album("Sonido Cósmico", "Hermanos Gutiérrez") { link("https://hermanosgutierrez.bandcamp.com/album/sonido-c-smico") @@ -28,9 +38,12 @@ val bestMusic2024 = bestMusicOf(2024) { } album("The Promised Land?", "Black Sites") { link("https://blacksites.bandcamp.com/album/the-promised-land") + tag("Metal") + review("The Chicago metal scene is alive and kicking.") } album("Championne (EP)", "Championne") { link("https://championne.bandcamp.com/album/championne") + review("This is just an EP, but every song is fantastic. I can't wait to hear more from them.") } album("Mahal", "Glass Beams") { link("https://glassbeams.bandcamp.com/album/mahal") @@ -41,6 +54,9 @@ val bestMusic2024 = bestMusicOf(2024) { album("Codes", "Anja Huwe") { link("https://xmaldeutschland.bandcamp.com/album/codes") } + album("A La Sala", "Khruangbin") { + link("https://khruangbin.bandcamp.com/album/a-la-sala") + } album( "Synthesizing the Silk Roads: Uzbek Disco, Tajik Folktronica, Uyghur Rock & Tatar Jazz from 1980s Soviet Central Asia", "Various Artists" @@ -48,18 +64,21 @@ val bestMusic2024 = bestMusicOf(2024) { link( "https://ostinatorecords.bandcamp.com/album/synthesizing-the-silk-roads-uzbek-disco-tajik-folktronica-uyghur-rock-tatar-jazz-from-1980s-soviet-central-asia" ) + review("This is technically old music, but these songs have been collected and released worldwide for the first time. " + + "It is full of buried treasures from a time and place that is often overlooked.") } - // tracks track("Gasoline", "I AM THE INTIMIDATOR") { link("https://iamtheintimidator.bandcamp.com/track/gasoline") + tag("Metal") } track("No Hiding Place", "Jake Blount & Mali Obomsawin") { link("https://jakeblountmusic.bandcamp.com/track/no-hiding-place") } track("The Devil in Me", "DIR EN GREY") { - link("") + link("https://www.amazon.com/dp/B0D1G6VXT2") + tag("Metal") } track("Crooked Road", "Fantastic Negrito") { link("https://fantasticnegritomusic.bandcamp.com/track/crooked-road") @@ -70,13 +89,15 @@ val bestMusic2024 = bestMusicOf(2024) { track("Bul Bul Bul", "Kit Sebastian") { link("https://kitsebastian.bandcamp.com/track/bul-bul-bul") } - track("Seeds", "Melt-Banana") + track("Seeds", "Melt-Banana") { link("https://www.amazon.com/dp/B0D51QCLQJ") } track("황금빛 강 (Gold River)", "Parannoul") { link("https://parannoul.bandcamp.com/track/gold-river") } - track("No Se Siente Normal", "Sol y Santi") - track("Sinner", "Elsy Wameyo") - track("A Love International", "Khruangbin") - track("Wipeout", "COALTAR OF THE DEEPERS") - + track("No Se Siente Normal", "Sol y Santi") { link("https://casateca.bandcamp.com/track/no-se-siente-normal-2") } + track("Sinner", "Elsy Wameyo") { link("https://elsywameyo.bandcamp.com/track/sinner-2") } + track("Wipeout", "COALTAR OF THE DEEPERS") { + link("https://boris.bandcamp.com/track/wipeout") + tag("Metal") + } + track("Motherfather", "Machine Girl") { link("https://machinegirl.bandcamp.com/track/motherfather") } } val music2024 = bestMusic2024.toHtmlPage() diff --git a/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/MusicListHtml.kt b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/MusicListHtml.kt index 5b20775..47e6619 100644 --- a/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/MusicListHtml.kt +++ b/personal-site/src/main/kotlin/com/github/wakingrufus/website/music/MusicListHtml.kt @@ -4,7 +4,15 @@ import com.github.wakingrufus.website.lib.HtmlPage import com.github.wakingrufus.website.lib.article.article import com.github.wakingrufus.website.lib.htmlPage import com.github.wakingrufus.website.myFooter -import kotlinx.html.* +import kotlinx.html.a +import kotlinx.html.h1 +import kotlinx.html.h3 +import kotlinx.html.id +import kotlinx.html.li +import kotlinx.html.ol +import kotlinx.html.p +import kotlinx.html.span +import kotlinx.html.ul fun YearEndList.toHtmlPage(): HtmlPage { return yearEndPage(this) @@ -29,6 +37,9 @@ fun yearEndPage(yearEndList: YearEndList): HtmlPage { yearEndList.albums.forEach { album -> li { a(href = album.link) { +"${album.title} - ${album.artist}" } + album.review?.also { + span { +" - $it" } + } } } }