diff --git a/content/notes/2024-03-27/kqlxf/index.md b/content/notes/2024-03-27/kqlxf/index.md index f8ed8325..e523b27b 100644 --- a/content/notes/2024-03-27/kqlxf/index.md +++ b/content/notes/2024-03-27/kqlxf/index.md @@ -6,7 +6,7 @@ tags: --- I've started listening to an album a day; I've been reconnecting with my youth a bunch of late (getting older will do that), so today's is _Kelis: Kaleidoscope_. -{{< spotify path="/album/33viW1sFm3sCCmzs7FZ9MI" artist="Kelis" album="Kaleidoscope" url="https://songwhip.com/kelis/kaleidoscope1999" >}} +{{< music "e0de1616-0514-43b3-a2ce-9e7cf0fc1e64" >}} The emotion in _Caught Out There_ is so visceral for me, even now (it was a song that appeared in my childhood kitchen soon after what I now learn was my Mum finding out about my Dad's infidelity). diff --git a/content/notes/twitter/1100684287727357952/index.md b/content/notes/twitter/1100684287727357952/index.md index fe15bf77..971c7983 100644 --- a/content/notes/twitter/1100684287727357952/index.md +++ b/content/notes/twitter/1100684287727357952/index.md @@ -5,6 +5,6 @@ tags: - from-twitter - spotify --- -Walking to work in glorious summer sun, while still in winter, listening to this outrageously talented musician, chemist, and \(clearly) polymath is inspiring: +Walking to work in glorious summer sun, while still in winter, listening to this outrageously talented musician, chemist, and (clearly) polymath is inspiring: -{{< spotify path="/track/7Hi4r3EULEJfLrwli8iw5Q" artist="Isaac Stern" composer="Alexander Borodin" title="String Quartet No. 2 in D Major: III. Nocturne (arr. for violin and orchestra)" >}} +{{< music "bfbd2167-db3a-469a-a0a3-3fdeacbd4344" >}} diff --git a/content/notes/yzeto.md b/content/notes/yzeto.md index 4c1bd294..1bd78339 100644 --- a/content/notes/yzeto.md +++ b/content/notes/yzeto.md @@ -10,4 +10,4 @@ tags: --- This is my jam! -{{< spotify path="/track/5cGZN0P1QnSfhCFBCHtp2N" title="Peach" artist="salute" url="https://songwhip.com/salute2/peach" >}} +{{< music "31387690-27f2-4966-95e3-eaf83192378e" >}} diff --git a/content/photos/2024-10-21/henge/index.md b/content/photos/2024-10-21/henge/index.md index 1773df12..33b2d411 100644 --- a/content/photos/2024-10-21/henge/index.md +++ b/content/photos/2024-10-21/henge/index.md @@ -14,4 +14,4 @@ We went to see [HENGE](https://hengemusic.com/) in Oxford at the weekend and **w If there's _even a chance_ that prog-rock is something you'd enjoy then the sheer energy these fine ~~people~~ aliens bring to the stage will get you grinning from ear to ear. -{{< spotify path="/track/62sJsTpsZ81vLnJQ0xuqWY" title="Get A Wriggle On" artist="HENGE" >}} +{{< music "013efa85-b7f5-4f95-809b-ff47c53726a9" >}} diff --git a/data/music/musicbrainz/013efa85-b7f5-4f95-809b-ff47c53726a9.json b/data/music/musicbrainz/013efa85-b7f5-4f95-809b-ff47c53726a9.json new file mode 100644 index 00000000..898d3efd --- /dev/null +++ b/data/music/musicbrainz/013efa85-b7f5-4f95-809b-ff47c53726a9.json @@ -0,0 +1,8 @@ +{ + "title": "Get A Wiggle On", + "artist": "HENGE", + "musicbrainz": "https://musicbrainz.org/recording/013efa85-b7f5-4f95-809b-ff47c53726a9", + "spotify": "https://open.spotify.com/track/62sJsTpsZ81vLnJQ0xuqWY", + "applemusic": "https://music.apple.com/gbus/song/1668860445", + "youtubemusic": "https://music.youtube.com/watch?v=1BQviCBPMSk" +} diff --git a/data/music/musicbrainz/31387690-27f2-4966-95e3-eaf83192378e.json b/data/music/musicbrainz/31387690-27f2-4966-95e3-eaf83192378e.json new file mode 100644 index 00000000..a920e263 --- /dev/null +++ b/data/music/musicbrainz/31387690-27f2-4966-95e3-eaf83192378e.json @@ -0,0 +1,8 @@ +{ + "title": "Peach", + "artist": "salute", + "musicbrainz": "https://musicbrainz.org/recording/31387690-27f2-4966-95e3-eaf83192378e", + "spotify": "https://open.spotify.com/track/5cGZN0P1QnSfhCFBCHtp2N", + "applemusic": "https://music.apple.com/gb/album/peach/1676610854?i=1676611187", + "youtubemusic": "https://music.youtube.com/watch?v=4SOeAzErjxM" +} diff --git a/data/music/musicbrainz/bfbd2167-db3a-469a-a0a3-3fdeacbd4344.json b/data/music/musicbrainz/bfbd2167-db3a-469a-a0a3-3fdeacbd4344.json new file mode 100644 index 00000000..a079f47d --- /dev/null +++ b/data/music/musicbrainz/bfbd2167-db3a-469a-a0a3-3fdeacbd4344.json @@ -0,0 +1,9 @@ +{ + "title": "String Quartet No. 2 in D Major: III. Nocturne. Andante", + "artist": "Borodin Quartet", + "composer": "Alexander Borodin", + "musicbrainz": "https://musicbrainz.org/recording/bfbd2167-db3a-469a-a0a3-3fdeacbd4344", + "spotify": "https://open.spotify.com/track/7Hi4r3EULEJfLrwli8iw5Q", + "applemusic": "https://music.apple.com/gb/album/string-quartet-no-2-in-d-major-iii-nocturne-andante/1452699105?i=1452699113", + "youtubemusic": "https://music.youtube.com/watch?v=T1aZdvRWEcc&si=HVI4SivmbVCa9Jev" +} diff --git a/data/music/musicbrainz/e0de1616-0514-43b3-a2ce-9e7cf0fc1e64.json b/data/music/musicbrainz/e0de1616-0514-43b3-a2ce-9e7cf0fc1e64.json new file mode 100644 index 00000000..e859f0c1 --- /dev/null +++ b/data/music/musicbrainz/e0de1616-0514-43b3-a2ce-9e7cf0fc1e64.json @@ -0,0 +1,8 @@ +{ + "album": "Kaleidoscope", + "artist": "Kelis", + "musicbrainz": "https://musicbrainz.org/release/e0de1616-0514-43b3-a2ce-9e7cf0fc1e64", + "spotify": "https://open.spotify.com/album/33viW1sFm3sCCmzs7FZ9MI", + "applemusic": "https://music.apple.com/gb/album/kaleidoscope-expanded-edition/1712490712", + "youtubemusic": "https://music.youtube.com/playlist?list=OLAK5uy_kkW-cvsQIeox0qb4BREdvllFVaIZy9A30" +} diff --git a/layouts/shortcodes/music.html b/layouts/shortcodes/music.html new file mode 100644 index 00000000..be5a1376 --- /dev/null +++ b/layouts/shortcodes/music.html @@ -0,0 +1,18 @@ +{{- $data := (index site.Data.music.musicbrainz (.Get 0)) -}} +{{- with $data -}} + {{- $displayArtist := .composer | default .artist -}} + {{- $displayTitle := .title | default .album -}} + {{- $musicbrainz := .musicbrainz -}} + {{- with .spotify -}} + {{- $u := urls.Parse . -}} +
+ +
+ 🎶 {{ $displayArtist }}{{ with $displayTitle }}{{ if $displayArtist }}: {{ end }}{{ . }}{{ end }}
+ {{ with $musicbrainz }}Listen elsewhere{{ end }} +
+
+ {{- end -}} +{{- else -}} + {{ errorf "Missing musicbrainz data for %s" (.Get 0) }} +{{- end -}} diff --git a/todo.md b/todo.md index c2ad6001..71ea4026 100644 --- a/todo.md +++ b/todo.md @@ -10,7 +10,6 @@ Things I might work on within my personal blog's software. - [ ] When posted via Echofeed: They include the "in reply to" initial stuff; this is too cumbersome - [ ] When posted via Echofeed: They should probably be "Quiet public", or ideally posted as replies to a fedi post, if there's one referenced in the source as a syncidcation - [x] They get posted on the homepage, when they shouldn't -- [ ] Songwhip is dead 😭 replace with something else ### Ideas @@ -29,6 +28,8 @@ Things I might work on within my personal blog's software. - [ ] Remove lychee failing links - [ ] Import Facebook posts +- [ ] Songwhip is dead 😭 replace with something else + - Musicbrainz will be good eg. [using release IDs](https://musicbrainz.org/ws/2/recording/013efa85-b7f5-4f95-809b-ff47c53726a9?inc=artist-credits%20url-rels&fmt=json) — but doesn't appear to have composer info (eg. [here](https://musicbrainz.org/ws/2/recording/bfbd2167-db3a-469a-a0a3-3fdeacbd4344?inc=artist-credits%20url-rels&fmt=json)) ### Done ✓