From acfeb6135f028c139724520cd93e96f952d8e2e3 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sun, 28 Apr 2024 17:14:51 -0700 Subject: [PATCH 1/6] fix: conditional access --- plugins/fetch-scrobbles/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/fetch-scrobbles/index.js b/plugins/fetch-scrobbles/index.js index 83468372..5d5ecc1f 100644 --- a/plugins/fetch-scrobbles/index.js +++ b/plugins/fetch-scrobbles/index.js @@ -53,12 +53,12 @@ export const onPreBuild = async ({ constants }) => { for (const key of monthKeys) { const scrobbleData = await scrobbles.get(key, { type: 'json'}) - monthChartData['data'].push(...scrobbleData['data']) + monthChartData?.['data'].push(...scrobbleData?.['data']) } for (const key of threeMonthKeys) { const scrobbleData = await scrobbles.get(key, { type: 'json'}) - threeMonthChartData['data'].push(...scrobbleData['data']) + threeMonthChartData?.['data'].push(...scrobbleData?.['data']) } for (const key of yearKeys) { From fb9d16d6a9bc02884d5d481ea835a1719d9ad481 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sun, 28 Apr 2024 17:17:45 -0700 Subject: [PATCH 2/6] fix: conditional accesz --- plugins/fetch-scrobbles/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/fetch-scrobbles/index.js b/plugins/fetch-scrobbles/index.js index 5d5ecc1f..11189263 100644 --- a/plugins/fetch-scrobbles/index.js +++ b/plugins/fetch-scrobbles/index.js @@ -53,12 +53,12 @@ export const onPreBuild = async ({ constants }) => { for (const key of monthKeys) { const scrobbleData = await scrobbles.get(key, { type: 'json'}) - monthChartData?.['data'].push(...scrobbleData?.['data']) + monthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of threeMonthKeys) { const scrobbleData = await scrobbles.get(key, { type: 'json'}) - threeMonthChartData?.['data'].push(...scrobbleData?.['data']) + threeMonthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of yearKeys) { @@ -69,7 +69,7 @@ export const onPreBuild = async ({ constants }) => { console.log("Error: can't get more scrobbles.") break; } - yearChartData['data'].push(...scrobbleData['data']) + yearChartData?.['data']?.push(...scrobbleData?.['data']) } fs.writeFileSync('./src/_data/json/weekly-top-artists-chart.json', JSON.stringify({...weeklyChartData, timestamp: `${lastWeek.set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).toMillis()}` })) From f1ffcfbff881c69182ff75df191f36938dd78803 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sun, 28 Apr 2024 17:21:26 -0700 Subject: [PATCH 3/6] fix: defaults --- plugins/fetch-scrobbles/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/fetch-scrobbles/index.js b/plugins/fetch-scrobbles/index.js index 11189263..600f89c7 100644 --- a/plugins/fetch-scrobbles/index.js +++ b/plugins/fetch-scrobbles/index.js @@ -52,17 +52,17 @@ export const onPreBuild = async ({ constants }) => { const nowPlaying = await scrobbles.get('now-playing', { type: 'json'}) for (const key of monthKeys) { - const scrobbleData = await scrobbles.get(key, { type: 'json'}) + const scrobbleData = await scrobbles.get(key, { type: 'json'}) || [] monthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of threeMonthKeys) { - const scrobbleData = await scrobbles.get(key, { type: 'json'}) + const scrobbleData = await scrobbles.get(key, { type: 'json'}) || [] threeMonthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of yearKeys) { - let scrobbleData; + let scrobbleData try { scrobbleData = await scrobbles?.get(key, { type: 'json'}) } catch (error) { From 538f529961154d63f3b41149a26a434ecc6a5d8c Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sun, 28 Apr 2024 17:25:07 -0700 Subject: [PATCH 4/6] fix: checks --- plugins/fetch-scrobbles/index.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/plugins/fetch-scrobbles/index.js b/plugins/fetch-scrobbles/index.js index 600f89c7..044bad24 100644 --- a/plugins/fetch-scrobbles/index.js +++ b/plugins/fetch-scrobbles/index.js @@ -52,24 +52,18 @@ export const onPreBuild = async ({ constants }) => { const nowPlaying = await scrobbles.get('now-playing', { type: 'json'}) for (const key of monthKeys) { - const scrobbleData = await scrobbles.get(key, { type: 'json'}) || [] - monthChartData?.['data']?.push(...scrobbleData?.['data']) + const scrobbleData = await scrobbles.get(key, { type: 'json'}) + if (scrobbleData) monthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of threeMonthKeys) { - const scrobbleData = await scrobbles.get(key, { type: 'json'}) || [] - threeMonthChartData?.['data']?.push(...scrobbleData?.['data']) + const scrobbleData = await scrobbles.get(key, { type: 'json'}) + if (scrobbleData) threeMonthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of yearKeys) { - let scrobbleData - try { - scrobbleData = await scrobbles?.get(key, { type: 'json'}) - } catch (error) { - console.log("Error: can't get more scrobbles.") - break; - } - yearChartData?.['data']?.push(...scrobbleData?.['data']) + const scrobbleData = await scrobbles?.get(key, { type: 'json'}) + if (scrobbleData) yearChartData?.['data']?.push(...scrobbleData?.['data']) } fs.writeFileSync('./src/_data/json/weekly-top-artists-chart.json', JSON.stringify({...weeklyChartData, timestamp: `${lastWeek.set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).toMillis()}` })) From 471f0309f441aca847f6f5bec51424428b71f4c2 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sun, 28 Apr 2024 17:33:26 -0700 Subject: [PATCH 5/6] fix: error handling --- plugins/fetch-scrobbles/index.js | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/plugins/fetch-scrobbles/index.js b/plugins/fetch-scrobbles/index.js index 044bad24..960b1218 100644 --- a/plugins/fetch-scrobbles/index.js +++ b/plugins/fetch-scrobbles/index.js @@ -52,18 +52,36 @@ export const onPreBuild = async ({ constants }) => { const nowPlaying = await scrobbles.get('now-playing', { type: 'json'}) for (const key of monthKeys) { - const scrobbleData = await scrobbles.get(key, { type: 'json'}) - if (scrobbleData) monthChartData?.['data']?.push(...scrobbleData?.['data']) + let scrobbleData + try { + scrobbleData = await scrobbles.get(key, { type: 'json'}) + } catch (err) { + console.log('Error fetching scrobble data using monthKeys') + break + } + monthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of threeMonthKeys) { - const scrobbleData = await scrobbles.get(key, { type: 'json'}) - if (scrobbleData) threeMonthChartData?.['data']?.push(...scrobbleData?.['data']) + let scrobbleData + try { + scrobbleData = await scrobbles.get(key, { type: 'json'}) + } catch (err) { + console.log('Error fetching scrobble data using threeMonthKeys') + break + } + threeMonthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of yearKeys) { - const scrobbleData = await scrobbles?.get(key, { type: 'json'}) - if (scrobbleData) yearChartData?.['data']?.push(...scrobbleData?.['data']) + let scrobbleData + try { + scrobbleData = await scrobbles?.get(key, { type: 'json'}) + } catch (err) { + console.log('Error fetching scrobble data using yearKeys') + break + } + yearChartData?.['data']?.push(...scrobbleData?.['data']) } fs.writeFileSync('./src/_data/json/weekly-top-artists-chart.json', JSON.stringify({...weeklyChartData, timestamp: `${lastWeek.set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).toMillis()}` })) From 3d0d1012875bc4d328fe6bca8e8cfd8eac8b1260 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sun, 28 Apr 2024 17:35:27 -0700 Subject: [PATCH 6/6] fix: addtl checks --- plugins/fetch-scrobbles/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/fetch-scrobbles/index.js b/plugins/fetch-scrobbles/index.js index 960b1218..9f2eed0c 100644 --- a/plugins/fetch-scrobbles/index.js +++ b/plugins/fetch-scrobbles/index.js @@ -59,7 +59,7 @@ export const onPreBuild = async ({ constants }) => { console.log('Error fetching scrobble data using monthKeys') break } - monthChartData?.['data']?.push(...scrobbleData?.['data']) + if (scrobbleData) monthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of threeMonthKeys) { @@ -70,7 +70,7 @@ export const onPreBuild = async ({ constants }) => { console.log('Error fetching scrobble data using threeMonthKeys') break } - threeMonthChartData?.['data']?.push(...scrobbleData?.['data']) + if (scrobbleData) threeMonthChartData?.['data']?.push(...scrobbleData?.['data']) } for (const key of yearKeys) { @@ -81,7 +81,7 @@ export const onPreBuild = async ({ constants }) => { console.log('Error fetching scrobble data using yearKeys') break } - yearChartData?.['data']?.push(...scrobbleData?.['data']) + if (scrobbleData) yearChartData?.['data']?.push(...scrobbleData?.['data']) } fs.writeFileSync('./src/_data/json/weekly-top-artists-chart.json', JSON.stringify({...weeklyChartData, timestamp: `${lastWeek.set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).toMillis()}` }))