From 084b5423d2a4fc60a91dd4aeb24ff0cd4d870fbc Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Tue, 28 Nov 2023 13:04:32 -0400
Subject: data: tweak track album messaging in errors/inspect
---
src/data/things/track.js | 13 +++++++++++--
src/data/yaml.js | 3 +--
2 files changed, 12 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/data/things/track.js b/src/data/things/track.js
index f6320677..d25213c2 100644
--- a/src/data/things/track.js
+++ b/src/data/things/track.js
@@ -331,12 +331,21 @@ export class Track extends Thing {
}
let album;
- if (depth >= 0 && (album = this.album ?? this.dataSourceAlbum)) {
+
+ if (depth >= 0) {
+ try {
+ album = this.album;
+ } catch (_error) {}
+
+ album ??= this.dataSourceAlbum;
+ }
+
+ if (album) {
const albumName = album.name;
const albumIndex = album.tracks.indexOf(this);
const trackNum =
(albumIndex === -1
- ? '#?'
+ ? 'indeterminate position'
: `#${albumIndex + 1}`);
parts.push(` (${colors.yellow(trackNum)} in ${colors.green(albumName)})`);
}
diff --git a/src/data/yaml.js b/src/data/yaml.js
index dda06949..27d8721f 100644
--- a/src/data/yaml.js
+++ b/src/data/yaml.js
@@ -1625,8 +1625,7 @@ export function filterDuplicateDirectories(wikiData) {
call(() => {
throw new Error(
`Duplicate directory ${colors.green(directory)}:\n` +
- places.map((thing) => ` - ` + inspect(thing)).join('\n')
- );
+ places.map(thing => ` - ` + inspect(thing)).join('\n'));
});
}
--
cgit 1.3.0-6-gf8a5