diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-20 16:24:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 16:24:31 +0200 |
| commit | 0491173a61aed66205c017e0d7e0503ea316c144 (patch) | |
| tree | ce6621597505f9518cfdf0981977d097c63f9fad /server/helpers/webtorrent.ts | |
| parent | 8704acf49efc770d73bf07c10468ed8c74d28a83 (diff) | |
| parent | 6247b2057b792cea155a1abd9788c363ae7d2cc2 (diff) | |
| download | PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.gz PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.zst PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.zip | |
Merge branch 'develop' into cli-wrapper
Diffstat (limited to 'server/helpers/webtorrent.ts')
| -rw-r--r-- | server/helpers/webtorrent.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts index 2fdfd1876..f4b44bc4f 100644 --- a/server/helpers/webtorrent.ts +++ b/server/helpers/webtorrent.ts | |||
| @@ -24,7 +24,7 @@ function downloadWebTorrentVideo (target: { magnetUri: string, torrentName?: str | |||
| 24 | if (timer) clearTimeout(timer) | 24 | if (timer) clearTimeout(timer) |
| 25 | 25 | ||
| 26 | return safeWebtorrentDestroy(webtorrent, torrentId, file.name, target.torrentName) | 26 | return safeWebtorrentDestroy(webtorrent, torrentId, file.name, target.torrentName) |
| 27 | .then(() => rej(new Error('The number of files is not equal to 1 for ' + torrentId))) | 27 | .then(() => rej(new Error('Cannot import torrent ' + torrentId + ': there are multiple files in it'))) |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | file = torrent.files[ 0 ] | 30 | file = torrent.files[ 0 ] |