Merge branch 'master' into master
This commit is contained in:
@@ -59,12 +59,12 @@ module.exports = class PlaybackController {
|
||||
}
|
||||
|
||||
// Open a file in OS default app.
|
||||
openItem (infoHash, index) {
|
||||
openPath (infoHash, index) {
|
||||
const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
|
||||
const filePath = path.join(
|
||||
torrentSummary.path,
|
||||
torrentSummary.files[index].path)
|
||||
ipcRenderer.send('openItem', filePath)
|
||||
ipcRenderer.send('openPath', filePath)
|
||||
}
|
||||
|
||||
// Toggle (play or pause) the currently playing media
|
||||
@@ -156,6 +156,20 @@ module.exports = class PlaybackController {
|
||||
else this.state.playing.jumpToTime = time
|
||||
}
|
||||
|
||||
// Show video preview
|
||||
preview (x) {
|
||||
if (!Number.isFinite(x)) {
|
||||
console.error('Tried to preview a non-finite position ' + x)
|
||||
return console.trace()
|
||||
}
|
||||
this.state.playing.previewXCoord = x
|
||||
}
|
||||
|
||||
// Hide video preview
|
||||
clearPreview () {
|
||||
this.state.playing.previewXCoord = null
|
||||
}
|
||||
|
||||
// Change playback speed. 1 = faster, -1 = slower
|
||||
// Playback speed ranges from 16 (fast forward) to 1 (normal playback)
|
||||
// to 0.25 (quarter-speed playback), then goes to -0.25, -0.5, -1, -2, etc
|
||||
@@ -268,8 +282,10 @@ module.exports = class PlaybackController {
|
||||
state.playing.infoHash = infoHash
|
||||
state.playing.fileIndex = index
|
||||
state.playing.fileName = fileSummary.name
|
||||
state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
|
||||
: TorrentPlayer.isAudio(fileSummary) ? 'audio'
|
||||
state.playing.type = TorrentPlayer.isVideo(fileSummary)
|
||||
? 'video'
|
||||
: TorrentPlayer.isAudio(fileSummary)
|
||||
? 'audio'
|
||||
: 'other'
|
||||
|
||||
// pick up where we left off
|
||||
|
||||
@@ -158,7 +158,7 @@ module.exports = class TorrentListController {
|
||||
.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.
|
||||
.forEach((torrent) => { // Pause all active torrents except the one that started playing.
|
||||
if (infoHash === torrent.infoHash) return
|
||||
|
||||
// Pause torrent without playing sounds.
|
||||
@@ -173,7 +173,7 @@ module.exports = class TorrentListController {
|
||||
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.state.saved.torrentsToResume.forEach((infoHash) => {
|
||||
this.toggleTorrent(infoHash)
|
||||
})
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ const mediaExtensions = {
|
||||
'.ogg', '.opus', '.spx', '.wma', '.wav', '.wv', '.wvp'],
|
||||
video: [
|
||||
'.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', '.mpg', '.mpeg',
|
||||
'.ogv', '.webm', '.wmv'],
|
||||
'.ogv', '.webm', '.wmv', '.m2ts'],
|
||||
image: ['.gif', '.jpg', '.jpeg', '.png']
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ function run (state) {
|
||||
if (semver.lt(version, '0.17.0')) migrate_0_17_0(saved)
|
||||
if (semver.lt(version, '0.17.2')) migrate_0_17_2(saved)
|
||||
if (semver.lt(version, '0.21.0')) migrate_0_21_0(saved)
|
||||
if (semver.lt(version, '0.21.1')) migrate_0_21_1(saved)
|
||||
if (semver.lt(version, '0.22.0')) migrate_0_22_0(saved)
|
||||
|
||||
// Config is now on the new version
|
||||
state.saved.version = config.APP_VERSION
|
||||
@@ -216,7 +216,7 @@ function migrate_0_21_0 (saved) {
|
||||
}
|
||||
}
|
||||
|
||||
function migrate_0_21_1 (saved) {
|
||||
function migrate_0_22_0 (saved) {
|
||||
if (saved.prefs.externalPlayerPath == null) {
|
||||
saved.prefs.externalPlayerPath = ''
|
||||
}
|
||||
|
||||
@@ -166,7 +166,8 @@ function torrentPosterFromVideo (torrent, cb) {
|
||||
function onSeeked () {
|
||||
video.removeEventListener('seeked', onSeeked)
|
||||
|
||||
const buf = captureFrame(video)
|
||||
const frame = captureFrame(video)
|
||||
const buf = frame && frame.image
|
||||
|
||||
// unload video element
|
||||
video.pause()
|
||||
|
||||
@@ -14,9 +14,6 @@ Module.prototype.require = function (id) {
|
||||
|
||||
console.time('init')
|
||||
|
||||
const crashReporter = require('../crash-reporter')
|
||||
crashReporter.init()
|
||||
|
||||
// Perf optimization: Start asynchronously read on config file before all the
|
||||
// blocking require() calls below.
|
||||
|
||||
@@ -133,7 +130,10 @@ function onState (err, _state) {
|
||||
resumeTorrents()
|
||||
|
||||
// Initialize ReactDOM
|
||||
app = ReactDOM.render(<App state={state} />, document.querySelector('#body'))
|
||||
ReactDOM.render(
|
||||
<App state={state} ref={elem => { app = elem }} />,
|
||||
document.querySelector('#body')
|
||||
)
|
||||
|
||||
// Calling update() updates the UI given the current state
|
||||
// Do this at least once a second to give every file in every torrentSummary
|
||||
@@ -277,10 +277,12 @@ const dispatchHandlers = {
|
||||
previousTrack: () => controllers.playback().previousTrack(),
|
||||
skip: (time) => controllers.playback().skip(time),
|
||||
skipTo: (time) => controllers.playback().skipTo(time),
|
||||
preview: (x) => controllers.playback().preview(x),
|
||||
clearPreview: () => controllers.playback().clearPreview(),
|
||||
changePlaybackRate: (dir) => controllers.playback().changePlaybackRate(dir),
|
||||
changeVolume: (delta) => controllers.playback().changeVolume(delta),
|
||||
setVolume: (vol) => controllers.playback().setVolume(vol),
|
||||
openItem: (infoHash, index) => controllers.playback().openItem(infoHash, index),
|
||||
openPath: (infoHash, index) => controllers.playback().openPath(infoHash, index),
|
||||
|
||||
// Subtitles
|
||||
openSubtitles: () => controllers.subtitles().openSubtitles(),
|
||||
@@ -524,6 +526,9 @@ function onPaste (e) {
|
||||
}
|
||||
|
||||
function onKeydown (e) {
|
||||
// prevent event fire on user input elements
|
||||
if (editableHtmlTags.has(e.target.tagName.toLowerCase())) return
|
||||
|
||||
const key = e.key
|
||||
|
||||
if (key === 'ArrowLeft') {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
const React = require('react')
|
||||
const Bitfield = require('bitfield')
|
||||
const BitField = require('bitfield').default
|
||||
const prettyBytes = require('prettier-bytes')
|
||||
|
||||
const TorrentSummary = require('../lib/torrent-summary')
|
||||
@@ -536,6 +536,8 @@ function renderPlayerControls (state) {
|
||||
const nextClass = Playlist.hasNext(state) ? '' : 'disabled'
|
||||
|
||||
const elements = [
|
||||
renderPreview(state),
|
||||
|
||||
<div key='playback-bar' className='playback-bar'>
|
||||
{renderLoadingBar(state)}
|
||||
<div
|
||||
@@ -547,6 +549,8 @@ function renderPlayerControls (state) {
|
||||
key='scrub-bar'
|
||||
className='scrub-bar'
|
||||
draggable
|
||||
onMouseMove={handleScrubPreview}
|
||||
onMouseOut={clearPreview}
|
||||
onDragStart={handleDragStart}
|
||||
onClick={handleScrub}
|
||||
onDrag={handleScrub}
|
||||
@@ -655,10 +659,14 @@ function renderPlayerControls (state) {
|
||||
// Render volume slider
|
||||
const volume = state.playing.volume
|
||||
const volumeIcon = 'volume_' + (
|
||||
volume === 0 ? 'off'
|
||||
: volume < 0.3 ? 'mute'
|
||||
: volume < 0.6 ? 'down'
|
||||
: 'up')
|
||||
volume === 0
|
||||
? 'off'
|
||||
: volume < 0.3
|
||||
? 'mute'
|
||||
: volume < 0.6
|
||||
? 'down'
|
||||
: 'up'
|
||||
)
|
||||
const volumeStyle = {
|
||||
background: '-webkit-gradient(linear, left top, right top, ' +
|
||||
'color-stop(' + (volume * 100) + '%, #eee), ' +
|
||||
@@ -722,6 +730,19 @@ function renderPlayerControls (state) {
|
||||
}
|
||||
}
|
||||
|
||||
// Handles a scrub hover (preview another position in the video)
|
||||
function handleScrubPreview (e) {
|
||||
// Only show for videos
|
||||
if (!e.clientX || state.playing.type !== 'video') return
|
||||
dispatch('mediaMouseMoved')
|
||||
dispatch('preview', e.clientX)
|
||||
}
|
||||
|
||||
function clearPreview (e) {
|
||||
if (state.playing.type !== 'video') return
|
||||
dispatch('clearPreview')
|
||||
}
|
||||
|
||||
// Handles a click or drag to scrub (jump to another position in the video)
|
||||
function handleScrub (e) {
|
||||
if (!e.clientX) return
|
||||
@@ -760,6 +781,56 @@ function renderPlayerControls (state) {
|
||||
}
|
||||
}
|
||||
|
||||
function renderPreview (state) {
|
||||
const { previewXCoord = null } = state.playing
|
||||
|
||||
// Calculate time from x-coord as fraction of track width
|
||||
const windowWidth = document.querySelector('body').clientWidth
|
||||
const fraction = previewXCoord / windowWidth
|
||||
const time = fraction * state.playing.duration /* seconds */
|
||||
|
||||
const height = 70
|
||||
let width = 0
|
||||
|
||||
const previewEl = document.querySelector('video#preview')
|
||||
if (previewEl !== null && previewXCoord !== null) {
|
||||
previewEl.currentTime = time
|
||||
|
||||
// Auto adjust width to maintain video aspect ratio
|
||||
width = Math.floor((previewEl.videoWidth / previewEl.videoHeight) * height)
|
||||
}
|
||||
|
||||
// Center preview window on mouse cursor,
|
||||
// while avoiding falling off the left or right edges
|
||||
const xPos = Math.min(Math.max(previewXCoord - (width / 2), 5), windowWidth - width - 5)
|
||||
|
||||
return (
|
||||
<div
|
||||
key='preview' style={{
|
||||
position: 'absolute',
|
||||
bottom: 50,
|
||||
left: xPos,
|
||||
display: previewXCoord == null && 'none' // Hide preview when XCoord unset
|
||||
}}
|
||||
>
|
||||
<div style={{ width, height, backgroundColor: 'black' }}>
|
||||
<video
|
||||
src={Playlist.getCurrentLocalURL(state)}
|
||||
id='preview'
|
||||
style={{ border: '1px solid lightgrey', borderRadius: 2 }}
|
||||
/>
|
||||
</div>
|
||||
<p
|
||||
style={{
|
||||
textAlign: 'center', margin: 5, textShadow: '0 0 2px rgba(0,0,0,.5)', color: '#eee'
|
||||
}}
|
||||
>
|
||||
{formatTime(time, state.playing.duration)}
|
||||
</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// Renders the loading bar. Shows which parts of the torrent are loaded, which
|
||||
// can be 'spongey' / non-contiguous
|
||||
function renderLoadingBar (state) {
|
||||
@@ -779,7 +850,7 @@ function renderLoadingBar (state) {
|
||||
const parts = []
|
||||
let lastPiecePresent = false
|
||||
for (let i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
|
||||
const partPresent = Bitfield.prototype.get.call(prog.bitfield, i)
|
||||
const partPresent = BitField.prototype.get.call(prog.bitfield, i)
|
||||
if (partPresent && !lastPiecePresent) {
|
||||
parts.push({ start: i - fileProg.startPiece, count: 1 })
|
||||
} else if (partPresent) {
|
||||
|
||||
@@ -346,7 +346,7 @@ module.exports = class TorrentList extends React.Component {
|
||||
} else {
|
||||
icon = 'description' /* file icon, opens in OS default app */
|
||||
handleClick = isDone
|
||||
? dispatcher('openItem', infoHash, index)
|
||||
? dispatcher('openPath', infoHash, index)
|
||||
: (e) => e.stopPropagation() // noop if file is not ready
|
||||
}
|
||||
// TODO: add a css 'disabled' class to indicate that a file cannot be opened/streamed
|
||||
|
||||
@@ -7,20 +7,15 @@ const util = require('util')
|
||||
const defaultAnnounceList = require('create-torrent').announceList
|
||||
const { ipcRenderer } = require('electron')
|
||||
const fs = require('fs')
|
||||
const mkdirp = require('mkdirp')
|
||||
const mm = require('music-metadata')
|
||||
const networkAddress = require('network-address')
|
||||
const path = require('path')
|
||||
const WebTorrent = require('webtorrent')
|
||||
|
||||
const crashReporter = require('../crash-reporter')
|
||||
const config = require('../config')
|
||||
const { TorrentKeyNotFoundError } = require('./lib/errors')
|
||||
const torrentPoster = require('./lib/torrent-poster')
|
||||
|
||||
// Report when the process crashes
|
||||
crashReporter.init()
|
||||
|
||||
// Force use of webtorrent trackers on all torrents
|
||||
global.WEBTORRENT_ANNOUNCE = defaultAnnounceList
|
||||
.map((arr) => arr[0])
|
||||
@@ -213,7 +208,7 @@ function saveTorrentFile (torrentKey) {
|
||||
}
|
||||
|
||||
// Otherwise, save the .torrent file, under the app config folder
|
||||
mkdirp(config.TORRENT_PATH, function (_) {
|
||||
fs.mkdir(config.TORRENT_PATH, { recursive: true }, function (_) {
|
||||
fs.writeFile(torrentPath, torrent.torrentFile, function (err) {
|
||||
if (err) return console.log('error saving torrent file %s: %o', torrentPath, err)
|
||||
console.log('saved torrent file %s', torrentPath)
|
||||
@@ -230,7 +225,7 @@ function generateTorrentPoster (torrentKey) {
|
||||
torrentPoster(torrent, function (err, buf, extension) {
|
||||
if (err) return console.log('error generating poster: %o', err)
|
||||
// save it for next time
|
||||
mkdirp(config.POSTER_PATH, function (err) {
|
||||
fs.mkdir(config.POSTER_PATH, { recursive: true }, function (err) {
|
||||
if (err) return console.log('error creating poster dir: %o', err)
|
||||
const posterFileName = torrent.infoHash + extension
|
||||
const posterFilePath = path.join(config.POSTER_PATH, posterFileName)
|
||||
@@ -345,7 +340,10 @@ function getAudioMetadata (infoHash, index) {
|
||||
skipCovers: true,
|
||||
fileSize: file.length,
|
||||
observer: event => {
|
||||
ipcRenderer.send('wt-audio-metadata', infoHash, index, event.metadata)
|
||||
ipcRenderer.send('wt-audio-metadata', infoHash, index, {
|
||||
common: metadata.common,
|
||||
format: metadata.format
|
||||
})
|
||||
}
|
||||
}
|
||||
const onMetadata = file.done
|
||||
|
||||
Reference in New Issue
Block a user