From 9070daffcdfb2a332cc0b0e9ac8480992e05ab4a Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sat, 30 Mar 2024 22:07:52 -0700 Subject: [PATCH] chore: cleanup --- package.json | 2 +- src/_data/albums.js | 30 ------------ src/_data/artists.js | 34 -------------- src/_data/tracks.js | 72 ----------------------------- src/pages/uses.md | 2 +- src/posts/2023/default-apps-2023.md | 2 +- 6 files changed, 3 insertions(+), 139 deletions(-) delete mode 100644 src/_data/albums.js delete mode 100644 src/_data/artists.js delete mode 100644 src/_data/tracks.js diff --git a/package.json b/package.json index bb9a4a14..44f8e2b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "9.0.0", + "version": "9.1.0", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_data/albums.js b/src/_data/albums.js deleted file mode 100644 index da630611..00000000 --- a/src/_data/albums.js +++ /dev/null @@ -1,30 +0,0 @@ -import EleventyFetch from '@11ty/eleventy-fetch' -import { artistCapitalization, sanitizeMediaString } from './helpers/music.js' - -export default async function () { - const MUSIC_KEY = process.env.API_KEY_LASTFM - const url = `https://ws.audioscrobbler.com/2.0/?method=user.gettopalbums&user=coryd_&api_key=${MUSIC_KEY}&limit=8&format=json&period=7day` - const formatAlbumData = (albums) => albums.map((album) => { - return { - title: album['name'], - artist: artistCapitalization(album['artist']['name']), - plays: album['playcount'], - rank: album['@attr']['rank'], - image: `https://cdn.coryd.dev/albums/${sanitizeMediaString(album['artist']['name']).replace(/\s+/g, '-').toLowerCase()}-${sanitizeMediaString(album['name'].replace(/[:\/\\,'']+/g - , '').replace(/\s+/g, '-').toLowerCase())}.jpg`, - url: album['mbid'] - ? `https://musicbrainz.org/album/${album['mbid']}` - : `https://musicbrainz.org/taglookup/index?tag-lookup.artist=${album['artist'][ - 'name' - ].replace(/\s+/g, '+')}&tag-lookup.release=${album['name'].replace(/\s+/g, '+')}`, - type: 'album', - } - }) - - const res = EleventyFetch(url, { - duration: '1h', - type: 'json', - }).catch() - const data = await res - return formatAlbumData(data['topalbums']['album']) -} diff --git a/src/_data/artists.js b/src/_data/artists.js deleted file mode 100644 index a0f7a605..00000000 --- a/src/_data/artists.js +++ /dev/null @@ -1,34 +0,0 @@ -import EleventyFetch from '@11ty/eleventy-fetch'; -import { artistCapitalization, sanitizeMediaString, mbidMap } from './helpers/music.js' - -export default async function () { - const MUSIC_KEY = process.env.API_KEY_LASTFM; - const url = `https://ws.audioscrobbler.com/2.0/?method=user.gettopartists&user=coryd_&api_key=${MUSIC_KEY}&limit=8&format=json&period=7day`; - const formatArtistData = (artists) => artists.map((artist) => { - let mbid = artist['mbid'] - - // mbid mismatches - if (mbidMap(artist['name']) !== '') mbid = mbidMap(artist['name']); - - return { - title: artistCapitalization(artist['name']), - plays: artist['playcount'], - rank: artist['@attr']['rank'], - image: `https://cdn.coryd.dev/artists/${sanitizeMediaString(artist['name']).replace(/\s+/g, '-').toLowerCase()}.jpg`, - url: mbid - ? `https://musicbrainz.org/artist/${mbid}` - : `https://musicbrainz.org/search?query=${artist['name'].replace( - /\s+/g, - '+' - )}&type=artist`, - type: 'artist', - }; - }); - - const res = EleventyFetch(url, { - duration: '1h', - type: 'json', - }).catch(); - const data = await res; - return formatArtistData(data['topartists']['artist']) -} diff --git a/src/_data/tracks.js b/src/_data/tracks.js deleted file mode 100644 index 41202827..00000000 --- a/src/_data/tracks.js +++ /dev/null @@ -1,72 +0,0 @@ -import EleventyFetch from '@11ty/eleventy-fetch' -import mbidPatches from './json/mbid-patches.js' - -const mbidMap = (artist) => { - return mbidPatches[artist.toLowerCase()] || '' -} - -export default async function () { - const MUSIC_KEY = process.env.API_KEY_LASTFM - const LISTENBRAINZ_TOKEN = process.env.LISTENBRAINZ_TOKEN - const url = `https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=coryd_&api_key=${MUSIC_KEY}&format=json&limit=200` - if (process.env.ELEVENTY_PRODUCTION) { - const res = EleventyFetch(url, { - duration: '1h', - type: 'json', - }).catch() - const data = await res - let submissions = [] - data['recenttracks']['track'].forEach((track) => { - let artistMbid = track['artist']['mbid']['mbid'] - - // mbid mismatches - if (mbidMap(track['artist']['#text']) !== '') artistMbid = mbidMap(track['artist']['#text']) - - if (track['date']) - submissions.push({ - track_metadata: { - track_name: track['name'], - artist_name: track['artist']['#text'], - release_name: track['album']['#text'], - additional_info: { - submission_client: 'coryd.dev last.fm importer', - lastfm_track_mbid: track['mbid'], - lastfm_release_mbid: track['album']['mbid'], - lastfm_artist_mbid: artistMbid, - }, - }, - listened_at: track['date']['uts'], - }) - }) - - await fetch('https://api.listenbrainz.org/1/submit-listens', { - method: 'POST', - headers: { - Accept: 'application/json', - Authorization: `Token ${LISTENBRAINZ_TOKEN}`, - }, - body: JSON.stringify({ - listen_type: 'import', - payload: submissions, - }), - }) - - await fetch('https://api.listenbrainz.org/1/latest-import', { - method: 'POST', - headers: { - Accept: 'application/json', - Authorization: `Token ${LISTENBRAINZ_TOKEN}`, - }, - body: JSON.stringify({ - service: 'lastfm', - ts: submissions[0]['listened_at'], - }), - }) - - return { - listenbrainz_submissions: submissions, - } - } else { - return {} - } -} diff --git a/src/pages/uses.md b/src/pages/uses.md index dfa1c4cf..cf195279 100644 --- a/src/pages/uses.md +++ b/src/pages/uses.md @@ -27,7 +27,7 @@ Software and services that I use for work and my own enjoyment.

macOS + iOS

- [Bear](https://bear.app): native, fast and flexible — it's a breeze to use across Apple's ecosystem. -- [Doppler](https://brushedtype.com/doppler): a beautiful, simple native music player that supports scrobbling to Last.fm. +- [Plexamp](https://www.plex.tv/plexamp/): Plex's flexible and, while not native, still delightful music player. - [Ivory](https://tapbots.com/ivory/): the best, most polished Mastodon client for macOS and iOS. - [Parcel](https://parcelapp.net): the most flexible and reliable package tracker for Apple's ecosystem. - [Flighty](https://flightyapp.com): I don't travel a ton but Flighty makes doing so a fair bit less stressful. diff --git a/src/posts/2023/default-apps-2023.md b/src/posts/2023/default-apps-2023.md index 6c36172a..d101d702 100644 --- a/src/posts/2023/default-apps-2023.md +++ b/src/posts/2023/default-apps-2023.md @@ -18,7 +18,7 @@ In the spirit of following a trend, here are my default apps as of now (the end - Calendar: [HEY](https://hey.com) - Weather: Weather.app - Podcasts: N/A -- Music: [Doppler](https://brushedtype.com/doppler) + [Last.fm](https://last.fm) +- Music: [Plexamp](https://www.plex.tv/plexamp/) + [Last.fm](https://last.fm) + [ListenBrainz](https://listenbrainz.org) - Passwords: [1Password.com](https://1password.com) - Budgeting: [YNAB](https://ynab.com) - Mastodon: [Ivory](https://tapbots.com/ivory/)