« get me outta code hell

Merge branch 'staging' into data-restructure - hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
diff options
context:
space:
mode:
author(quasar) nebula <qznebula@protonmail.com>2022-02-01 20:38:58 -0400
committer(quasar) nebula <qznebula@protonmail.com>2022-02-01 20:38:58 -0400
commit9bfc97404a08fd5ad79a6a6fa2d46e5118acfc15 (patch)
tree61d4d1638727429ea45d9448964468d2b180da63
parent39d72767292803d62bd4ab01c4fcc4827a7f89d5 (diff)
parentbc2db22a9c1f6475aaf901933e54eb85d005e031 (diff)
Merge branch 'staging' into data-restructure
-rwxr-xr-xsrc/upd8.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/upd8.js b/src/upd8.js
index 87d84e1..0ea998a 100755
--- a/src/upd8.js
+++ b/src/upd8.js
@@ -2822,7 +2822,7 @@ async function main() {
         };
         let CR4SH = false;
         for (let name of artistNames) {
-            const entry = [...WD.artistData, ...WD.artistAliasData].find(entry => entry.name === name || entry.name.toLowerCase() === name.toLowerCase());
+            const entry = find.artist(name, {wikiData});
             if (!entry) {
                 clearBuffer();
                 console.log(`\x1b[31mMissing entry for artist "\x1b[1m${name}\x1b[0;31m"\x1b[0m`);
@@ -2832,10 +2832,6 @@ async function main() {
                 console.log(`\x1b[33mArtist "\x1b[1m${name}\x1b[0;33m" should be named "\x1b[1m${entry.alias}\x1b[0;33m"\x1b[0m`);
                 showWhere(name, 33);
                 CR4SH = true;
-            } else if (entry.name !== name) {
-                console.log(`\x1b[33mArtist "\x1b[1m${name}\x1b[0;33m" should be named "\x1b[1m${entry.name}\x1b[0;33m"\x1b[0m`);
-                showWhere(name, 33);
-                CR4SH = true;
             } else {
                 buffer.push(entry);
                 if (buffer.length > 3) {