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

Show an error when adding a dupe torrent

Browse Source 
This works around a WebTorrent bug where calling client.add(torrentFilePath) to add a duplicate torrent -- in other words, one whose infoHash we're already torrenting -- creates a new torrent object and later throws an error. Inconsistently, calling client.add(magnetURI) or client.add(infoHash) to add a duplicate torrent returns the existing torrent object that we're already torrenting and doesn't throw an error.

This also fixes a prety nasty bug where pasting a dupe magnet link changed the torrentKey of an existing torrent, breaking the communication between the main and WebTorrent windows

Fixes #364
This commit is contained in:
DC
2016-04-19 20:28:13 -07:00
parent 812ce8724d
commit 0b85ba9f32
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
renderer/index.js
View File

@@ -717,7 +717,7 @@ function torrentError (torrentKey, message) {
// TODO: WebTorrent should have semantic errors // TODO: WebTorrent should have semantic errors
if (message.startsWith('There is already a swarm')) { if (message.startsWith('There is already a swarm')) {
onError(new Error('Couldn\'t add duplicate torrent')) onError(new Error('Can\'t add duplicate torrent'))
} else if (!torrentSummary) { } else if (!torrentSummary) {
onError(message) onError(message)
} else { } else {

6
renderer/webtorrent.js
View File

@@ -77,6 +77,12 @@ function startTorrenting (torrentKey, torrentID, path, fileModtimes) {
} catch (err) { } catch (err) {
return ipc.send('wt-error', torrentKey, err.message) return ipc.send('wt-error', torrentKey, err.message)
} }
// If we add a duplicate magnet URI or infohash, WebTorrent returns the
// existing torrent object! (If we add a duplicate torrent file, it creates a
// new torrent object and raises an error later.) Workaround:
if (torrent.key) {
return ipc.send('wt-error', torrentKey, 'Can\'t add duplicate torrent')
}
torrent.key = torrentKey torrent.key = torrentKey
addTorrentEvents(torrent) addTorrentEvents(torrent)
return torrent return torrent