From e37c85e933b320173c271fd1f6471679b759bc39 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 1 Oct 2018 10:52:58 +0200 Subject: [PATCH] Delete each file on failed import --- server/helpers/webtorrent.ts | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts index b4629a094..924d630e7 100644 --- a/server/helpers/webtorrent.ts +++ b/server/helpers/webtorrent.ts @@ -26,7 +26,11 @@ async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName if (torrent.files.length !== 1) { if (timer) clearTimeout(timer) - return safeWebtorrentDestroy(webtorrent, torrentId, { directoryPath, filepath: file.path }, target.torrentName) + for (let file of torrent.files) { + deleteDownloadedFile({ directoryPath, filepath: file.path }) + } + + return safeWebtorrentDestroy(webtorrent, torrentId, undefined, target.torrentName) .then(() => rej(new Error('Cannot import torrent ' + torrentId + ': there are multiple files in it'))) } @@ -79,23 +83,23 @@ function safeWebtorrentDestroy ( } // Delete downloaded file - if (downloadedFile) { - // We want to delete the base directory - let pathToDelete = dirname(downloadedFile.filepath) - if (pathToDelete === '.') pathToDelete = downloadedFile.filepath + if (downloadedFile) deleteDownloadedFile(downloadedFile) - const toRemovePath = join(downloadedFile.directoryPath, pathToDelete) - - logger.debug('Removing %s after webtorrent download.', toRemovePath) - remove(toRemovePath) - .catch(err => logger.error('Cannot remove torrent file %s in webtorrent download.', toRemovePath, { err })) - } - - if (err) { - logger.warn('Cannot destroy webtorrent in timeout.', { err }) - } + if (err) logger.warn('Cannot destroy webtorrent in timeout.', { err }) return res() }) }) } + +function deleteDownloadedFile (downloadedFile: { directoryPath: string, filepath: string }) { + // We want to delete the base directory + let pathToDelete = dirname(downloadedFile.filepath) + if (pathToDelete === '.') pathToDelete = downloadedFile.filepath + + const toRemovePath = join(downloadedFile.directoryPath, pathToDelete) + + logger.debug('Removing %s after webtorrent download.', toRemovePath) + remove(toRemovePath) + .catch(err => logger.error('Cannot remove torrent file %s in webtorrent download.', toRemovePath, { err })) +}