diff --git a/package.json b/package.json index d952e2e2..760fe425 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": "^2.4.2", + "music-metadata": "^3.1.0", "network-address": "^1.1.0", "parse-torrent": "^6.0.1", "prettier-bytes": "^1.0.1", diff --git a/src/renderer/pages/player-page.js b/src/renderer/pages/player-page.js index 826d7aeb..5996241b 100644 --- a/src/renderer/pages/player-page.js +++ b/src/renderer/pages/player-page.js @@ -238,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((
diff --git a/src/renderer/webtorrent.js b/src/renderer/webtorrent.js index bd73b733..38d48b24 100644 --- a/src/renderer/webtorrent.js +++ b/src/renderer/webtorrent.js @@ -345,7 +345,12 @@ 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) @@ -353,9 +358,8 @@ function getAudioMetadata (infoHash, index) { : 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) })