From 5108cf043ebe41de0c62887eaaeb51f0d3d70594 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Fri, 16 Feb 2024 08:14:18 -0400 Subject: data, yaml: find.artistIncludingAliases -> find.artistAlias --- src/data/things/artist.js | 9 +++------ src/data/yaml.js | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/data') diff --git a/src/data/things/artist.js b/src/data/things/artist.js index 589eca90..6e61c28f 100644 --- a/src/data/things/artist.js +++ b/src/data/things/artist.js @@ -256,16 +256,13 @@ export class Artist extends Thing { include: artist => !artist.isAlias, }, - artistIncludingAliases: { + artistAlias: { referenceTypes: ['artist', 'artist-gallery'], bindTo: 'artistData', - getMatchableDirectories(artist) { - // Regular artists are always matchable by their directory. - if (!artist.isAlias) { - return [artist.directory]; - } + include: artist => artist.isAlias, + getMatchableDirectories(artist) { const originalArtist = artist.aliasedArtist; // Aliases never match by the same directory as the original. diff --git a/src/data/yaml.js b/src/data/yaml.js index 8b8a8ab2..fadafbd5 100644 --- a/src/data/yaml.js +++ b/src/data/yaml.js @@ -1157,9 +1157,8 @@ export function filterReferenceErrors(wikiData) { const boundFind = bindFind(wikiData, {mode: 'error'}); - const artistAliasData = wikiData.artistData.filter(artist => artist.isAlias); const findArtistOrAlias = artistRef => { - const alias = find.artistIncludingAliases(artistRef, artistAliasData, {mode: 'quiet'}); + const alias = boundFind.artistAlias(artistRef, {mode: 'quiet'}); if (alias) { // No need to check if the original exists here. Aliases are automatically // created from a field on the original, so the original certainly exists. -- cgit 1.3.0-6-gf8a5