wiki-data, yaml: artistless content entries "@@ annotation"

1 files changed, 19 insertions, 2 deletions

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>(?<artists>.+?):<\/i>(?: \((?<annotation>.*)\))?$`;
+  String.raw`^(?:` +
+    String.raw`(?:` +
+      String.raw`<i>(?<artists>.+?):<\/i>` +
+      String.raw`(?: \((?<annotation1>.*)\))?` +
+    String.raw`)` +
+    String.raw`|` +
+    String.raw`(?:` +
+      String.raw`@@ (?<annotation2>.*)` +
+    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 =