import { logger } from './logger'
-import { generateVideoTmpPath } from './utils'
+import { generateVideoImportTmpPath } from './utils'
import * as WebTorrent from 'webtorrent'
import { createWriteStream, ensureDir, remove } from 'fs-extra'
import { CONFIG } from '../initializers'
import { dirname, join } from 'path'
-async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName?: string }, timeout?: number) {
+async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName?: string }, timeout: number) {
const id = target.magnetUri || target.torrentName
let timer
- const path = generateVideoTmpPath(id)
+ const path = generateVideoImportTmpPath(id)
logger.info('Importing torrent video %s', id)
- const directoryPath = join(CONFIG.STORAGE.VIDEOS_DIR, 'import')
+ const directoryPath = join(CONFIG.STORAGE.TMP_DIR, 'webtorrent')
await ensureDir(directoryPath)
return new Promise<string>((res, rej) => {
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')))
}
torrent.on('error', err => rej(err))
- if (timeout) {
- timer = setTimeout(async () => {
- return safeWebtorrentDestroy(webtorrent, torrentId, file ? { directoryPath, filepath: file.path } : undefined, target.torrentName)
- .then(() => rej(new Error('Webtorrent download timeout.')))
- }, timeout)
- }
+ timer = setTimeout(async () => {
+ return safeWebtorrentDestroy(webtorrent, torrentId, file ? { directoryPath, filepath: file.path } : undefined, target.torrentName)
+ .then(() => rej(new Error('Webtorrent download timeout.')))
+ }, timeout)
})
}
}
// Delete downloaded file
- if (downloadedFile) {
- // 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 }))
- }
+ if (downloadedFile) deleteDownloadedFile(downloadedFile)
- 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 }))
+}