From 02988fdc0bdd345bddf89171d258822cab4229d6 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 15 Feb 2018 18:40:24 +0100
Subject: [PATCH] Fix remote image fetching

---
 server/helpers/image-utils.ts  | 2 +-
 server/helpers/requests.ts     | 8 +++++---
 server/tools/import-youtube.ts | 7 +++++--
 server/tools/upload.ts         | 4 +++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index ba57b5812..0065f4210 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -3,7 +3,7 @@ import * as sharp from 'sharp'
 import { unlinkPromise } from './core-utils'
 
 async function processImage (
-  physicalFile: Express.Multer.File,
+  physicalFile: { path: string },
   destination: string,
   newSize: { width: number, height: number }
 ) {
diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index eb8a12868..64e3ce663 100644
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -17,11 +17,13 @@ function doRequest (
 }
 
 function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.UriOptions, destPath: string) {
-  return new Bluebird<request.RequestResponse>((res, rej) => {
+  return new Bluebird<void>((res, rej) => {
+    const file = createWriteStream(destPath)
+    file.on('finish', () => res())
+
     request(requestOptions)
-      .on('response', response => res(response as request.RequestResponse))
       .on('error', err => rej(err))
-      .pipe(createWriteStream(destPath))
+      .pipe(file)
   })
 }
 
diff --git a/server/tools/import-youtube.ts b/server/tools/import-youtube.ts
index 295109cd8..ab91afbc0 100644
--- a/server/tools/import-youtube.ts
+++ b/server/tools/import-youtube.ts
@@ -62,7 +62,7 @@ async function run () {
     console.log('Will download and upload %d videos.\n', videos.length)
 
     for (const video of videos) {
-      await processVideo(video, program['languageCode'])
+      await processVideo(video, program['language'])
     }
 
     console.log('I\'m finished!')
@@ -107,7 +107,10 @@ async function uploadVideoOnPeerTube (videoInfo: any, videoPath: string, languag
   const licence = getLicence(videoInfo.license)
   let tags = []
   if (Array.isArray(videoInfo.tags)) {
-    tags = videoInfo.tags.filter(t => t.length < CONSTRAINTS_FIELDS.VIDEOS.TAG.max).slice(0, 5)
+    tags = videoInfo.tags
+      .filter(t => t.length < CONSTRAINTS_FIELDS.VIDEOS.TAG.max)
+      .map(t => t.normalize())
+      .slice(0, 5)
   }
 
   let thumbnailfile
diff --git a/server/tools/upload.ts b/server/tools/upload.ts
index de8ff8d26..97e24dc88 100644
--- a/server/tools/upload.ts
+++ b/server/tools/upload.ts
@@ -20,6 +20,7 @@ program
   .option('-d, --video-description <description>', 'Video description')
   .option('-t, --tags <tags>', 'Video tags', list)
   .option('-b, --thumbnail <thumbnailPath>', 'Thumbnail path')
+  .option('-v, --preview <previewPath>', 'Preview path')
   .option('-f, --file <file>', 'Video absolute file path')
   .parse(process.argv)
 
@@ -74,7 +75,8 @@ async function run () {
     tags: program['tags'],
     commentsEnabled: program['commentsEnabled'],
     fixture: program['file'],
-    thumbnailfile: program['thumbnailPath']
+    thumbnailfile: program['thumbnailPath'],
+    previewfile: program['previewPath']
   }
 
   await uploadVideo(program['url'], accessToken, videoAttributes)
-- 
2.41.0