From eb4007aa87e9e344c1526bdd5fcb315e43e40beb Mon Sep 17 00:00:00 2001 From: Borewit Date: Wed, 16 May 2018 21:23:34 +0200 Subject: [PATCH] Update dependency music-metadata v1.0.0 Multiplicity of common.label & common.catalog-number number changed. Added possibility to visualize multiple labels & catalog-number in pairs. --- package.json | 2 +- src/renderer/pages/player-page.js | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 23190996..c4dcfebc 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "location-history": "^1.0.0", "material-ui": "^0.17.0", "mkdirp": "^0.5.1", - "music-metadata": "^0.11.2", + "music-metadata": "^1.0.0", "network-address": "^1.1.0", "parse-torrent": "^5.7.3", "prettier-bytes": "^1.0.1", diff --git a/src/renderer/pages/player-page.js b/src/renderer/pages/player-page.js index 713ac697..ccbdf07e 100644 --- a/src/renderer/pages/player-page.js +++ b/src/renderer/pages/player-page.js @@ -248,15 +248,22 @@ function renderAudioMetadata (state) { // Audio metadata: release information (label & catalog-number) if (common.label || common.catalognumber) { const releaseInfo = [] - if (common.label) { - releaseInfo.push(common.label) - } - if (common.catalognumber) { - releaseInfo.push(common.catalognumber) + if (common.label && common.catalognumber && common.label.length === common.catalognumber.length) { + // Assume labels & catalog-numbers are pairs + for (let n = 0; n < common.label.length; ++n) { + releaseInfo.push(common.label[0] + ' / ' + common.catalognumber[n]) + } + } else { + if (common.label) { + releaseInfo.push(...common.label) + } + if (common.catalognumber) { + releaseInfo.push(...common.catalognumber) + } } elems.push((
- { releaseInfo.join(' / ') } + { releaseInfo.join(', ') }
)) }