From 58fba5a7a859c5398e0e58f31d7e8e5a649db63b Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Wed, 2 Apr 2025 15:10:58 -0300 Subject: data, content: stub multiple artworks Only for tracks as of this commit, most anything else is in a severely broken state aye --- src/data/composite/data/withPropertyFromList.js | 22 ++++++- .../things/track/withHasUniqueCoverArt.js | 20 ++++--- .../wiki-properties/constitutibleArtwork.js | 67 --------------------- .../wiki-properties/constitutibleArtworkList.js | 70 ++++++++++++++++++++++ src/data/composite/wiki-properties/index.js | 2 +- src/data/composite/wiki-properties/soupyReverse.js | 5 +- src/data/things/album.js | 14 ++--- src/data/things/track.js | 8 +-- src/data/yaml.js | 7 ++- 9 files changed, 122 insertions(+), 93 deletions(-) delete mode 100644 src/data/composite/wiki-properties/constitutibleArtwork.js create mode 100644 src/data/composite/wiki-properties/constitutibleArtworkList.js (limited to 'src/data') diff --git a/src/data/composite/data/withPropertyFromList.js b/src/data/composite/data/withPropertyFromList.js index 65ebf77b..760095c2 100644 --- a/src/data/composite/data/withPropertyFromList.js +++ b/src/data/composite/data/withPropertyFromList.js @@ -5,11 +5,15 @@ // original list are kept null here. Objects which don't have the specified // property are retained in-place as null. // +// If the `internal` input is true, this reads the CacheableObject update value +// of each object rather than its exposed value. +// // See also: // - withPropertiesFromList // - withPropertyFromObject // +import CacheableObject from '#cacheable-object'; import {input, templateCompositeFrom} from '#composite'; function getOutputName({list, property, prefix}) { @@ -26,6 +30,7 @@ export default templateCompositeFrom({ list: input({type: 'array'}), property: input({type: 'string'}), prefix: input.staticValue({type: 'string', defaultValue: null}), + internal: input({type: 'boolean', defaultValue: false}), }, outputs: ({ @@ -37,13 +42,26 @@ export default templateCompositeFrom({ steps: () => [ { - dependencies: [input('list'), input('property')], + dependencies: [ + input('list'), + input('property'), + input('internal'), + ], + compute: (continuation, { [input('list')]: list, [input('property')]: property, + [input('internal')]: internal, }) => continuation({ ['#values']: - list.map(item => item[property] ?? null), + list.map(item => + (item === null + ? null + : internal + ? CacheableObject.getUpdateValue(item, property) + ?? null + : item[property] + ?? null)), }), }, diff --git a/src/data/composite/things/track/withHasUniqueCoverArt.js b/src/data/composite/things/track/withHasUniqueCoverArt.js index 2ea845f6..e0a435fe 100644 --- a/src/data/composite/things/track/withHasUniqueCoverArt.js +++ b/src/data/composite/things/track/withHasUniqueCoverArt.js @@ -10,7 +10,7 @@ import {input, templateCompositeFrom} from '#composite'; import {empty} from '#sugar'; import {raiseOutputWithoutDependency} from '#composite/control-flow'; -import {withPropertyFromObject} from '#composite/data'; +import {withFlattenedList, withPropertyFromList} from '#composite/data'; import {withResolvedContribs} from '#composite/wiki-data'; import withPropertyFromAlbum from './withPropertyFromAlbum.js'; @@ -65,20 +65,24 @@ export default templateCompositeFrom({ })), }, - withPropertyFromObject({ - object: 'trackArtwork', + raiseOutputWithoutDependency({ + dependency: 'trackArtworks', + mode: input.value('empty'), + output: input.value({'#hasUniqueCoverArt': false}), + }), + + withPropertyFromList({ + list: 'trackArtworks', property: input.value('artistContribs'), internal: input.value(true), }), - raiseOutputWithoutDependency({ - dependency: '#trackArtwork.artistContribs', - mode: input.value('empty'), - output: input.value({'#hasUniqueCoverArt': false}), + withFlattenedList({ + list: '#trackArtworks.artistContribs', }), withResolvedContribs({ - from: '#trackArtwork.artistContribs', + from: '#flattenedList', date: input.value(null), }), diff --git a/src/data/composite/wiki-properties/constitutibleArtwork.js b/src/data/composite/wiki-properties/constitutibleArtwork.js deleted file mode 100644 index e0f0f521..00000000 --- a/src/data/composite/wiki-properties/constitutibleArtwork.js +++ /dev/null @@ -1,67 +0,0 @@ -import {input, templateCompositeFrom} from '#composite'; -import {isContributionList, isDate, validateThing} from '#validators'; - -import {exitWithoutDependency, exposeDependency, exposeUpdateValueOrContinue} - from '#composite/control-flow'; -import {withConstitutedArtwork} from '#composite/wiki-data'; - -export default templateCompositeFrom({ - annotation: `constitutibleArtwork`, - - compose: false, - - inputs: { - contribs: input.staticDependency({ - validate: isContributionList, - acceptsNull: true, - }), - - date: input.staticDependency({ - validate: isDate, - acceptsNull: true, - }), - - artistProperty: input.staticValue({ - type: 'string', - }), - }, - - steps: () => [ - exposeUpdateValueOrContinue({ - validate: input.value( - validateThing({ - referenceType: 'artwork', - })), - }), - - exitWithoutDependency({ - dependency: input('contribs'), - value: input.value(null), - }), - - { - dependencies: [ - input.staticDependency('contribs'), - input.staticDependency('date'), - ], - - compute: (continuation, { - [input.staticDependency('contribs')]: contribsProperty, - [input.staticDependency('date')]: dateProperty, - }) => continuation({ - ['#contribsProperty']: contribsProperty, - ['#dateProperty']: dateProperty, - }) - }, - - withConstitutedArtwork({ - contribsProperty: '#contribsProperty', - artistProperty: input('artistProperty'), - dateProperty: '#dateProperty', - }), - - exposeDependency({ - dependency: '#constitutedArtwork', - }), - ], -}); diff --git a/src/data/composite/wiki-properties/constitutibleArtworkList.js b/src/data/composite/wiki-properties/constitutibleArtworkList.js new file mode 100644 index 00000000..01429f03 --- /dev/null +++ b/src/data/composite/wiki-properties/constitutibleArtworkList.js @@ -0,0 +1,70 @@ +import {input, templateCompositeFrom} from '#composite'; +import {isContributionList, isDate, validateWikiData} from '#validators'; + +import {exitWithoutDependency, exposeUpdateValueOrContinue} + from '#composite/control-flow'; +import {withConstitutedArtwork} from '#composite/wiki-data'; + +export default templateCompositeFrom({ + annotation: `constitutibleArtwork`, + + compose: false, + + inputs: { + contribs: input.staticDependency({ + validate: isContributionList, + acceptsNull: true, + }), + + date: input.staticDependency({ + validate: isDate, + acceptsNull: true, + }), + + artistProperty: input.staticValue({ + type: 'string', + }), + }, + + steps: () => [ + exposeUpdateValueOrContinue({ + validate: input.value( + validateWikiData({ + referenceType: 'artwork', + })), + }), + + exitWithoutDependency({ + dependency: input('contribs'), + value: input.value([]), + }), + + { + dependencies: [ + input.staticDependency('contribs'), + input.staticDependency('date'), + ], + + compute: (continuation, { + [input.staticDependency('contribs')]: contribsProperty, + [input.staticDependency('date')]: dateProperty, + }) => continuation({ + ['#contribsProperty']: contribsProperty, + ['#dateProperty']: dateProperty, + }) + }, + + withConstitutedArtwork({ + contribsProperty: '#contribsProperty', + artistProperty: input('artistProperty'), + dateProperty: '#dateProperty', + }), + + { + dependencies: ['#constitutedArtwork'], + compute: ({ + ['#constitutedArtwork']: constitutedArtwork, + }) => [constitutedArtwork], + }, + ], +}); diff --git a/src/data/composite/wiki-properties/index.js b/src/data/composite/wiki-properties/index.js index 7583630d..d346c7e5 100644 --- a/src/data/composite/wiki-properties/index.js +++ b/src/data/composite/wiki-properties/index.js @@ -9,7 +9,7 @@ export {default as annotatedReferenceList} from './annotatedReferenceList.js'; export {default as color} from './color.js'; export {default as commentary} from './commentary.js'; export {default as commentatorArtists} from './commentatorArtists.js'; -export {default as constitutibleArtwork} from './constitutibleArtwork.js'; +export {default as constitutibleArtworkList} from './constitutibleArtworkList.js'; export {default as contentString} from './contentString.js'; export {default as contribsPresent} from './contribsPresent.js'; export {default as contributionList} from './contributionList.js'; diff --git a/src/data/composite/wiki-properties/soupyReverse.js b/src/data/composite/wiki-properties/soupyReverse.js index a3171738..b99c45da 100644 --- a/src/data/composite/wiki-properties/soupyReverse.js +++ b/src/data/composite/wiki-properties/soupyReverse.js @@ -24,9 +24,8 @@ soupyReverse.artworkContributionsBy = bindTo, referencing: thing => - (thing[artworkProperty] - ? thing[artworkProperty].artistContribs - : []), + thing[artworkProperty] + .flatMap(artwork => artwork.artistContribs), referenced: contrib => [contrib.artist], }); diff --git a/src/data/things/album.js b/src/data/things/album.js index 4321635e..36069afb 100644 --- a/src/data/things/album.js +++ b/src/data/things/album.js @@ -35,7 +35,7 @@ import { commentary, color, commentatorArtists, - constitutibleArtwork, + constitutibleArtworkList, contentString, contribsPresent, contributionList, @@ -159,7 +159,7 @@ export class Album extends Thing { dimensions(), ], - coverArtwork: constitutibleArtwork({ + coverArtworks: constitutibleArtworkList({ contribs: 'coverArtistContribs', date: 'coverArtDate', artistProperty: input.value('albumCoverArtistContributions'), @@ -411,7 +411,7 @@ export class Album extends Thing { soupyReverse.contributionsBy('albumData', 'artistContribs'), albumCoverArtistContributionsBy: - soupyReverse.artworkContributionsBy('albumData', 'coverArtwork'), + soupyReverse.artworkContributionsBy('albumData', 'coverArtworks'), albumWallpaperArtistContributionsBy: soupyReverse.contributionsBy('albumData', 'wallpaperArtistContribs'), @@ -468,7 +468,7 @@ export class Album extends Thing { 'Listed in Galleries': {property: 'isListedInGalleries'}, 'Cover Artwork': { - property: 'coverArtwork', + property: 'coverArtworks', transform: parseArtwork({ dateFromThingProperty: 'coverArtDate', @@ -644,9 +644,7 @@ export class Album extends Thing { currentTrackSectionTracks.push(entry); trackData.push(entry); - if (entry.trackArtwork) { - artworkData.push(entry.trackArtwork); - } + artworkData.push(...entry.trackArtworks); entry.dataSourceAlbum = albumRef; } @@ -655,6 +653,8 @@ export class Album extends Thing { albumData.push(album); + artworkData.push(...album.coverArtworks); + album.trackSections = trackSections; } diff --git a/src/data/things/track.js b/src/data/things/track.js index 6954bda2..7188178a 100644 --- a/src/data/things/track.js +++ b/src/data/things/track.js @@ -39,7 +39,7 @@ import { additionalNameList, commentary, commentatorArtists, - constitutibleArtwork, + constitutibleArtworkList, contentString, contributionList, dimensions, @@ -341,7 +341,7 @@ export class Track extends Thing { }), ], - trackArtwork: constitutibleArtwork({ + trackArtworks: constitutibleArtworkList({ contribs: 'coverArtistContribs', date: 'coverArtDate', artistProperty: input.value('trackCoverArtistContributions'), @@ -573,7 +573,7 @@ export class Track extends Thing { }, 'Track Artwork': { - property: 'trackArtwork', + property: 'trackArtworks', transform: parseArtwork({ dateFromThingProperty: 'coverArtDate', @@ -704,7 +704,7 @@ export class Track extends Thing { soupyReverse.contributionsBy('trackData', 'contributorContribs'), trackCoverArtistContributionsBy: - soupyReverse.artworkContributionsBy('trackData', 'trackArtwork'), + soupyReverse.artworkContributionsBy('trackData', 'trackArtworks'), tracksWithCommentaryBy: { bindTo: 'trackData', diff --git a/src/data/yaml.js b/src/data/yaml.js index d30bb54c..b766e753 100644 --- a/src/data/yaml.js +++ b/src/data/yaml.js @@ -794,7 +794,7 @@ export function parseArtwork({ artistContribsFromThingProperty, artistContribsArtistProperty, }) { - return (entry, {subdoc, Artwork}) => + const parseSingleEntry = (entry, {subdoc, Artwork}) => subdoc(Artwork, entry, { bindInto: 'thing', provide: { @@ -803,6 +803,11 @@ export function parseArtwork({ artistContribsArtistProperty, }, }); + + return (value, ...args) => + (Array.isArray(value) + ? value.map(entry => parseSingleEntry(entry, ...args)) + : [parseSingleEntry(value, ...args)]); } // documentModes: Symbols indicating sets of behavior for loading and processing -- cgit 1.3.0-6-gf8a5