OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fallback to torrent file if there is an incorrect info hash

pull/376/merge
Chocobozzz 2018-03-23 09:46:08 +01:00
parent d63fd4f7b1
commit a216c6233d
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/src/assets/player/peertube-videojs-plugin.ts
View File

@ -302,9 +302,16 @@ class PeerTubePlugin extends Plugin {
const previousVideoFile = this.currentVideoFile const previousVideoFile = this.currentVideoFile
this.currentVideoFile = videoFile this.currentVideoFile = videoFile
console.log('Adding ' + videoFile.magnetUri + '.') this.addTorrent(this.currentVideoFile.magnetUri, previousVideoFile, done)
this.torrent = webtorrent.add(videoFile.magnetUri, torrent => {
console.log('Added ' + videoFile.magnetUri + '.') this.trigger('videoFileUpdate')
}
addTorrent (magnetOrTorrentUrl: string, previousVideoFile: VideoFile, done: Function) {
console.log('Adding ' + magnetOrTorrentUrl + '.')
this.torrent = webtorrent.add(magnetOrTorrentUrl, torrent => {
console.log('Added ' + magnetOrTorrentUrl + '.')
this.flushVideoFile(previousVideoFile) this.flushVideoFile(previousVideoFile)
@ -325,19 +332,25 @@ class PeerTubePlugin extends Plugin {
}) })
this.torrent.on('error', err => this.handleError(err)) this.torrent.on('error', err => this.handleError(err))
this.torrent.on('warning', (err: any) => { this.torrent.on('warning', (err: any) => {
// We don't support HTTP tracker but we don't care -> we use the web socket tracker // We don't support HTTP tracker but we don't care -> we use the web socket tracker
if (err.message.indexOf('Unsupported tracker protocol') !== -1) return if (err.message.indexOf('Unsupported tracker protocol') !== -1) return
// Users don't care about issues with WebRTC, but developers do so log it in the console // Users don't care about issues with WebRTC, but developers do so log it in the console
if (err.message.indexOf('Ice connection failed') !== -1) { if (err.message.indexOf('Ice connection failed') !== -1) {
console.error(err) console.error(err)
return return
} }
// Magnet hash is not up to date with the torrent file, add directly the torrent file
if (err.message.indexOf('incorrect info hash') !== -1) {
console.error('Incorrect info hash detected, falling back to torrent file.')
return this.addTorrent(this.torrent['xs'], previousVideoFile, done)
}
return this.handleError(err) return this.handleError(err)
}) })
this.trigger('videoFileUpdate')
} }
updateResolution (resolutionId: number) { updateResolution (resolutionId: number) {