diff --git a/.github/workflows/fetch-artist-charts.yaml b/.github/workflows/fetch-artist-charts.yaml
index 3164bd1f..1f1a20ce 100644
--- a/.github/workflows/fetch-artist-charts.yaml
+++ b/.github/workflows/fetch-artist-charts.yaml
@@ -13,11 +13,15 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- - name: Fetch current artist charts
- run: |-
- data=$(curl 'https://ws.audioscrobbler.com/2.0/?method=user.getweeklyartistchart&user=coryd_&api_key=${{ secrets.LASTFM_API_KEY }}&format=json') \
- charts=$(src/_data/json/weekly-artist-charts.json | jq --argjson jq_data "${data}" '.charts += [$jq_data]') \
- echo $charts > src/_data/json/weekly-artist-charts.json
+ - name: Fetch charts
+ run: |
+ echo "CHART_DATA=$(curl 'https://ws.audioscrobbler.com/2.0/?method=user.getweeklyartistchart&user=coryd_&api_key=${{ secrets.LASTFM_API_KEY }}&format=json')" >> "$GITHUB_ENV"
+ - name: Update charts
+ run: |
+ echo "CHARTS=$(cat src/_data/json/weekly-artist-charts.json | jq -c --argjson jq_data "$CHART_DATA" '.charts += [$jq_data]')" >> "$GITHUB_ENV"
+ - name: Write charts
+ run: |
+ echo $CHARTS > src/_data/json/weekly-artist-charts.json
- name: Commit
uses: stefanzweifel/git-auto-commit-action@v5
with:
diff --git a/src/_data/json/weekly-artist-charts.json b/src/_data/json/weekly-artist-charts.json
index 18e27bd9..3d0eab43 100644
--- a/src/_data/json/weekly-artist-charts.json
+++ b/src/_data/json/weekly-artist-charts.json
@@ -1,3 +1 @@
-{
- "charts": []
-}
+{"charts":[{"weeklyartistchart":{"artist":[{"mbid":"c3aeb863-7b26-4388-94e8-5a240f2be21b","url":"https://www.last.fm/music/Tom+Waits","name":"Tom Waits","@attr":{"rank":"1"},"playcount":"34"},{"mbid":"0743b15a-3c32-48c8-ad58-cb325350befa","url":"https://www.last.fm/music/blink-182","name":"blink-182","@attr":{"rank":"2"},"playcount":"19"},{"mbid":"aba64937-3334-4c65-90a1-4e6b9d4d7ada","url":"https://www.last.fm/music/Aesop+Rock","name":"Aesop Rock","@attr":{"rank":"3"},"playcount":"18"},{"mbid":"565ac6c2-e47d-4b5f-99f1-24afdf97903a","url":"https://www.last.fm/music/Sedimentum","name":"Sedimentum","@attr":{"rank":"4"},"playcount":"18"},{"mbid":"583352d8-936c-44fd-a74c-f43154c7aad8","url":"https://www.last.fm/music/Vertebra+Atlantis","name":"Vertebra Atlantis","@attr":{"rank":"5"},"playcount":"14"},{"mbid":"68d258b4-d6cd-4a05-9cc0-98c2e1f1993a","url":"https://www.last.fm/music/Chaotian","name":"Chaotian","@attr":{"rank":"6"},"playcount":"13"},{"mbid":"2de34daa-7256-495f-84c2-9f7459748492","url":"https://www.last.fm/music/Hooded+Menace","name":"Hooded Menace","@attr":{"rank":"7"},"playcount":"12"},{"mbid":"12a9e259-f7cb-4fca-87b1-a6c5fd38c300","url":"https://www.last.fm/music/Hot+Mulligan","name":"Hot Mulligan","@attr":{"rank":"8"},"playcount":"12"},{"mbid":"5c9dd772-a38f-4873-baa8-4b5d9dff3990","url":"https://www.last.fm/music/Spanish+Love+Songs","name":"Spanish Love Songs","@attr":{"rank":"9"},"playcount":"12"},{"mbid":"664c3e0e-42d8-48c1-b209-1efca19c0325","url":"https://www.last.fm/music/The+National","name":"The National","@attr":{"rank":"10"},"playcount":"12"},{"mbid":"7fcd488b-f3fc-40c8-a82c-c18317d72aae","url":"https://www.last.fm/music/Gutvoid","name":"Gutvoid","@attr":{"rank":"11"},"playcount":"11"},{"mbid":"a521f1a8-a949-4dcf-ab33-94596cb02787","url":"https://www.last.fm/music/Militarie+Gun","name":"Militarie Gun","@attr":{"rank":"12"},"playcount":"11"},{"mbid":"3ac482b8-1494-4071-a0e9-f192f9d2c2b0","url":"https://www.last.fm/music/Built+to+Spill","name":"Built to Spill","@attr":{"rank":"13"},"playcount":"10"},{"mbid":"6e7aea5b-de9f-4118-ae32-ddea8198864a","url":"https://www.last.fm/music/Dogleg","name":"Dogleg","@attr":{"rank":"14"},"playcount":"10"},{"mbid":"20244d07-534f-4eff-b4d4-930878889970","url":"https://www.last.fm/music/Taylor+Swift","name":"Taylor Swift","@attr":{"rank":"15"},"playcount":"9"},{"mbid":"561d854a-6a28-4aa7-8c99-323e6ce46c2a","url":"https://www.last.fm/music/Miles+Davis","name":"Miles Davis","@attr":{"rank":"16"},"playcount":"8"},{"mbid":"c16dcdae-a651-42c1-aff8-edda0f463157","url":"https://www.last.fm/music/Soft+Kill","name":"Soft Kill","@attr":{"rank":"17"},"playcount":"8"},{"mbid":"552cd2a3-ac51-464d-8222-dcdbb08a8d2d","url":"https://www.last.fm/music/Tomb+Mold","name":"Tomb Mold","@attr":{"rank":"18"},"playcount":"8"},{"mbid":"4c291959-23e9-429d-ab8d-bc8b0a8ef5e9","url":"https://www.last.fm/music/Ghastly","name":"Ghastly","@attr":{"rank":"19"},"playcount":"7"},{"mbid":"","url":"https://www.last.fm/music/Inanna","name":"Inanna","@attr":{"rank":"20"},"playcount":"7"},{"mbid":"","url":"https://www.last.fm/music/AFI","name":"AFI","@attr":{"rank":"21"},"playcount":"6"},{"mbid":"","url":"https://www.last.fm/music/home+is+where","name":"home is where","@attr":{"rank":"22"},"playcount":"6"},{"mbid":"03f9e6f0-7c7f-4fd6-a47f-f0b0425f314b","url":"https://www.last.fm/music/Mis%C3%BEyrming","name":"Misþyrming","@attr":{"rank":"23"},"playcount":"6"},{"mbid":"4ef06a0d-b8d1-42b4-aff8-06f223306cdb","url":"https://www.last.fm/music/Cloud+Rat","name":"Cloud Rat","@attr":{"rank":"24"},"playcount":"5"},{"mbid":"67d1433c-6354-4fb4-bb57-bd21c4904eed","url":"https://www.last.fm/music/Desecresy","name":"Desecresy","@attr":{"rank":"25"},"playcount":"4"},{"mbid":"4236acde-2ce2-441c-a3d4-38d55f1b5474","url":"https://www.last.fm/music/Explosions+in+the+Sky","name":"Explosions in the Sky","@attr":{"rank":"26"},"playcount":"4"},{"mbid":"61ed9c9c-79eb-4e8f-8015-bd599ac0ab49","url":"https://www.last.fm/music/Katatonia","name":"Katatonia","@attr":{"rank":"27"},"playcount":"4"},{"mbid":"f6e61750-a6b7-4d88-979b-052345cd0e4a","url":"https://www.last.fm/music/Sturgill+Simpson","name":"Sturgill Simpson","@attr":{"rank":"28"},"playcount":"4"},{"mbid":"69421e11-e4c3-4854-951b-ceab4972e38e","url":"https://www.last.fm/music/Alkaline+Trio","name":"Alkaline Trio","@attr":{"rank":"29"},"playcount":"3"},{"mbid":"f66d378e-d9f0-4c5d-a4b9-0ee1b9fb2e09","url":"https://www.last.fm/music/Anxious","name":"Anxious","@attr":{"rank":"30"},"playcount":"2"},{"mbid":"","url":"https://www.last.fm/music/Basement","name":"Basement","@attr":{"rank":"31"},"playcount":"2"},{"mbid":"","url":"https://www.last.fm/music/Nothing","name":"Nothing","@attr":{"rank":"32"},"playcount":"2"},{"mbid":"7e13cd1c-0300-4d03-bd8e-5f86dd99d74f","url":"https://www.last.fm/music/At+the+Drive-In","name":"At the Drive-In","@attr":{"rank":"33"},"playcount":"1"},{"mbid":"a5eb1b55-1a67-4b2e-bf1b-ae575cf4a5c8","url":"https://www.last.fm/music/Lykathea+Aflame","name":"Lykathea Aflame","@attr":{"rank":"34"},"playcount":"1"}],"@attr":{"from":"1699358400","user":"coryd_","to":"1699963200"}}}]}
diff --git a/src/_data/json/weekly-artist-charts.json.bak b/src/_data/json/weekly-artist-charts.json.bak
deleted file mode 100644
index 2ef804f3..00000000
--- a/src/_data/json/weekly-artist-charts.json.bak
+++ /dev/null
@@ -1 +0,0 @@
-{"weeklyartistchart":{"artist":[{"mbid":"0743b15a-3c32-48c8-ad58-cb325350befa","url":"https:\/\/www.last.fm\/music\/blink-182","name":"blink-182","@attr":{"rank":"1"},"playcount":"19"},{"mbid":"aba64937-3334-4c65-90a1-4e6b9d4d7ada","url":"https:\/\/www.last.fm\/music\/Aesop+Rock","name":"Aesop Rock","@attr":{"rank":"2"},"playcount":"18"},{"mbid":"12a9e259-f7cb-4fca-87b1-a6c5fd38c300","url":"https:\/\/www.last.fm\/music\/Hot+Mulligan","name":"Hot Mulligan","@attr":{"rank":"3"},"playcount":"12"},{"mbid":"5c9dd772-a38f-4873-baa8-4b5d9dff3990","url":"https:\/\/www.last.fm\/music\/Spanish+Love+Songs","name":"Spanish Love Songs","@attr":{"rank":"4"},"playcount":"12"},{"mbid":"664c3e0e-42d8-48c1-b209-1efca19c0325","url":"https:\/\/www.last.fm\/music\/The+National","name":"The National","@attr":{"rank":"5"},"playcount":"12"},{"mbid":"a521f1a8-a949-4dcf-ab33-94596cb02787","url":"https:\/\/www.last.fm\/music\/Militarie+Gun","name":"Militarie Gun","@attr":{"rank":"6"},"playcount":"11"},{"mbid":"3ac482b8-1494-4071-a0e9-f192f9d2c2b0","url":"https:\/\/www.last.fm\/music\/Built+to+Spill","name":"Built to Spill","@attr":{"rank":"7"},"playcount":"10"},{"mbid":"6e7aea5b-de9f-4118-ae32-ddea8198864a","url":"https:\/\/www.last.fm\/music\/Dogleg","name":"Dogleg","@attr":{"rank":"8"},"playcount":"10"},{"mbid":"20244d07-534f-4eff-b4d4-930878889970","url":"https:\/\/www.last.fm\/music\/Taylor+Swift","name":"Taylor Swift","@attr":{"rank":"9"},"playcount":"9"},{"mbid":"c16dcdae-a651-42c1-aff8-edda0f463157","url":"https:\/\/www.last.fm\/music\/Soft+Kill","name":"Soft Kill","@attr":{"rank":"10"},"playcount":"8"},{"mbid":"552cd2a3-ac51-464d-8222-dcdbb08a8d2d","url":"https:\/\/www.last.fm\/music\/Tomb+Mold","name":"Tomb Mold","@attr":{"rank":"11"},"playcount":"8"},{"mbid":"","url":"https:\/\/www.last.fm\/music\/Inanna","name":"Inanna","@attr":{"rank":"12"},"playcount":"7"},{"mbid":"","url":"https:\/\/www.last.fm\/music\/AFI","name":"AFI","@attr":{"rank":"13"},"playcount":"6"},{"mbid":"","url":"https:\/\/www.last.fm\/music\/home+is+where","name":"home is where","@attr":{"rank":"14"},"playcount":"6"},{"mbid":"03f9e6f0-7c7f-4fd6-a47f-f0b0425f314b","url":"https:\/\/www.last.fm\/music\/Mis%C3%BEyrming","name":"Misþyrming","@attr":{"rank":"15"},"playcount":"6"},{"mbid":"4ef06a0d-b8d1-42b4-aff8-06f223306cdb","url":"https:\/\/www.last.fm\/music\/Cloud+Rat","name":"Cloud Rat","@attr":{"rank":"16"},"playcount":"5"},{"mbid":"67d1433c-6354-4fb4-bb57-bd21c4904eed","url":"https:\/\/www.last.fm\/music\/Desecresy","name":"Desecresy","@attr":{"rank":"17"},"playcount":"4"},{"mbid":"4236acde-2ce2-441c-a3d4-38d55f1b5474","url":"https:\/\/www.last.fm\/music\/Explosions+in+the+Sky","name":"Explosions in the Sky","@attr":{"rank":"18"},"playcount":"4"},{"mbid":"f6e61750-a6b7-4d88-979b-052345cd0e4a","url":"https:\/\/www.last.fm\/music\/Sturgill+Simpson","name":"Sturgill Simpson","@attr":{"rank":"19"},"playcount":"4"},{"mbid":"69421e11-e4c3-4854-951b-ceab4972e38e","url":"https:\/\/www.last.fm\/music\/Alkaline+Trio","name":"Alkaline Trio","@attr":{"rank":"20"},"playcount":"3"},{"mbid":"f66d378e-d9f0-4c5d-a4b9-0ee1b9fb2e09","url":"https:\/\/www.last.fm\/music\/Anxious","name":"Anxious","@attr":{"rank":"21"},"playcount":"2"},{"mbid":"7e13cd1c-0300-4d03-bd8e-5f86dd99d74f","url":"https:\/\/www.last.fm\/music\/At+the+Drive-In","name":"At the Drive-In","@attr":{"rank":"22"},"playcount":"1"}],"@attr":{"from":"1699272000","user":"coryd_","to":"1699876800"}}}
\ No newline at end of file
diff --git a/src/_data/weeklyArtistChart.js b/src/_data/weeklyArtistChart.js
index 897b9a24..22d8a0fa 100644
--- a/src/_data/weeklyArtistChart.js
+++ b/src/_data/weeklyArtistChart.js
@@ -1,22 +1,23 @@
-// const chartData = require('./json/weekly-artist-charts.json')
-//
-// module.exports = async function () {
-// const artists = chartData['weeklyartistchart']['artist'].splice(0, 8)
-// const date = parseInt(chartData['weeklyartistchart']['@attr']['to']) * 1000
-// let content = 'My top artists for the week: '
-// artists.forEach((artist, index) => {
-// content += `${artist['name']} @ ${artist['playcount']} play${
-// parseInt(artist['playcount']) > 1 ? 's' : ''
-// }`
-// if (index !== artists.length - 1) content += ', '
-// })
-// content += ' #Music #LastFM'
-// return [
-// {
-// title: content,
-// url: `https://coryd.dev/now?ts=${date}`,
-// date: new Date(date),
-// description: 'My top artists for the week as a feed item.
',
-// },
-// ]
-// }
+const chartData = require('./json/weekly-artist-charts.json')
+const charts = chartData['charts']
+
+module.exports = async function () {
+ return charts.map((chart) => {
+ const artists = chart['weeklyartistchart']['artist'].splice(0, 8)
+ const date = parseInt(chart['weeklyartistchart']['@attr']['to']) * 1000
+ let content = 'My top artists for the week: '
+ artists.forEach((artist, index) => {
+ content += `${artist['name']} @ ${artist['playcount']} play${
+ parseInt(artist['playcount']) > 1 ? 's' : ''
+ }`
+ if (index !== artists.length - 1) content += ', '
+ })
+ content += ' #Music #LastFM'
+ return {
+ title: content,
+ url: `https://coryd.dev/now?ts=${date}`,
+ date: new Date(date),
+ description: 'My top artists for the week as a feed item.
',
+ }
+ })
+}