Correct webtorrent download cleanup

3 files changed, 21 insertions, 4 deletions

diff --git a/client/src/app/videos/+video-edit/video-add.component.html b/client/src/app/videos/+video-edit/video-add.component.html
index 340820180..4c30ddefc 100644
--- a/client/src/app/videos/+video-edit/video-add.component.html
+++ b/client/src/app/videos/+video-edit/video-add.component.html
@@ -1,6 +1,6 @@
 <div class="margin-content">
   <div class="title-page title-page-single">
-    <ng-container *ngIf="secondStepType === 'import'" i18n>Import {{ videoName }}</ng-container>
+    <ng-container *ngIf="secondStepType === 'import-url' || secondStepType === 'import-torrent'" i18n>Import {{ videoName }}</ng-container>
     <ng-container *ngIf="secondStepType === 'upload'" i18n>Upload {{ videoName }}</ng-container>
   </div>
 
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)
     })
diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts
index 2d19b82a4..d6984ef92 100644
--- a/server/lib/job-queue/handlers/video-import.ts
+++ b/server/lib/job-queue/handlers/video-import.ts
@@ -190,7 +190,7 @@ async function processFile (downloader: () => Promise<string>, videoImport: Vide
       videoImport.state = VideoImportState.SUCCESS
       const videoImportUpdated = await videoImport.save({ transaction: t })
 
-      logger.info('Video %s imported.', videoImport.targetUrl)
+      logger.info('Video %s imported.', video.uuid)
 
       videoImportUpdated.Video = videoUpdated
       return videoImportUpdated