diff --git a/config/mediaFilters.js b/config/mediaFilters.js index 38fd9c37..d21cc164 100644 --- a/config/mediaFilters.js +++ b/config/mediaFilters.js @@ -15,4 +15,7 @@ module.exports = { movie: (url, host, cdn) => { return url.replace(host, cdn).replace('600', '200').replace('900', '300') }, + book: (url, host, cdn) => { + return url.replace(host, cdn) + }, } diff --git a/src/_data/books.js b/src/_data/books.js index 2e0e7897..747b2246 100644 --- a/src/_data/books.js +++ b/src/_data/books.js @@ -6,7 +6,13 @@ module.exports = async function () { // noinspection JSCheckFunctionSignatures const asset = new AssetCache('books_data') if (asset.isCacheValid('1h')) return await asset.getCachedValue() - const res = await extract(url) + const res = await extract(url, { + getExtraEntryFields: (feedEntry) => { + return { + image: feedEntry['oku:cover'] || 'https://cdn.coryd.dev/books/missing-book.jpg', + } + }, + }) .catch((error) => { console.log(error.message) }) diff --git a/src/_data/site.json b/src/_data/site.json index 0de58a56..a537f112 100644 --- a/src/_data/site.json +++ b/src/_data/site.json @@ -13,8 +13,10 @@ "instapaper": "https://www.instapaper.com/p/coryd", "letterboxd": "https://letterboxd.com/cdme", "letterboxd-host": "https://a.ltrbxd.com", + "oku-host": "https://oku.ams3.cdn.digitaloceanspaces.com", "trakt": "https://trakt.tv/users/cdransf", "oku": "https://oku.club/user/cory", "coffee": "https://www.buymeacoffee.com/cory", - "cdn-movies": "https://movies.coryd.dev" + "cdn-movies": "https://movies.coryd.dev", + "cdn-books": "https://books.coryd.dev" } diff --git a/src/_includes/now.liquid b/src/_includes/now.liquid index 6faa17df..51e2895b 100644 --- a/src/_includes/now.liquid +++ b/src/_includes/now.liquid @@ -39,117 +39,113 @@ layout: main Assembling lists of ad and tracker-blocking tools.

- {% if books.size > 0 %} -

- Reading: books -

-
- -
- {% endif %} {% if artists.size > 0 %}

Listening: artists

-
-
- {% for artist in artists %} - -
-
-
-
{{ artist.name }}
-
- {{ artist.playcount }} plays -
+
+ {% for artist in artists %} + +
+
+
+
{{ artist.name }}
+
+ {{ artist.playcount }} plays
- {%- capture artistImg %}{{ artist.name | artist }}{% endcapture -%} - {%- capture artistName %}{{ artist.name | escape }}{% endcapture -%} - {% image artistImg, artistName, 'rounded-lg', '225px', 'eager' %}
- - {% endfor %} -
+ {%- capture artistImg %}{{ artist.name | artist }}{% endcapture -%} + {%- capture artistName %}{{ artist.name | escape }}{% endcapture -%} + {% image artistImg, artistName, 'rounded-lg', '225px', 'eager' %} +
+ + {% endfor %}
{% endif %} {% if albums.size > 0 %}

Listening: albums

-
-
- {% for album in albums %} - -
-
-
-
{{ album.name }}
-
- {{ album.artist.name }} -
+
+ {% for album in albums %} + +
+
+
+
{{ album.name }}
+
+ {{ album.artist.name }}
- {%- capture albumImg %}{{ album | album }}{% endcapture -%} - {%- capture albumName %}{{ album.name | escape }}{% endcapture -%} - {% image albumImg, albumName, 'rounded-lg', '225px' %}
- - {% endfor %} -
+ {%- capture albumImg %}{{ album | album }}{% endcapture -%} + {%- capture albumName %}{{ album.name | escape }}{% endcapture -%} + {% image albumImg, albumName, 'rounded-lg', '225px' %} +
+ + {% endfor %} +
+ {% endif %} + {% if books.size > 0 %} +

+ Reading: books +

+
+ {% for book in books %} + +
+
+
+
{{ book.title }}
+
+ {%- capture bookImg %}{{book.image | book: site.oku-host, site.cdn-books}}{% endcapture -%} + {%- capture bookName %}{{book.title | escape}}{% endcapture -%} + {% image bookImg, bookName, 'rounded-lg w-full', '180px' %} +
+ + {% endfor %}
{% endif %} {% if movies.size > 0 %}

Watching: movies

-
-
- {% for movie in movies %} - -
-
-
-
{{ movie.title }}
-
- {%- capture movieImg %}{{movie.image | movie: site.letterboxd-host, site.cdn-movies}}{% endcapture -%} - {%- capture movieName %}{{movie.title | escape}}{% endcapture -%} - {% image movieImg, movieName, 'rounded-lg w-full', '180px' %} +
+ {% for movie in movies %} + +
+
+
+
{{ movie.title }}
- - {% endfor %} -
+ {%- capture movieImg %}{{movie.image | movie: site.letterboxd-host, site.cdn-movies}}{% endcapture -%} + {%- capture movieName %}{{movie.title | escape}}{% endcapture -%} + {% image movieImg, movieName, 'rounded-lg w-full', '180px' %} +
+ + {% endfor %}
{% endif %} {% if tv.size > 0 %}

Watching: tv

-
-
- {% for episode in tv %} - -
-
-
-
{{ episode.episode.title }}
-
- {{ episode.show.title }} • S{{ episode.episode.season }}E{{ episode.episode.number }} -
+
+ {% for episode in tv %} + +
+
+
+
{{ episode.episode.title }}
+
+ {{ episode.show.title }} • S{{ episode.episode.season }}E{{ episode.episode.number }}
- {%- capture tvImg %}{{episode.show.title | tv}}{% endcapture -%} - {%- capture tvName %}{{ episode.episode.title | escape}} {{ episode.show.title | escape }}{% endcapture -%} - {% image tvImg, tvName, 'rounded-lg w-full', '180px' %}
- - {% endfor %} -
+ {%- capture tvImg %}{{episode.show.title | tv}}{% endcapture -%} + {%- capture tvName %}{{ episode.episode.title | escape}} {{ episode.show.title | escape }}{% endcapture -%} + {% image tvImg, tvName, 'rounded-lg w-full', '180px' %} +
+ + {% endfor %}
{% endif %}

This is a diff --git a/src/assets/img/media/404-movie.jpg b/src/assets/img/media/404-movie.jpg deleted file mode 100644 index 677f5a32..00000000 Binary files a/src/assets/img/media/404-movie.jpg and /dev/null differ diff --git a/src/assets/img/media/404-music.jpg b/src/assets/img/media/404-music.jpg deleted file mode 100644 index 69210bc4..00000000 Binary files a/src/assets/img/media/404-music.jpg and /dev/null differ