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

Show torrent metadata on 'metadata' event, don't wait for 'ready'

Browse Source
This commit is contained in:
DC
2016-04-06 02:54:11 -07:00
parent e0f02ace9e
commit 5abc319ecf
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
renderer/index.js
View File

@@ -372,7 +372,7 @@ function setupIpc () {
}) })
ipcRenderer.on('wt-infohash', (e, ...args) => torrentInfoHash(...args)) ipcRenderer.on('wt-infohash', (e, ...args) => torrentInfoHash(...args))
ipcRenderer.on('wt-ready', (e, ...args) => torrentReady(...args)) ipcRenderer.on('wt-metadata', (e, ...args) => torrentMetadata(...args))
ipcRenderer.on('wt-done', (e, ...args) => torrentDone(...args)) ipcRenderer.on('wt-done', (e, ...args) => torrentDone(...args))
ipcRenderer.on('wt-warning', (e, ...args) => torrentWarning(...args)) ipcRenderer.on('wt-warning', (e, ...args) => torrentWarning(...args))
ipcRenderer.on('wt-error', (e, ...args) => torrentError(...args)) ipcRenderer.on('wt-error', (e, ...args) => torrentError(...args))
@@ -626,11 +626,10 @@ function torrentError (torrentKey, message) {
} }
} }
function torrentReady (torrentKey, torrentInfo) { function torrentMetadata (torrentKey, torrentInfo) {
// Summarize torrent // Summarize torrent
var torrentSummary = getTorrentSummary(torrentKey) var torrentSummary = getTorrentSummary(torrentKey)
torrentSummary.status = 'downloading' torrentSummary.status = 'downloading'
torrentSummary.ready = true
torrentSummary.name = torrentSummary.displayName || torrentInfo.name torrentSummary.name = torrentSummary.displayName || torrentInfo.name
torrentSummary.path = torrentInfo.path torrentSummary.path = torrentInfo.path
torrentSummary.files = torrentInfo.files torrentSummary.files = torrentInfo.files

12
renderer/webtorrent.js
View File

@@ -92,13 +92,21 @@ function addTorrentEvents (torrent) {
ipc.send('wt-error', torrent.key, err.message)) ipc.send('wt-error', torrent.key, err.message))
torrent.on('infoHash', () => torrent.on('infoHash', () =>
ipc.send('wt-infohash', torrent.key, torrent.infoHash)) ipc.send('wt-infohash', torrent.key, torrent.infoHash))
torrent.on('metadata', torrentMetadata)
torrent.on('ready', torrentReady) torrent.on('ready', torrentReady)
torrent.on('done', torrentDone) torrent.on('done', torrentDone)
function torrentMetadata () {
var info = getTorrentInfo(torrent)
ipc.send('wt-metadata', torrent.key, info)
updateTorrentProgress()
}
function torrentReady () { function torrentReady () {
var info = getTorrentInfo(torrent) var info = getTorrentInfo(torrent)
ipc.send('wt-ready', torrent.key, info) ipc.send('wt-ready', torrent.key, info)
ipc.send('wt-ready-' + torrent.infoHash, torrent.key, info) ipc.send('wt-ready-' + torrent.infoHash, torrent.key, info) // TODO: hack
updateTorrentProgress() updateTorrentProgress()
} }
@@ -264,7 +272,7 @@ function startServerFromReadyTorrent (torrent, index, cb) {
} }
ipc.send('wt-server-running', info) ipc.send('wt-server-running', info)
ipc.send('wt-server-' + torrent.infoHash, info) ipc.send('wt-server-' + torrent.infoHash, info) // TODO: hack
}) })
} }