From 3205d96a9095e2419ded46a30ed26b714ad0395f Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sat, 31 Jan 2026 17:13:26 -0400 Subject: wiki-data, yaml: artistless content entries "@@ annotation" --- src/common-util/wiki-data.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src/common-util') diff --git a/src/common-util/wiki-data.js b/src/common-util/wiki-data.js index e92a80d5..de34a807 100644 --- a/src/common-util/wiki-data.js +++ b/src/common-util/wiki-data.js @@ -83,7 +83,16 @@ const dateRegex = groupName => String.raw`)`; const contentEntryHeadingRegexRaw = - String.raw`^(?.+?):<\/i>(?: \((?.*)\))?$`; + String.raw`^(?:` + + String.raw`(?:` + + String.raw`(?.+?):<\/i>` + + String.raw`(?: \((?.*)\))?` + + String.raw`)` + + String.raw`|` + + String.raw`(?:` + + String.raw`@@ (?.*)` + + String.raw`)` + + String.raw`)$`; const contentEntryHeadingRegex = new RegExp(contentEntryHeadingRegexRaw, 'gm'); @@ -121,7 +130,15 @@ export function* matchContentEntries(sourceText) { yield workingEntry; } - workingEntry = {...headingMatch.groups}; + workingEntry = { + artists: + headingMatch.groups.artists ?? null, + + annotation: + headingMatch.groups.annotation1 ?? + headingMatch.groups.annotation2 ?? + null, + }; if (workingEntry.annotation) { const annotationTailMatch = -- cgit 1.3.0-6-gf8a5