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

Fix default torrents

Browse Source 
Big Buck Bunny playable now, files show correctly even before the user starts torrenting
This commit is contained in:
DC
2016-03-21 01:45:57 -07:00
parent 720c9f4625
commit d520a9e4bc
9 changed files with 87 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
renderer/views/torrent-list.js
View File

@@ -131,11 +131,8 @@ function TorrentList (state, dispatch) {
// Show files, per-file download status and play buttons, and so on
function renderTorrentDetails (torrent, torrentSummary) {
// If we're currently torrenting, show details directly from WebTorrent, including % downloaded
// Otherwise, show a summary of files in the torrent, if available
var files = (torrent && torrent.files) || torrentSummary.files
var filesElement
if (!files) {
if (!torrentSummary.files) {
// We don't know what files this torrent contains
var message = torrent
? 'Downloading torrent data using magnet link...'
@@ -143,7 +140,8 @@ function TorrentList (state, dispatch) {
filesElement = hx`<div class='files warning'>${message}</div>`
} else {
// We do know the files. List them and show download stats for each one
var fileRows = files.map((file, index) => renderFileRow(torrent, torrentSummary, file, index))
var fileRows = torrentSummary.files.map(
(file, index) => renderFileRow(torrent, torrentSummary, file, index))
filesElement = hx`
<div class='files'>
<strong>Files</strong>
@@ -167,39 +165,27 @@ function TorrentList (state, dispatch) {
}
}
// Show a single file in the details view for a single torrent
// File can either be a WebTorrent file (if we're currently torrenting it) or an element of torrentSummary.files
// Show a single torrentSummary file in the details view for a single torrent
function renderFileRow (torrent, torrentSummary, file, index) {
// First, find out how much of the file we've downloaded
// (If we're not currently torrenting, just say whether we have the file or not)
if (file._startPiece) {
var numPieces = file._endPiece - file._startPiece + 1
var numPiecesPresent = 0
for (var piece = file._startPiece; piece <= file._endPiece; piece++) {
if (torrent.bitfield.get(piece)) numPiecesPresent++
}
var progress = Math.round(100 * numPiecesPresent / numPieces) + '%'
var isDone = numPieces === numPiecesPresent
} else {
var isDone = file.isDownloaded
var progress = hx`<i.icon>${isDone ? 'check' : 'close'}</i>`
}
var isDone = file.numPiecesPresent === file.numPieces
var progress = Math.round(100 * file.numPiecesPresent / (file.numPieces || 0)) + '%'
// Second, render the file as a table row
var icon
var iconClass = ''
var rowClass = ''
if (state.playing.infoHash === torrentSummary.infoHash && state.playing.fileIndex === index) {
icon = 'pause_arrow' /* playing? add option to pause */
} else if (TorrentPlayer.isPlayable(file)) {
icon = 'play_arrow' /* playable? add option to play */
} else {
icon = 'description' /* file icon, opens in OS default app */
iconClass = isDone ? '' : 'disabled'
rowClass = isDone ? '' : 'disabled'
}
return hx`
<tr onclick=${handleClick}>
<tr onclick=${handleClick} class='${rowClass}'>
<td class='col-icon'>
<i class='icon ${iconClass}'>${icon}</i>
<i class='icon'>${icon}</i>
</td>
<td class='col-name'>${file.name}</td>
<td class='col-progress'>${progress}</td>