Merge pull request #1396 from webtorrent/greenkeeper/music-metadata-1.0.0

Update music-metadata to the latest version 🚀

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",

src/renderer/pages/player-page.js

@@ -248,15 +248,23 @@ 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((
       <div key='release' className='audio-release'>
-        <label>Release</label>{ releaseInfo.join(' / ') }
+        <label>Release</label>{ releaseInfo.join(', ') }
       </div>
     ))
   }