kalugin66/webtorrent-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Update music-metadata to the latest version 🚀
This commit is contained in:
Borewit
2018-05-23 07:20:44 +02:00
committed by GitHub
parent 7b72dfafc2 55a60018b5
commit 61648db0fc
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

20
src/renderer/pages/player-page.js
View File

@@ -248,15 +248,23 @@ function renderAudioMetadata (state) {
// Audio metadata: release information (label & catalog-number) // Audio metadata: release information (label & catalog-number)
if (common.label || common.catalognumber) { if (common.label || common.catalognumber) {
const releaseInfo = [] const releaseInfo = []
if (common.label) { if (common.label && common.catalognumber &&
releaseInfo.push(common.label) common.label.length === common.catalognumber.length) {
} // Assume labels & catalog-numbers are pairs
if (common.catalognumber) { for (let n = 0; n < common.label.length; ++n) {
releaseInfo.push(common.catalognumber) 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(( elems.push((
<div key='release' className='audio-release'> <div key='release' className='audio-release'>
<label>Release</label>{ releaseInfo.join(' / ') } <label>Release</label>{ releaseInfo.join(', ') }
</div> </div>
)) ))
} }