Compare commits
71 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fbb3fa6a27 | ||
|
|
e10debed2f | ||
|
|
437dd3adb1 | ||
|
|
e48191381e | ||
|
|
abb7c72b84 | ||
|
|
20d9ea5a00 | ||
|
|
0da29e4eb2 | ||
|
|
10f92c78eb | ||
|
|
924dbeeebb | ||
|
|
3c363595ce | ||
|
|
695154099d | ||
|
|
21edc05f19 | ||
|
|
cf729b0d31 | ||
|
|
74b806737d | ||
|
|
88cbcc2959 | ||
|
|
eab15876cc | ||
|
|
c6a7b7c1d2 | ||
|
|
7f2c91b230 | ||
|
|
dab0802a88 | ||
|
|
34f06267b8 | ||
|
|
99062175eb | ||
|
|
f47055c51b | ||
|
|
4752c2e689 | ||
|
|
57c1a97ebf | ||
|
|
793ccebf0b | ||
|
|
c688313239 | ||
|
|
afd7f6ef0a | ||
|
|
cc78251846 | ||
|
|
30693d7d16 | ||
|
|
bd2fbe60db | ||
|
|
a114a22770 | ||
|
|
8d657d93e0 | ||
|
|
5802cd3591 | ||
|
|
2d17cfa7e1 | ||
|
|
cf2a3b8948 | ||
|
|
b89a74e6e9 | ||
|
|
9b74602119 | ||
|
|
34463d9084 | ||
|
|
3dcab9e78b | ||
|
|
fce0003912 | ||
|
|
c720f65fee | ||
|
|
a725726e25 | ||
|
|
e5a64d9550 | ||
|
|
0572f8a932 | ||
|
|
23d37d7da1 | ||
|
|
474654fd16 | ||
|
|
070d3ff242 | ||
|
|
d5a62cb1a7 | ||
|
|
ba1f82faa0 | ||
|
|
0cce110c52 | ||
|
|
bc91cde244 | ||
|
|
30c9934694 | ||
|
|
f56f3c62e9 | ||
|
|
ac180a7cc5 | ||
|
|
d1f3a16b7f | ||
|
|
e6c495417b | ||
|
|
c301608881 | ||
|
|
7d2290a773 | ||
|
|
ba0d0b755e | ||
|
|
b5e9923469 | ||
|
|
b5bbd9b6a5 | ||
|
|
06a7eff0ab | ||
|
|
341333c287 | ||
|
|
0f00985b75 | ||
|
|
c11a86d849 | ||
|
|
52e16c33b4 | ||
|
|
54e15644b6 | ||
|
|
6aa3a6c660 | ||
|
|
83350b3b57 | ||
|
|
8868128d6e | ||
|
|
96f5f855a3 |
@@ -38,9 +38,14 @@
|
||||
- Karan Thakkar (karanjthakkar@gmail.com)
|
||||
- Nuno Campos (nuno.campos@me.com)
|
||||
- Ebrahim Byagowi (ebrahim@gnu.org)
|
||||
- Josip Janzic (josip@jjanzic.com)
|
||||
- Emil Bay (github@tixz.dk)
|
||||
- Borewit (borewit@users.noreply.github.com)
|
||||
- greenkeeper[bot] (greenkeeper[bot]@users.noreply.github.com)
|
||||
- Auyer (rafa_auyer@icloud.com)
|
||||
- SimplyAhmazing (ahmad19526@gmail.com)
|
||||
- Cezar Carneiro (cezargcarneiro@gmail.com)
|
||||
- Terry Hau (terryhau@gmail.com)
|
||||
- Vítor Galvão (info@vitorgalvao.com)
|
||||
|
||||
#### Generated by bin/update-authors.sh.
|
||||
|
||||
18
CHANGELOG.md
@@ -1,5 +1,21 @@
|
||||
# WebTorrent Desktop Version History
|
||||
|
||||
## v0.20.0 - 2018-04-26
|
||||
|
||||
### Added
|
||||
|
||||
- Added support for additional audio extensions: 'aiff', 'ape', 'mp2', 'oga', 'opus', 'wma' (#1240)
|
||||
|
||||
### Changed
|
||||
|
||||
- Displaying filename while music metadata is being downloaded (#1361)
|
||||
- Improved the poster selection for audio/music based torrents (#1334)
|
||||
- Launch VLC player without the `--video-on-top` flag (#1286)
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fix silently failing to open magnets links on Linux (#1367)
|
||||
|
||||
## v0.19.0 - 2018-01-26
|
||||
|
||||
### Added
|
||||
@@ -9,7 +25,7 @@
|
||||
- Add pinch-to-zoom gesture to enter/exit fullscreen (#1148)
|
||||
|
||||
### Changed
|
||||
- [SECURITY] Mitigate
|
||||
- [SECURITY] Mitigate Electron protocol handler issue (Windows)
|
||||
- Moved project from Feross's GitHub account to the WebTorrent GitHub organization
|
||||
- Updated to electron@1.6.16
|
||||
- Updated to material-ui@0.17
|
||||
|
||||
@@ -22,7 +22,11 @@
|
||||
|
||||
Download the latest version of WebTorrent Desktop from
|
||||
[the official website](https://webtorrent.io/desktop/) or the
|
||||
[GitHub releases](https://github.com/webtorrent/webtorrent-desktop/releases) page.
|
||||
[GitHub releases](https://github.com/webtorrent/webtorrent-desktop/releases) page. Alternatively, you can install it with [Homebrew-Cask](https://github.com/caskroom/homebrew-cask):
|
||||
|
||||
```
|
||||
$ brew cask install webtorrent
|
||||
```
|
||||
|
||||
**WebTorrent Desktop** is under very active development. You can try out the
|
||||
current (unstable) development version by cloning the Git repo. See the
|
||||
|
||||
@@ -449,51 +449,51 @@ function buildWin32 (cb) {
|
||||
usePackageJson: false,
|
||||
version: pkg.version
|
||||
})
|
||||
.then(function () {
|
||||
console.log(`Windows: Created ${destArch} installer.`)
|
||||
.then(function () {
|
||||
console.log(`Windows: Created ${destArch} installer.`)
|
||||
|
||||
/**
|
||||
/**
|
||||
* Delete extraneous Squirrel files (i.e. *.nupkg delta files for older
|
||||
* versions of the app)
|
||||
*/
|
||||
fs.readdirSync(DIST_PATH)
|
||||
.filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
|
||||
.forEach((filename) => {
|
||||
fs.unlinkSync(path.join(DIST_PATH, filename))
|
||||
})
|
||||
fs.readdirSync(DIST_PATH)
|
||||
.filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
|
||||
.forEach((filename) => {
|
||||
fs.unlinkSync(path.join(DIST_PATH, filename))
|
||||
})
|
||||
|
||||
if (destArch === 'ia32') {
|
||||
console.log('Windows: Renaming ia32 installer files...')
|
||||
if (destArch === 'ia32') {
|
||||
console.log('Windows: Renaming ia32 installer files...')
|
||||
|
||||
// RELEASES -> RELEASES-ia32
|
||||
const relPath = path.join(DIST_PATH, 'RELEASES-ia32')
|
||||
fs.renameSync(
|
||||
path.join(DIST_PATH, 'RELEASES'),
|
||||
relPath
|
||||
)
|
||||
// RELEASES -> RELEASES-ia32
|
||||
const relPath = path.join(DIST_PATH, 'RELEASES-ia32')
|
||||
fs.renameSync(
|
||||
path.join(DIST_PATH, 'RELEASES'),
|
||||
relPath
|
||||
)
|
||||
|
||||
// WebTorrent-vX.X.X-full.nupkg -> WebTorrent-vX.X.X-ia32-full.nupkg
|
||||
fs.renameSync(
|
||||
path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-full.nupkg`),
|
||||
path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-ia32-full.nupkg`)
|
||||
)
|
||||
// WebTorrent-vX.X.X-full.nupkg -> WebTorrent-vX.X.X-ia32-full.nupkg
|
||||
fs.renameSync(
|
||||
path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-full.nupkg`),
|
||||
path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-ia32-full.nupkg`)
|
||||
)
|
||||
|
||||
// Change file name inside RELEASES-ia32 to match renamed file
|
||||
const relContent = fs.readFileSync(relPath, 'utf8')
|
||||
const relContent32 = relContent.replace('full.nupkg', 'ia32-full.nupkg')
|
||||
fs.writeFileSync(relPath, relContent32)
|
||||
// Change file name inside RELEASES-ia32 to match renamed file
|
||||
const relContent = fs.readFileSync(relPath, 'utf8')
|
||||
const relContent32 = relContent.replace('full.nupkg', 'ia32-full.nupkg')
|
||||
fs.writeFileSync(relPath, relContent32)
|
||||
|
||||
if (relContent === relContent32) {
|
||||
if (relContent === relContent32) {
|
||||
// Sanity check
|
||||
throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
|
||||
throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
|
||||
}
|
||||
|
||||
console.log('Windows: Renamed ia32 installer files.')
|
||||
}
|
||||
|
||||
console.log('Windows: Renamed ia32 installer files.')
|
||||
}
|
||||
|
||||
cb(null)
|
||||
})
|
||||
.catch(cb)
|
||||
cb(null)
|
||||
})
|
||||
.catch(cb)
|
||||
}
|
||||
|
||||
function packagePortable (filesPath, destArch, cb) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "webtorrent-desktop",
|
||||
"description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
|
||||
"version": "0.19.0",
|
||||
"version": "0.20.0",
|
||||
"author": {
|
||||
"name": "WebTorrent, LLC",
|
||||
"email": "feross@webtorrent.io",
|
||||
@@ -32,7 +32,7 @@
|
||||
"location-history": "^1.0.0",
|
||||
"material-ui": "^0.17.0",
|
||||
"mkdirp": "^0.5.1",
|
||||
"musicmetadata": "^2.0.2",
|
||||
"music-metadata": "^0.9.15",
|
||||
"network-address": "^1.1.0",
|
||||
"parse-torrent": "^5.7.3",
|
||||
"prettier-bytes": "^1.0.1",
|
||||
@@ -51,7 +51,7 @@
|
||||
"zero-fill": "^2.2.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"buble": "^0.15.2",
|
||||
"buble": "^0.19.3",
|
||||
"cross-zip": "^2.0.1",
|
||||
"depcheck": "^0.6.4",
|
||||
"electron": "1.6.16",
|
||||
|
||||
@@ -29,7 +29,6 @@ function spawn (playerPath, url, title) {
|
||||
if (err) return windows.main.dispatch('externalPlayerNotFound')
|
||||
const args = [
|
||||
'--play-and-exit',
|
||||
'--video-on-top',
|
||||
'--quiet',
|
||||
`--meta-title=${JSON.stringify(title)}`,
|
||||
url
|
||||
|
||||
@@ -188,7 +188,7 @@ function onAppOpen (newArgv) {
|
||||
function sliceArgv (argv) {
|
||||
return argv.slice(config.IS_PRODUCTION ? 1
|
||||
: config.IS_TEST ? 4
|
||||
: 2)
|
||||
: 2)
|
||||
}
|
||||
|
||||
function processArgv (argv) {
|
||||
|
||||
@@ -102,10 +102,10 @@ module.exports = class PlaybackController {
|
||||
const state = this.state
|
||||
if (Playlist.hasNext(state) && state.playing.location !== 'external') {
|
||||
this.updatePlayer(
|
||||
state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
|
||||
if (err) dispatch('error', err)
|
||||
else this.play()
|
||||
})
|
||||
state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
|
||||
if (err) dispatch('error', err)
|
||||
else this.play()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ module.exports = class PlaybackController {
|
||||
state.playing.fileIndex = index
|
||||
state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
|
||||
: TorrentPlayer.isAudio(fileSummary) ? 'audio'
|
||||
: 'other'
|
||||
: 'other'
|
||||
|
||||
// pick up where we left off
|
||||
let jumpToTime = 0
|
||||
|
||||
@@ -157,23 +157,24 @@ module.exports = class TorrentListController {
|
||||
|
||||
prioritizeTorrent (infoHash) {
|
||||
this.state.saved.torrents
|
||||
.filter((torrent) => { // We're interested in active torrents only.
|
||||
return (['downloading', 'seeding'].indexOf(torrent.status) !== -1)
|
||||
})
|
||||
.map((torrent) => { // Pause all active torrents except the one that started playing.
|
||||
if (infoHash === torrent.infoHash) return
|
||||
.filter((torrent) => { // We're interested in active torrents only.
|
||||
return (['downloading', 'seeding'].indexOf(torrent.status) !== -1)
|
||||
})
|
||||
.map((torrent) => { // Pause all active torrents except the one that started playing.
|
||||
if (infoHash === torrent.infoHash) return
|
||||
|
||||
// Pause torrent without playing sounds.
|
||||
this.pauseTorrent(torrent, false)
|
||||
// Pause torrent without playing sounds.
|
||||
this.pauseTorrent(torrent, false)
|
||||
|
||||
this.state.saved.torrentsToResume.push(torrent.infoHash)
|
||||
})
|
||||
this.state.saved.torrentsToResume.push(torrent.infoHash)
|
||||
})
|
||||
|
||||
console.log('Playback Priority: paused torrents: ', this.state.saved.torrentsToResume)
|
||||
}
|
||||
|
||||
resumePausedTorrents () {
|
||||
console.log('Playback Priority: resuming paused torrents')
|
||||
if (!this.state.saved.torrentsToResume || !this.state.saved.torrentsToResume.length) return
|
||||
this.state.saved.torrentsToResume.map((infoHash) => {
|
||||
this.toggleTorrent(infoHash)
|
||||
})
|
||||
|
||||
@@ -123,7 +123,8 @@ function setupStateSaved (cb) {
|
||||
externalPlayerPath: null,
|
||||
startup: false,
|
||||
autoAddTorrents: false,
|
||||
torrentsFolderPath: ''
|
||||
torrentsFolderPath: '',
|
||||
highestPlaybackPriority: true
|
||||
},
|
||||
torrents: config.DEFAULT_TORRENTS.map(createTorrentObject),
|
||||
torrentsToResume: [],
|
||||
|
||||
@@ -33,12 +33,18 @@ function isVideo (file) {
|
||||
function isAudio (file) {
|
||||
return [
|
||||
'.aac',
|
||||
'.aiff',
|
||||
'.ape',
|
||||
'.ac3',
|
||||
'.mp3',
|
||||
'.ogg',
|
||||
'.wav',
|
||||
'.flac',
|
||||
'.m4a'
|
||||
'.m4a',
|
||||
'.mp2',
|
||||
'.mp3',
|
||||
'.oga',
|
||||
'.ogg',
|
||||
'.opus',
|
||||
'.wav',
|
||||
'.wma'
|
||||
].includes(getFileExtension(file))
|
||||
}
|
||||
|
||||
|
||||
@@ -3,39 +3,145 @@ module.exports = torrentPoster
|
||||
const captureFrame = require('capture-frame')
|
||||
const path = require('path')
|
||||
|
||||
const mediaExtensions = {
|
||||
audio: ['.aac', '.asf', '.flac', '.m2a', '.m4a', '.mp2', '.mp4', '.mp3', '.oga', '.ogg', '.opus',
|
||||
'.wma', '.wav', '.wv', '.wvp'],
|
||||
video: ['.mp4', '.m4v', '.webm', '.mov', '.mkv'],
|
||||
image: ['.gif', '.jpg', '.jpeg', '.png']
|
||||
}
|
||||
|
||||
function torrentPoster (torrent, cb) {
|
||||
// First, try to use a poster image if available
|
||||
const posterFile = torrent.files.filter(function (file) {
|
||||
return /^poster\.(jpg|png|gif)$/.test(file.name)
|
||||
})[0]
|
||||
if (posterFile) return torrentPosterFromImage(posterFile, torrent, cb)
|
||||
if (posterFile) return extractPoster(posterFile, cb)
|
||||
|
||||
// Second, try to use the largest video file
|
||||
// Filter out file formats that the <video> tag definitely can't play
|
||||
const videoFile = getLargestFileByExtension(torrent, ['.mp4', '.m4v', '.webm', '.mov', '.mkv'])
|
||||
if (videoFile) return torrentPosterFromVideo(videoFile, torrent, cb)
|
||||
// 'score' each media type based on total size present in torrent
|
||||
const bestScore = ['audio', 'video', 'image'].map(mediaType => {
|
||||
return {
|
||||
type: mediaType,
|
||||
size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType])}
|
||||
}).sort((a, b) => { // sort descending on size
|
||||
return b.size - a.size
|
||||
})[0]
|
||||
|
||||
// Third, try to use the largest image file
|
||||
const imgFile = getLargestFileByExtension(torrent, ['.gif', '.jpg', '.jpeg', '.png'])
|
||||
if (imgFile) return torrentPosterFromImage(imgFile, torrent, cb)
|
||||
if (bestScore.size === 0) {
|
||||
// Admit defeat, no video, audio or image had a significant presence
|
||||
return cb(new Error('Cannot generate a poster from any files in the torrent'))
|
||||
}
|
||||
|
||||
// TODO: generate a waveform from the largest sound file
|
||||
// Finally, admit defeat
|
||||
return cb(new Error('Cannot generate a poster from any files in the torrent'))
|
||||
// Based on which media type is dominant we select the corresponding poster function
|
||||
switch (bestScore.type) {
|
||||
case 'audio':
|
||||
return torrentPosterFromAudio(torrent, cb)
|
||||
case 'image':
|
||||
return torrentPosterFromImage(torrent, cb)
|
||||
case 'video':
|
||||
return torrentPosterFromVideo(torrent, cb)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculate the total data size of file matching one of the provided extensions
|
||||
* @param torrent
|
||||
* @param extensions List of extension to match
|
||||
* @returns {number} total size, of matches found (>= 0)
|
||||
*/
|
||||
function calculateDataLengthByExtension (torrent, extensions) {
|
||||
const files = filterOnExtension(torrent, extensions)
|
||||
if (files.length === 0) return 0
|
||||
return files
|
||||
.map(file => file.length)
|
||||
.reduce((a, b) => {
|
||||
return a + b
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the largest file of a given torrent, filtered by provided extension
|
||||
* @param torrent Torrent to search in
|
||||
* @param extensions Extension whitelist filter
|
||||
* @returns Torrent file object
|
||||
*/
|
||||
function getLargestFileByExtension (torrent, extensions) {
|
||||
const files = torrent.files.filter(function (file) {
|
||||
const extname = path.extname(file.name).toLowerCase()
|
||||
return extensions.indexOf(extname) !== -1
|
||||
})
|
||||
const files = filterOnExtension(torrent, extensions)
|
||||
if (files.length === 0) return undefined
|
||||
return files.reduce(function (a, b) {
|
||||
return files.reduce((a, b) => {
|
||||
return a.length > b.length ? a : b
|
||||
})
|
||||
}
|
||||
|
||||
function torrentPosterFromVideo (file, torrent, cb) {
|
||||
/**
|
||||
* Filter file on a list extension, can be used to find al image files
|
||||
* @param torrent Torrent to filter files from
|
||||
* @param extensions File extensions to filter on
|
||||
* @returns {number} Array of torrent file objects matching one of the given extensions
|
||||
*/
|
||||
function filterOnExtension (torrent, extensions) {
|
||||
return torrent.files.filter(file => {
|
||||
const extname = path.extname(file.name).toLowerCase()
|
||||
return extensions.indexOf(extname) !== -1
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a score how likely the file is suitable as a poster
|
||||
* @param imgFile File object of an image
|
||||
* @returns {number} Score, higher score is a better match
|
||||
*/
|
||||
function scoreAudioCoverFile (imgFile) {
|
||||
const fileName = path.basename(imgFile.name, path.extname(imgFile.name)).toLowerCase()
|
||||
const relevanceScore = {
|
||||
cover: 80,
|
||||
folder: 80,
|
||||
album: 80,
|
||||
front: 80,
|
||||
back: 20
|
||||
}
|
||||
|
||||
for (let keyword in relevanceScore) {
|
||||
if (fileName === keyword) {
|
||||
return relevanceScore[keyword]
|
||||
}
|
||||
if (fileName.indexOf(keyword) !== -1) {
|
||||
return 0.8 * relevanceScore[keyword]
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
function torrentPosterFromAudio (torrent, cb) {
|
||||
const imageFiles = filterOnExtension(torrent, mediaExtensions.image)
|
||||
|
||||
const bestCover = imageFiles.map(file => {
|
||||
return {
|
||||
file: file,
|
||||
score: scoreAudioCoverFile(file)
|
||||
}
|
||||
}).reduce((a, b) => {
|
||||
if (a.score > b.score) {
|
||||
return a
|
||||
}
|
||||
if (b.score > a.score) {
|
||||
return b
|
||||
}
|
||||
// If score is equal, pick the largest file, aiming for highest resolution
|
||||
if (a.file.length > b.file.length) {
|
||||
return a
|
||||
}
|
||||
return b
|
||||
})
|
||||
|
||||
if (!bestCover) return cb(new Error('Generated poster contains no data'))
|
||||
|
||||
const extname = path.extname(bestCover.file.name)
|
||||
bestCover.file.getBuffer((err, buf) => cb(err, buf, extname))
|
||||
}
|
||||
|
||||
function torrentPosterFromVideo (torrent, cb) {
|
||||
const file = getLargestFileByExtension(torrent, mediaExtensions.video)
|
||||
|
||||
const index = torrent.files.indexOf(file)
|
||||
|
||||
const server = torrent.createServer(0)
|
||||
@@ -77,7 +183,12 @@ function torrentPosterFromVideo (file, torrent, cb) {
|
||||
}
|
||||
}
|
||||
|
||||
function torrentPosterFromImage (file, torrent, cb) {
|
||||
const extname = path.extname(file.name)
|
||||
file.getBuffer((err, buf) => cb(err, buf, extname))
|
||||
function torrentPosterFromImage (torrent, cb) {
|
||||
const file = getLargestFileByExtension(torrent, mediaExtensions.image)
|
||||
extractPoster(file, cb)
|
||||
}
|
||||
|
||||
function extractPoster (file, cb) {
|
||||
const extname = path.extname(file.name)
|
||||
file.getBuffer((err, buf) => { return cb(err, buf, extname) })
|
||||
}
|
||||
|
||||
@@ -459,6 +459,13 @@ function setDimensions (dimensions) {
|
||||
function onOpen (files) {
|
||||
if (!Array.isArray(files)) files = [ files ]
|
||||
|
||||
// File API seems to transform "magnet:?foo" in "magnet:///?foo"
|
||||
// this is a sanitization
|
||||
files = files.map(file => {
|
||||
if (typeof file !== 'string') return file
|
||||
return file.replace(/^magnet:\/+\?/i, 'magnet:?')
|
||||
})
|
||||
|
||||
const url = state.location.url()
|
||||
const allTorrents = files.every(TorrentPlayer.isTorrent)
|
||||
const allSubtitles = files.every(controllers.subtitles().isSubtitle)
|
||||
|
||||
@@ -207,25 +207,18 @@ function renderOverlay (state) {
|
||||
function renderAudioMetadata (state) {
|
||||
const fileSummary = state.getPlayingFileSummary()
|
||||
if (!fileSummary.audioInfo) return
|
||||
const info = fileSummary.audioInfo
|
||||
const common = fileSummary.audioInfo.common || {}
|
||||
|
||||
// Get audio track info
|
||||
let title = info.title
|
||||
if (!title) {
|
||||
title = fileSummary.name
|
||||
}
|
||||
let artist = info.artist && info.artist[0]
|
||||
let album = info.album
|
||||
if (album && info.year && !album.includes(info.year)) {
|
||||
album += ' (' + info.year + ')'
|
||||
}
|
||||
let track
|
||||
if (info.track && info.track.no && info.track.of) {
|
||||
track = info.track.no + ' of ' + info.track.of
|
||||
}
|
||||
const title = common.title ? common.title : fileSummary.name
|
||||
|
||||
// Show a small info box in the middle of the screen with title/album/etc
|
||||
const elems = []
|
||||
|
||||
// Audio metadata: artist(s)
|
||||
const artist = common.albumartist || common.artist ||
|
||||
(common.artists && common.artists.filter(function (a) { return a }).join(', ')) ||
|
||||
'(Unknown Artist)'
|
||||
if (artist) {
|
||||
elems.push((
|
||||
<div key='artist' className='audio-artist'>
|
||||
@@ -233,14 +226,44 @@ function renderAudioMetadata (state) {
|
||||
</div>
|
||||
))
|
||||
}
|
||||
if (album) {
|
||||
|
||||
// Audio metadata: album
|
||||
if (common.album) {
|
||||
elems.push((
|
||||
<div key='album' className='audio-album'>
|
||||
<label>Album</label>{album}
|
||||
<label>Album</label>{common.album}
|
||||
</div>
|
||||
))
|
||||
}
|
||||
if (track) {
|
||||
|
||||
// Audio metadata: year
|
||||
if (common.year) {
|
||||
elems.push((
|
||||
<div key='year' className='audio-year'>
|
||||
<label>Year</label>{common.year}
|
||||
</div>
|
||||
))
|
||||
}
|
||||
|
||||
// Audio metadata: release information (label & catalog-number)
|
||||
if (common.label || common.catalognumber) {
|
||||
const releaseInfo = []
|
||||
if (common.label) {
|
||||
releaseInfo.push(common.label)
|
||||
}
|
||||
if (common.catalognumber) {
|
||||
releaseInfo.push(common.catalognumber)
|
||||
}
|
||||
elems.push((
|
||||
<div key='release' className='audio-release'>
|
||||
<label>Release</label>{ releaseInfo.join(' / ') }
|
||||
</div>
|
||||
))
|
||||
}
|
||||
|
||||
// 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}
|
||||
@@ -248,6 +271,38 @@ function renderAudioMetadata (state) {
|
||||
))
|
||||
}
|
||||
|
||||
// Audio metadata: format
|
||||
const format = []
|
||||
fileSummary.audioInfo.format = fileSummary.audioInfo.format || ''
|
||||
if (fileSummary.audioInfo.format.dataformat) {
|
||||
format.push(fileSummary.audioInfo.format.dataformat)
|
||||
}
|
||||
if (fileSummary.audioInfo.format.bitrate) {
|
||||
format.push(fileSummary.audioInfo.format.bitrate / 1000 + ' kbps')
|
||||
}
|
||||
if (fileSummary.audioInfo.format.sampleRate) {
|
||||
format.push(fileSummary.audioInfo.format.sampleRate / 1000 + ' kHz')
|
||||
}
|
||||
if (fileSummary.audioInfo.format.bitsPerSample) {
|
||||
format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit')
|
||||
}
|
||||
if (format.length > 0) {
|
||||
elems.push((
|
||||
<div key='format' className='audio-format'>
|
||||
<label>Format</label>{ format.join(', ') }
|
||||
</div>
|
||||
))
|
||||
}
|
||||
|
||||
// Audio metadata: comments
|
||||
if (common.comment) {
|
||||
elems.push((
|
||||
<div key='comments' className='audio-comments'>
|
||||
<label>Comments</label>{common.comment.join(' / ')}
|
||||
</div>
|
||||
))
|
||||
}
|
||||
|
||||
// Align the title with the other info, if available. Otherwise, center title
|
||||
const emptyLabel = (<label />)
|
||||
elems.unshift((
|
||||
@@ -498,9 +553,9 @@ function renderPlayerControls (state) {
|
||||
const volume = state.playing.volume
|
||||
const volumeIcon = 'volume_' + (
|
||||
volume === 0 ? 'off'
|
||||
: volume < 0.3 ? 'mute'
|
||||
: volume < 0.6 ? 'down'
|
||||
: 'up')
|
||||
: volume < 0.3 ? 'mute'
|
||||
: volume < 0.6 ? 'down'
|
||||
: 'up')
|
||||
const volumeStyle = {
|
||||
background: '-webkit-gradient(linear, left top, right top, ' +
|
||||
'color-stop(' + (volume * 100) + '%, #eee), ' +
|
||||
|
||||
@@ -216,7 +216,7 @@ module.exports = class TorrentList extends React.Component {
|
||||
} else { // torrentSummary.status is 'new' or something unexpected
|
||||
status = ''
|
||||
}
|
||||
return (<span>{status}</span>)
|
||||
return (<span key='torrent-status'>{status}</span>)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ const defaultAnnounceList = require('create-torrent').announceList
|
||||
const electron = require('electron')
|
||||
const fs = require('fs')
|
||||
const mkdirp = require('mkdirp')
|
||||
const musicmetadata = require('musicmetadata')
|
||||
const mm = require('music-metadata')
|
||||
const networkAddress = require('network-address')
|
||||
const path = require('path')
|
||||
const WebTorrent = require('webtorrent')
|
||||
@@ -98,7 +98,7 @@ function init () {
|
||||
|
||||
window.addEventListener('error', (e) =>
|
||||
ipc.send('wt-uncaught-error', {message: e.error.message, stack: e.error.stack}),
|
||||
true)
|
||||
true)
|
||||
|
||||
setInterval(updateTorrentProgress, 1000)
|
||||
console.timeEnd('init')
|
||||
@@ -334,16 +334,30 @@ function stopServer () {
|
||||
server = null
|
||||
}
|
||||
|
||||
console.log('Initializing...')
|
||||
|
||||
function getAudioMetadata (infoHash, index) {
|
||||
const torrent = client.get(infoHash)
|
||||
const file = torrent.files[index]
|
||||
musicmetadata(file.createReadStream(), function (err, info) {
|
||||
if (err) return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
|
||||
const { artist, album, albumartist, title, year, track, disk, genre } = info
|
||||
const importantInfo = { artist, album, albumartist, title, year, track, disk, genre }
|
||||
console.log('got audio metadata for %s: %o', file.name, importantInfo)
|
||||
ipc.send('wt-audio-metadata', infoHash, index, importantInfo)
|
||||
})
|
||||
|
||||
// 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 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)
|
||||
}).catch(function (err) {
|
||||
return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
|
||||
})
|
||||
}
|
||||
|
||||
function selectFiles (torrentOrInfoHash, selections) {
|
||||
|
||||
@@ -820,12 +820,17 @@ video::-webkit-media-text-track-container {
|
||||
|
||||
.audio-metadata label {
|
||||
display:inline-block;
|
||||
width: 100px;
|
||||
width: 120px;
|
||||
text-align: right;
|
||||
font-weight: normal;
|
||||
margin-right: 25px;
|
||||
}
|
||||
|
||||
.audio-metadata .audio-format,
|
||||
.audio-metadata .audio-comments {
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
/*
|
||||
* ERRORS
|
||||
*/
|
||||
|
||||
@@ -10,7 +10,7 @@ test('app runs', function (t) {
|
||||
setup.waitForLoad(app, t)
|
||||
.then(() => setup.screenshotCreateOrCompare(app, t, 'app-basic'))
|
||||
.then(() => setup.endTest(app, t),
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
})
|
||||
|
||||
require('./test-torrent-list')
|
||||
|
||||
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 237 KiB |
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 239 KiB |
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 238 KiB |
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 237 KiB |
|
Before Width: | Height: | Size: 406 KiB After Width: | Height: | Size: 725 KiB |
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 239 KiB |
@@ -30,7 +30,7 @@ test('add-torrent', function (t) {
|
||||
.then(() => app.client.moveToObject('.torrent'))
|
||||
.then(() => setup.screenshotCreateOrCompare(app, t, 'add-torrent-100-percent'))
|
||||
.then(() => setup.endTest(app, t),
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
})
|
||||
|
||||
test('create-torrent', function (t) {
|
||||
@@ -84,5 +84,5 @@ test('create-torrent', function (t) {
|
||||
config.SAVED_TORRENT_FILE,
|
||||
expectedTorrent))
|
||||
.then(() => setup.endTest(app, t),
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
})
|
||||
|
||||
@@ -53,5 +53,5 @@ test('audio-streaming', function (t) {
|
||||
.then(() => app.webContents.executeJavaScript('dispatch("skipTo", 2)'))
|
||||
.then(() => setup.screenshotCreateOrCompare(app, t, 'play-torrent-wired-5'))
|
||||
.then(() => setup.endTest(app, t),
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
})
|
||||
|
||||
25
test/test-select-poster.js
Normal file
@@ -0,0 +1,25 @@
|
||||
const test = require('tape')
|
||||
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
|
||||
const WebTorrent = require('webtorrent')
|
||||
const torrentPoster = require('../build/renderer/lib/torrent-poster')
|
||||
|
||||
const client = new WebTorrent()
|
||||
|
||||
test("get cover from: 'wiredCd.torrent'", (t) => {
|
||||
const torrentPath = path.join(__dirname, '..', 'static', 'wiredCd.torrent')
|
||||
const torrentData = fs.readFileSync(torrentPath)
|
||||
|
||||
client.add(torrentData, (torrent) => {
|
||||
torrentPoster(torrent, (err, buf, extension) => {
|
||||
if (err) {
|
||||
t.fail(err)
|
||||
} else {
|
||||
t.equals(extension, '.jpg')
|
||||
t.end()
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -22,7 +22,7 @@ test('torrent-list: show download path missing', function (t) {
|
||||
.then((windowTitle) => t.equal(windowTitle, 'Preferences', 'window title'))
|
||||
.then(() => setup.screenshotCreateOrCompare(app, t, 'prefs-basic'))
|
||||
.then(() => setup.endTest(app, t),
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
})
|
||||
|
||||
test('torrent-list: start, stop, and delete torrents', function (t) {
|
||||
@@ -54,7 +54,7 @@ test('torrent-list: start, stop, and delete torrents', function (t) {
|
||||
.then(() => app.client.click('.control.ok'))
|
||||
.then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-deleted'))
|
||||
.then(() => setup.endTest(app, t),
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
})
|
||||
|
||||
test('torrent-list: expand torrent, unselect file', function (t) {
|
||||
@@ -101,5 +101,5 @@ test('torrent-list: expand torrent, unselect file', function (t) {
|
||||
// Make sure that all the files are gone
|
||||
.then(() => setup.compareDownloadFolder(t, 'CosmosLaundromatFirstCycle', null))
|
||||
.then(() => setup.endTest(app, t),
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
})
|
||||
|
||||
@@ -31,5 +31,5 @@ test('video-streaming', function (t) {
|
||||
// Take another screenshot to verify that the window resized correctly
|
||||
.then(() => setup.screenshotCreateOrCompare(app, t, 'play-torrent-return'))
|
||||
.then(() => setup.endTest(app, t),
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
(err) => setup.endTest(app, t, err || 'error'))
|
||||
})
|
||||
|
||||