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

Merge branch 'filename' into feature/improve-audio-torrent-poster-selection

Browse Source
This commit is contained in:
Borewit
2018-04-20 07:44:51 +02:00
parent 57c1a97ebf c688313239
commit 4752c2e689
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,7 +207,7 @@ function renderOverlay (state) {
function renderAudioMetadata (state) { function renderAudioMetadata (state) {
const fileSummary = state.getPlayingFileSummary() const fileSummary = state.getPlayingFileSummary()
if (!fileSummary.audioInfo) return if (!fileSummary.audioInfo) return
const common = fileSummary.audioInfo.common const common = fileSummary.audioInfo.common || {}
// Get audio track info // Get audio track info
const title = common.title ? common.title : fileSummary.name const title = common.title ? common.title : fileSummary.name
@@ -273,6 +273,7 @@ function renderAudioMetadata (state) {
// Audio metadata: format // Audio metadata: format
const format = [] const format = []
fileSummary.audioInfo.format = fileSummary.audioInfo.format || ''
if (fileSummary.audioInfo.format.dataformat) { if (fileSummary.audioInfo.format.dataformat) {
format.push(fileSummary.audioInfo.format.dataformat) format.push(fileSummary.audioInfo.format.dataformat)
} }

4
src/renderer/webtorrent.js
View File

@@ -340,6 +340,10 @@ function getAudioMetadata (infoHash, index) {
const torrent = client.get(infoHash) const torrent = client.get(infoHash)
const file = torrent.files[index] const file = torrent.files[index]
// Set initial matadata to display the filename first.
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}
const onMetaData = file.done const onMetaData = file.done
// If completed; use direct file access // If completed; use direct file access