From 934f4971186f279b51939aad79bbb133e485b704 Mon Sep 17 00:00:00 2001 From: Borewit Date: Sat, 14 Jul 2018 11:15:23 +0200 Subject: [PATCH 1/6] Update music-metadata dependency: v2.0.1 => v2.3.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 05f89c04..8d130093 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.0.1", + "music-metadata": "^2.3.2", "network-address": "^1.1.0", "parse-torrent": "^6.0.1", "prettier-bytes": "^1.0.1", From 82ea41c1a125670f23613515b6ef6c56f60dfb67 Mon Sep 17 00:00:00 2001 From: Borewit Date: Tue, 17 Jul 2018 21:02:06 +0200 Subject: [PATCH 2/6] Round bit-rate to kbps & sample rate to 1/10 of kHz. Update music-metadata to 2.4.0. --- package.json | 2 +- src/renderer/pages/player-page.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8d130093..dd5a759c 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.3.2", + "music-metadata": "^2.4.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 cf7de1cd..7fb81144 100644 --- a/src/renderer/pages/player-page.js +++ b/src/renderer/pages/player-page.js @@ -286,10 +286,10 @@ function renderAudioMetadata (state) { format.push(fileSummary.audioInfo.format.dataformat) } if (fileSummary.audioInfo.format.bitrate) { - format.push(fileSummary.audioInfo.format.bitrate / 1000 + ' kbps') + format.push(Math.round(fileSummary.audioInfo.format.bitrate / 1000) + ' kbps') // 128 kbps } if (fileSummary.audioInfo.format.sampleRate) { - format.push(fileSummary.audioInfo.format.sampleRate / 1000 + ' kHz') + format.push(Math.round(fileSummary.audioInfo.format.sampleRate / 100) / 10 + ' kHz') // 44.1 kHz } if (fileSummary.audioInfo.format.bitsPerSample) { format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit') From 715a7846f7a7a1cd78bec33bf8df4ad96aaf94a2 Mon Sep 17 00:00:00 2001 From: Borewit Date: Sat, 21 Jul 2018 14:09:14 +0200 Subject: [PATCH 3/6] Bump version to 2.4.2: improve m4a handling. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dd5a759c..1a07d4f6 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.0", + "music-metadata": "^2.4.2", "network-address": "^1.1.0", "parse-torrent": "^6.0.1", "prettier-bytes": "^1.0.1", From cf8c1654e86086303a1de636cfd909aad96f5a8f Mon Sep 17 00:00:00 2001 From: Borewit Date: Sat, 21 Jul 2018 14:10:23 +0200 Subject: [PATCH 4/6] Add extension for MP4 audio book. --- src/renderer/lib/torrent-poster.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/lib/torrent-poster.js b/src/renderer/lib/torrent-poster.js index 8672f3fb..e41dd5d5 100644 --- a/src/renderer/lib/torrent-poster.js +++ b/src/renderer/lib/torrent-poster.js @@ -4,7 +4,7 @@ const captureFrame = require('capture-frame') const path = require('path') const mediaExtensions = { - audio: ['.aac', '.asf', '.flac', '.m2a', '.m4a', '.mp2', '.mp4', '.mp3', '.oga', '.ogg', '.opus', + audio: ['.aac', '.asf', '.flac', '.m2a', '.m4a', '.m4b', '.mp2', '.mp4', '.mp3', '.oga', '.ogg', '.opus', '.wma', '.wav', '.wv', '.wvp'], video: ['.mp4', '.m4v', '.webm', '.mov', '.mkv'], image: ['.gif', '.jpg', '.jpeg', '.png'] From a5d946fe8380f60e8687e965bcae002a8561259a Mon Sep 17 00:00:00 2001 From: Alberto Miranda Date: Sun, 22 Jul 2018 16:17:34 -0300 Subject: [PATCH 5/6] Ensure we get proper audio metadata. --- src/renderer/controllers/playback-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/controllers/playback-controller.js b/src/renderer/controllers/playback-controller.js index b26ecf5f..1144076c 100644 --- a/src/renderer/controllers/playback-controller.js +++ b/src/renderer/controllers/playback-controller.js @@ -292,7 +292,7 @@ module.exports = class PlaybackController { } function getAudioMetadata () { - if (state.playing.type === 'audio' && !fileSummary.audioInfo) { + if (state.playing.type === 'audio') { ipcRenderer.send('wt-get-audio-metadata', torrentSummary.infoHash, index) } } From 6ed7ec35a44ea1ca4cc5a71addb3f06b13d5eeb0 Mon Sep 17 00:00:00 2001 From: Alberto Miranda Date: Sun, 22 Jul 2018 16:58:28 -0300 Subject: [PATCH 6/6] Fixed styling. --- src/renderer/lib/torrent-poster.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/renderer/lib/torrent-poster.js b/src/renderer/lib/torrent-poster.js index e41dd5d5..d0b555b6 100644 --- a/src/renderer/lib/torrent-poster.js +++ b/src/renderer/lib/torrent-poster.js @@ -4,8 +4,10 @@ const captureFrame = require('capture-frame') const path = require('path') const mediaExtensions = { - audio: ['.aac', '.asf', '.flac', '.m2a', '.m4a', '.m4b', '.mp2', '.mp4', '.mp3', '.oga', '.ogg', '.opus', - '.wma', '.wav', '.wv', '.wvp'], + audio: [ + '.aac', '.asf', '.flac', '.m2a', '.m4a', '.m4b', '.mp2', '.mp4', + '.mp3', '.oga', '.ogg', '.opus', '.wma', '.wav', '.wv', '.wvp' + ], video: ['.mp4', '.m4v', '.webm', '.mov', '.mkv'], image: ['.gif', '.jpg', '.jpeg', '.png'] }