From cf0d270b14ba95ba370f216cf32d38268d295853 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Thu, 16 May 2024 07:19:37 -0700
Subject: [PATCH] fix: book dates + sorting
---
config/filters/index.js | 8 +--
package-lock.json | 116 ++++++++++++++++++++--------------------
package.json | 4 +-
src/_data/books.js | 5 +-
src/feeds/books.liquid | 2 +-
5 files changed, 69 insertions(+), 66 deletions(-)
diff --git a/config/filters/index.js b/config/filters/index.js
index 1fe90296..9242f9bc 100644
--- a/config/filters/index.js
+++ b/config/filters/index.js
@@ -218,17 +218,17 @@ export default {
calculatePlayPercentage: (plays, mostPlayed) => `${plays/mostPlayed * 100}%`,
bookStatus: (books, status) => books.filter(book => book.status === status),
bookFinishedYear: (books, year) => books.filter(book => {
- if (book.status === 'finished' && book.dateAdded) return parseInt(book.dateAdded.split('-')[0]) === year
+ if (book.status === 'finished' && book.date) return parseInt(book.date.split('-')[0]) === year
return ''
}).sort((a, b) => {
- const dateA = DateTime.fromISO(a.dateAdded)
- const dateB = DateTime.fromISO(b.dateAdded)
+ const dateA = DateTime.fromISO(a.date)
+ const dateB = DateTime.fromISO(b.date)
return dateB - dateA
}),
currentBookCount: (books) => {
const year = DateTime.now().year
return books.filter(book => {
- if (book.status === 'finished' && book.dateAdded) return parseInt(book.dateAdded.split('-')[0]) === year
+ if (book.status === 'finished' && book.date) return parseInt(book.date.split('-')[0]) === year
return ''
}).length
},
diff --git a/package-lock.json b/package-lock.json
index 8c25340d..5e4d6ede 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "coryd.dev",
- "version": "15.1.7",
+ "version": "15.1.8",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "coryd.dev",
- "version": "15.1.7",
+ "version": "15.1.8",
"license": "MIT",
"dependencies": {
"@cdransf/api-text": "^1.2.2",
@@ -38,7 +38,7 @@
"markdown-it-footnote": "^4.0.0",
"netlify-plugin-webmentions": "^1.1.1",
"sanitize-html": "^2.13.0",
- "sharp": "^0.33.3",
+ "sharp": "^0.33.4",
"slugify": "^1.6.6",
"terser": "^5.31.0"
}
@@ -1226,9 +1226,9 @@
}
},
"node_modules/@img/sharp-darwin-arm64": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.3.tgz",
- "integrity": "sha512-FaNiGX1MrOuJ3hxuNzWgsT/mg5OHG/Izh59WW2mk1UwYHUwtfbhk5QNKYZgxf0pLOhx9ctGiGa2OykD71vOnSw==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.4.tgz",
+ "integrity": "sha512-p0suNqXufJs9t3RqLBO6vvrgr5OhgbWp76s5gTRvdmxmuv9E1rcaqGUsl3l4mKVmXPkTkTErXediAui4x+8PSA==",
"cpu": [
"arm64"
],
@@ -1252,9 +1252,9 @@
}
},
"node_modules/@img/sharp-darwin-x64": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.3.tgz",
- "integrity": "sha512-2QeSl7QDK9ru//YBT4sQkoq7L0EAJZA3rtV+v9p8xTKl4U1bUqTIaCnoC7Ctx2kCjQgwFXDasOtPTCT8eCTXvw==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.4.tgz",
+ "integrity": "sha512-0l7yRObwtTi82Z6ebVI2PnHT8EB2NxBgpK2MiKJZJ7cz32R4lxd001ecMhzzsZig3Yv9oclvqqdV93jo9hy+Dw==",
"cpu": [
"x64"
],
@@ -1454,9 +1454,9 @@
}
},
"node_modules/@img/sharp-linux-arm": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.3.tgz",
- "integrity": "sha512-Q7Ee3fFSC9P7vUSqVEF0zccJsZ8GiiCJYGWDdhEjdlOeS9/jdkyJ6sUSPj+bL8VuOYFSbofrW0t/86ceVhx32w==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.4.tgz",
+ "integrity": "sha512-RUgBD1c0+gCYZGCCe6mMdTiOFS0Zc/XrN0fYd6hISIKcDUbAW5NtSQW9g/powkrXYm6Vzwd6y+fqmExDuCdHNQ==",
"cpu": [
"arm"
],
@@ -1480,9 +1480,9 @@
}
},
"node_modules/@img/sharp-linux-arm64": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.3.tgz",
- "integrity": "sha512-Zf+sF1jHZJKA6Gor9hoYG2ljr4wo9cY4twaxgFDvlG0Xz9V7sinsPp8pFd1XtlhTzYo0IhDbl3rK7P6MzHpnYA==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.4.tgz",
+ "integrity": "sha512-2800clwVg1ZQtxwSoTlHvtm9ObgAax7V6MTAB/hDT945Tfyy3hVkmiHpeLPCKYqYR1Gcmv1uDZ3a4OFwkdBL7Q==",
"cpu": [
"arm64"
],
@@ -1506,9 +1506,9 @@
}
},
"node_modules/@img/sharp-linux-s390x": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.3.tgz",
- "integrity": "sha512-vFk441DKRFepjhTEH20oBlFrHcLjPfI8B0pMIxGm3+yilKyYeHEVvrZhYFdqIseSclIqbQ3SnZMwEMWonY5XFA==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.4.tgz",
+ "integrity": "sha512-h3RAL3siQoyzSoH36tUeS0PDmb5wINKGYzcLB5C6DIiAn2F3udeFAum+gj8IbA/82+8RGCTn7XW8WTFnqag4tQ==",
"cpu": [
"s390x"
],
@@ -1518,7 +1518,7 @@
"linux"
],
"engines": {
- "glibc": ">=2.28",
+ "glibc": ">=2.31",
"node": "^18.17.0 || ^20.3.0 || >=21.0.0",
"npm": ">=9.6.5",
"pnpm": ">=7.1.0",
@@ -1532,9 +1532,9 @@
}
},
"node_modules/@img/sharp-linux-x64": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.3.tgz",
- "integrity": "sha512-Q4I++herIJxJi+qmbySd072oDPRkCg/SClLEIDh5IL9h1zjhqjv82H0Seupd+q2m0yOfD+/fJnjSoDFtKiHu2g==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.4.tgz",
+ "integrity": "sha512-GoR++s0XW9DGVi8SUGQ/U4AeIzLdNjHka6jidVwapQ/JebGVQIpi52OdyxCNVRE++n1FCLzjDovJNozif7w/Aw==",
"cpu": [
"x64"
],
@@ -1558,9 +1558,9 @@
}
},
"node_modules/@img/sharp-linuxmusl-arm64": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.3.tgz",
- "integrity": "sha512-qnDccehRDXadhM9PM5hLvcPRYqyFCBN31kq+ErBSZtZlsAc1U4Z85xf/RXv1qolkdu+ibw64fUDaRdktxTNP9A==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.4.tgz",
+ "integrity": "sha512-nhr1yC3BlVrKDTl6cO12gTpXMl4ITBUZieehFvMntlCXFzH2bvKG76tBL2Y/OqhupZt81pR7R+Q5YhJxW0rGgQ==",
"cpu": [
"arm64"
],
@@ -1584,9 +1584,9 @@
}
},
"node_modules/@img/sharp-linuxmusl-x64": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.3.tgz",
- "integrity": "sha512-Jhchim8kHWIU/GZ+9poHMWRcefeaxFIs9EBqf9KtcC14Ojk6qua7ghKiPs0sbeLbLj/2IGBtDcxHyjCdYWkk2w==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.4.tgz",
+ "integrity": "sha512-uCPTku0zwqDmZEOi4ILyGdmW76tH7dm8kKlOIV1XC5cLyJ71ENAAqarOHQh0RLfpIpbV5KOpXzdU6XkJtS0daw==",
"cpu": [
"x64"
],
@@ -1610,16 +1610,16 @@
}
},
"node_modules/@img/sharp-wasm32": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.3.tgz",
- "integrity": "sha512-68zivsdJ0koE96stdUfM+gmyaK/NcoSZK5dV5CAjES0FUXS9lchYt8LAB5rTbM7nlWtxaU/2GON0HVN6/ZYJAQ==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.4.tgz",
+ "integrity": "sha512-Bmmauh4sXUsUqkleQahpdNXKvo+wa1V9KhT2pDA4VJGKwnKMJXiSTGphn0gnJrlooda0QxCtXc6RX1XAU6hMnQ==",
"cpu": [
"wasm32"
],
"dev": true,
"optional": true,
"dependencies": {
- "@emnapi/runtime": "^1.1.0"
+ "@emnapi/runtime": "^1.1.1"
},
"engines": {
"node": "^18.17.0 || ^20.3.0 || >=21.0.0",
@@ -1632,9 +1632,9 @@
}
},
"node_modules/@img/sharp-win32-ia32": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.3.tgz",
- "integrity": "sha512-CyimAduT2whQD8ER4Ux7exKrtfoaUiVr7HG0zZvO0XTFn2idUWljjxv58GxNTkFb8/J9Ub9AqITGkJD6ZginxQ==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.4.tgz",
+ "integrity": "sha512-99SJ91XzUhYHbx7uhK3+9Lf7+LjwMGQZMDlO/E/YVJ7Nc3lyDFZPGhjwiYdctoH2BOzW9+TnfqcaMKt0jHLdqw==",
"cpu": [
"ia32"
],
@@ -1654,9 +1654,9 @@
}
},
"node_modules/@img/sharp-win32-x64": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.3.tgz",
- "integrity": "sha512-viT4fUIDKnli3IfOephGnolMzhz5VaTvDRkYqtZxOMIoMQ4MrAziO7pT1nVnOt2FAm7qW5aa+CCc13aEY6Le0g==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.4.tgz",
+ "integrity": "sha512-3QLocdTRVIrFNye5YocZl+KKpYKP+fksi1QhmOArgx7GyhIbQp/WrJRu176jm8IxromS7RIkzMiMINVdBtC8Aw==",
"cpu": [
"x64"
],
@@ -2908,9 +2908,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001618",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001618.tgz",
- "integrity": "sha512-p407+D1tIkDvsEAPS22lJxLQQaG8OTBEqo0KhzfABGk0TU4juBNDSfH0hyAp/HRyx+M8L17z/ltyhxh27FTfQg==",
+ "version": "1.0.30001620",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001620.tgz",
+ "integrity": "sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==",
"dev": true,
"funding": [
{
@@ -3432,9 +3432,9 @@
"dev": true
},
"node_modules/electron-to-chromium": {
- "version": "1.4.770",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.770.tgz",
- "integrity": "sha512-ONwOsDiVvV07CMsyH4+dEaZ9L79HMH/ODHnDS3GkIhgNqdDHJN2C18kFb0fBj0RXpQywsPJl6k2Pqg1IY4r1ig==",
+ "version": "1.4.772",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.772.tgz",
+ "integrity": "sha512-jFfEbxR/abTTJA3ci+2ok1NTuOBBtB4jH+UT6PUmRN+DY3WSD4FFRsgoVQ+QNIJ0T7wrXwzsWCI2WKC46b++2A==",
"dev": true
},
"node_modules/encodeurl": {
@@ -6049,9 +6049,9 @@
"dev": true
},
"node_modules/sharp": {
- "version": "0.33.3",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.3.tgz",
- "integrity": "sha512-vHUeXJU1UvlO/BNwTpT0x/r53WkLUVxrmb5JTgW92fdFCFk0ispLMAeu/jPO2vjkXM1fYUi3K7/qcLF47pwM1A==",
+ "version": "0.33.4",
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.4.tgz",
+ "integrity": "sha512-7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@@ -6067,8 +6067,8 @@
"url": "https://opencollective.com/libvips"
},
"optionalDependencies": {
- "@img/sharp-darwin-arm64": "0.33.3",
- "@img/sharp-darwin-x64": "0.33.3",
+ "@img/sharp-darwin-arm64": "0.33.4",
+ "@img/sharp-darwin-x64": "0.33.4",
"@img/sharp-libvips-darwin-arm64": "1.0.2",
"@img/sharp-libvips-darwin-x64": "1.0.2",
"@img/sharp-libvips-linux-arm": "1.0.2",
@@ -6077,15 +6077,15 @@
"@img/sharp-libvips-linux-x64": "1.0.2",
"@img/sharp-libvips-linuxmusl-arm64": "1.0.2",
"@img/sharp-libvips-linuxmusl-x64": "1.0.2",
- "@img/sharp-linux-arm": "0.33.3",
- "@img/sharp-linux-arm64": "0.33.3",
- "@img/sharp-linux-s390x": "0.33.3",
- "@img/sharp-linux-x64": "0.33.3",
- "@img/sharp-linuxmusl-arm64": "0.33.3",
- "@img/sharp-linuxmusl-x64": "0.33.3",
- "@img/sharp-wasm32": "0.33.3",
- "@img/sharp-win32-ia32": "0.33.3",
- "@img/sharp-win32-x64": "0.33.3"
+ "@img/sharp-linux-arm": "0.33.4",
+ "@img/sharp-linux-arm64": "0.33.4",
+ "@img/sharp-linux-s390x": "0.33.4",
+ "@img/sharp-linux-x64": "0.33.4",
+ "@img/sharp-linuxmusl-arm64": "0.33.4",
+ "@img/sharp-linuxmusl-x64": "0.33.4",
+ "@img/sharp-wasm32": "0.33.4",
+ "@img/sharp-win32-ia32": "0.33.4",
+ "@img/sharp-win32-x64": "0.33.4"
}
},
"node_modules/sharp/node_modules/detect-libc": {
diff --git a/package.json b/package.json
index 9237f2c8..767b5680 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "coryd.dev",
- "version": "15.1.7",
+ "version": "15.1.8",
"description": "The source for my personal site. Built using 11ty.",
"type": "module",
"scripts": {
@@ -50,7 +50,7 @@
"markdown-it-footnote": "^4.0.0",
"netlify-plugin-webmentions": "^1.1.1",
"sanitize-html": "^2.13.0",
- "sharp": "^0.33.3",
+ "sharp": "^0.33.4",
"slugify": "^1.6.6",
"terser": "^5.31.0"
}
diff --git a/src/_data/books.js b/src/_data/books.js
index 4e8800e6..0fae9471 100644
--- a/src/_data/books.js
+++ b/src/_data/books.js
@@ -6,8 +6,11 @@ const books = require('./json/read.json')
export default async function () {
return books.map(book => {
let authors = ''
+ let date = book?.['dateAdded']
if (book['authors']?.length > 1) authors = book['authors'].join(', ')
if (book['authors']?.length === 1) authors = book['authors'][0]
+ if (book?.['dateStarted']) date = book['dateStarted']
+ if (book?.['dateFinished']) date = book['dateFinished']
return {
title: book['title'],
@@ -15,7 +18,7 @@ export default async function () {
description: book['description'],
image: encodeURIComponent(book['thumbnail'].replace('&edge=curl', '')),
url: `https://openlibrary.org/isbn/${book['isbn']}`,
- dateAdded: book?.['dateStarted'] || book?.['dateFinished'],
+ date,
status: book['status'],
tags: book['tags'],
categories: book['categories']?.length > 1 ? book['categories'].join(', ') : book['categories']?.[0],
diff --git a/src/feeds/books.liquid b/src/feeds/books.liquid
index e81b5381..08612498 100644
--- a/src/feeds/books.liquid
+++ b/src/feeds/books.liquid
@@ -9,6 +9,6 @@ permalink: /feeds/books
title:"Books • Cory Dransfeldt"
description:"Books I'm currently reading."
data:bookData
- updated:bookData[0].dateAdded
+ updated:bookData[0].date
site:site
%}
\ No newline at end of file