From 4438c9c85f2af77743bd10f0cc6f66a80eb4dd39 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 16 May 2018 18:25:57 +0000 Subject: [PATCH 1/3] fix(package): update music-metadata to version 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From eb4007aa87e9e344c1526bdd5fcb315e43e40beb Mon Sep 17 00:00:00 2001 From: Borewit Date: Wed, 16 May 2018 21:23:34 +0200 Subject: [PATCH 2/3] 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(', ') }
)) } From 6df718aa4ac0a332958dd131bbad9ae2cff2c4fb Mon Sep 17 00:00:00 2001 From: Borewit Date: Wed, 16 May 2018 21:31:48 +0200 Subject: [PATCH 3/3] Fix code style --- src/renderer/pages/player-page.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/renderer/pages/player-page.js b/src/renderer/pages/player-page.js index ccbdf07e..cf7de1cd 100644 --- a/src/renderer/pages/player-page.js +++ b/src/renderer/pages/player-page.js @@ -248,7 +248,8 @@ function renderAudioMetadata (state) { // Audio metadata: release information (label & catalog-number) if (common.label || common.catalognumber) { const releaseInfo = [] - if (common.label && common.catalognumber && common.label.length === common.catalognumber.length) { + 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])