Asynchronous music-metadata updates while streaming

package.json

@@ -32,7 +32,7 @@
     "location-history": "^1.0.0",
     "material-ui": "^0.17.0",
     "mkdirp": "^0.5.1",
-    "music-metadata": "^2.4.2",
+    "music-metadata": "^3.1.0",
     "network-address": "^1.1.0",
     "parse-torrent": "^6.0.1",
     "prettier-bytes": "^1.0.1",

src/renderer/pages/player-page.js

@@ -204,6 +204,28 @@ function renderOverlay (state) {
   )
 }
 
+/**
+ * Render track or disk number string
+ * @param common metadata.common part
+ * @param key should be either 'track' or 'disk'
+ * @return track or disk number metadata as JSX block
+ */
+function renderTrack (common, key) {
+  // Audio metadata: track-number
+  if (common[key] && common[key].no) {
+    let str = `${common[key].no}`
+    if (common[key].of) {
+      str += ` of ${common[key].of}`
+    }
+    const style = { textTransform: 'capitalize' }
+    return (
+      <div className={`audio-${key}`}>
+        <label style={style}>{key}</label> {str}
+      </div>
+    )
+  }
+}
+
 function renderAudioMetadata (state) {
   const fileSummary = state.getPlayingFileSummary()
   if (!fileSummary.audioInfo) return
@@ -216,9 +238,7 @@ function renderAudioMetadata (state) {
   const elems = []
 
   // Audio metadata: artist(s)
-  const artist = common.albumartist || common.artist ||
-    (common.artists && common.artists.filter(function (a) { return a }).join(', ')) ||
-    '(Unknown Artist)'
+  const artist = common.artist || common.albumartist
   if (artist) {
     elems.push((
       <div key='artist' className='audio-artist'>
@@ -227,6 +247,15 @@ function renderAudioMetadata (state) {
     ))
   }
 
+  // Audio metadata: disk & track-number
+  const count = ['track', 'disk']
+  count.forEach(key => {
+    const nrElem = renderTrack(common, key)
+    if (nrElem) {
+      elems.push(nrElem)
+    }
+  })
+
   // Audio metadata: album
   if (common.album) {
     elems.push((
@@ -269,16 +298,6 @@ function renderAudioMetadata (state) {
     ))
   }
 
-  // Audio metadata: track-number
-  if (common.track && common.track.no && common.track.of) {
-    const track = common.track.no + ' of ' + common.track.of
-    elems.push((
-      <div key='track' className='audio-track'>
-        <label>Track</label>{track}
-      </div>
-    ))
-  }
-
   // Audio metadata: format
   const format = []
   fileSummary.audioInfo.format = fileSummary.audioInfo.format || ''

src/renderer/webtorrent.js

@@ -345,17 +345,21 @@ function getAudioMetadata (infoHash, index) {
   const metadata = { title: file.name }
   ipc.send('wt-audio-metadata', infoHash, index, metadata)
 
-  const options = { native: false, skipCovers: true, fileSize: file.length }
+  const options = { native: false,
+    skipCovers: true,
+    fileSize: file.length,
+    observer: event => {
+      ipc.send('wt-audio-metadata', infoHash, index, event.metadata)
+    } }
   const onMetaData = file.done
     // If completed; use direct file access
     ? mm.parseFile(path.join(torrent.path, file.path), options)
     // otherwise stream
     : mm.parseStream(file.createReadStream(), file.name, options)
 
   onMetaData
-    .then(function (metadata) {
-      console.log('got audio metadata for %s (length=%s): %o', file.name, file.length, metadata)
-      ipc.send('wt-audio-metadata', infoHash, index, metadata)
+    .then(() => {
+      console.log(`metadata for file='${file.name}' completed.`)
     }).catch(function (err) {
       return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
     })