From 541006e355c927a866d58cced016f48e139670d5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 7 Aug 2018 17:18:35 +0200 Subject: Correct webtorrent download cleanup --- server/helpers/webtorrent.ts | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'server/helpers/webtorrent.ts') diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts index 121cd0b41..6f2adb3cb 100644 --- a/server/helpers/webtorrent.ts +++ b/server/helpers/webtorrent.ts @@ -4,6 +4,7 @@ import * as WebTorrent from 'webtorrent' import { createWriteStream } from 'fs' import { CONFIG } from '../initializers' import { join } from 'path' +import { unlinkPromise } from './core-utils' function downloadWebTorrentVideo (target: { magnetUri: string, torrentName: string }) { const id = target.magnetUri || target.torrentName @@ -15,13 +16,29 @@ function downloadWebTorrentVideo (target: { magnetUri: string, torrentName: stri const webtorrent = new WebTorrent() const torrentId = target.magnetUri || join(CONFIG.STORAGE.TORRENTS_DIR, target.torrentName) - const torrent = webtorrent.add(torrentId, torrent => { + + const options = { path: CONFIG.STORAGE.VIDEOS_DIR } + const torrent = webtorrent.add(torrentId, options, torrent => { if (torrent.files.length !== 1) return rej(new Error('The number of files is not equal to 1 for ' + torrentId)) const file = torrent.files[ 0 ] const writeStream = createWriteStream(path) - writeStream.on('finish', () => res(path)) + writeStream.on('finish', () => { + webtorrent.destroy(async err => { + if (err) return rej(err) + + if (target.torrentName) { + unlinkPromise(torrentId) + .catch(err => logger.error('Cannot remove torrent %s in webtorrent download.', torrentId, { err })) + } + + unlinkPromise(join(CONFIG.STORAGE.VIDEOS_DIR, file.name)) + .catch(err => logger.error('Cannot remove torrent file %s in webtorrent download.', file.name, { err })) + + res(path) + }) + }) file.createReadStream().pipe(writeStream) }) -- cgit v1.2.3