From 9a2e287761d4871396ad9daca9e2df992ccdab0b Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sat, 8 Jun 2024 12:54:24 -0300 Subject: content, data: Flash.coverArtDimensions --- .../dependencies/generateFlashCoverArtwork.js | 24 +++++++++++++++++----- src/data/things/flash.js | 10 ++++++++- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/content/dependencies/generateFlashCoverArtwork.js b/src/content/dependencies/generateFlashCoverArtwork.js index 374fa3f8..af03ae6b 100644 --- a/src/content/dependencies/generateFlashCoverArtwork.js +++ b/src/content/dependencies/generateFlashCoverArtwork.js @@ -1,12 +1,26 @@ export default { contentDependencies: ['generateCoverArtwork'], - relations: (relation) => - ({coverArtwork: relation('generateCoverArtwork')}), + relations: (relation) => ({ + coverArtwork: + relation('generateCoverArtwork'), + }), - data: (flash) => - ({path: ['media.flashArt', flash.directory, flash.coverArtFileExtension]}), + data: (flash) => ({ + path: + ['media.flashArt', flash.directory, flash.coverArtFileExtension], + + color: + flash.color, + + dimensions: + flash.coverArtDimensions, + }), generate: (data, relations) => - relations.coverArtwork.slot('path', data.path), + relations.coverArtwork.slots({ + path: data.path, + color: data.color, + dimensions: data.dimensions, + }), }; diff --git a/src/data/things/flash.js b/src/data/things/flash.js index ceed79f7..7038df86 100644 --- a/src/data/things/flash.js +++ b/src/data/things/flash.js @@ -7,7 +7,7 @@ import {sortFlashesChronologically} from '#sort'; import Thing from '#thing'; import {anyOf, isColor, isContentString, isDirectory, isNumber, isString} from '#validators'; -import {parseDate, parseContributors} from '#yaml'; +import {parseContributors, parseDate, parseDimensions} from '#yaml'; import {withPropertyFromObject} from '#composite/data'; @@ -24,6 +24,7 @@ import { commentatorArtists, contentString, contributionList, + dimensions, directory, fileExtension, name, @@ -89,6 +90,8 @@ export class Flash extends Thing { coverArtFileExtension: fileExtension('jpg'), + coverArtDimensions: dimensions(), + contributorContribs: contributionList(), featuredTracks: referenceList({ @@ -171,6 +174,11 @@ export class Flash extends Thing { 'Cover Art File Extension': {property: 'coverArtFileExtension'}, + 'Cover Art Dimensions': { + property: 'coverArtDimensions', + transform: parseDimensions, + }, + 'Featured Tracks': {property: 'featuredTracks'}, 'Contributors': { -- cgit 1.3.0-6-gf8a5