Limit associations fetch when loading token

[github/Chocobozzz/PeerTube.git] / server / tools / import-videos.ts

diff --git a/server/tools/import-videos.ts b/server/tools/import-videos.ts
index e49fbb2f5ef3e0f2253703e0b94fb9581ecc3572..3ff194c83110b083ae44ea9f1b290f24b19d9d7b 100644 (file)
--- a/server/tools/import-videos.ts
+++ b/server/tools/import-videos.ts
@@ -5,12 +5,12 @@ import * as program from 'commander'
 import { join } from 'path'
 import * as youtubeDL from 'youtube-dl'
 import { VideoPrivacy } from '../../shared/models/videos'
-import { unlinkPromise } from '../helpers/core-utils'
 import { doRequestAndSaveToFile } from '../helpers/requests'
 import { CONSTRAINTS_FIELDS } from '../initializers'
-import { getClient, getVideoCategories, login, searchVideo, uploadVideo } from '../tests/utils'
+import { getClient, getVideoCategories, login, searchVideoWithSort, uploadVideo } from '../tests/utils'
 import { truncate } from 'lodash'
 import * as prompt from 'prompt'
+import { remove } from 'fs-extra'
 
 program
   .option('-u, --url <url>', 'Server url')
@@ -113,7 +113,7 @@ function processVideo (info: any, languageCode: string) {
     const videoInfo = await fetchObject(info)
     if (program['verbose']) console.log('Fetched object.', videoInfo)
 
-    const result = await searchVideo(program['url'], videoInfo.title)
+    const result = await searchVideoWithSort(program['url'], videoInfo.title, '-match')
 
     console.log('############################################################\n')
 
@@ -204,10 +204,8 @@ async function uploadVideoOnPeerTube (videoInfo: any, videoPath: string, languag
     }
   }
 
-  await unlinkPromise(videoPath)
-  if (thumbnailfile) {
-    await unlinkPromise(thumbnailfile)
-  }
+  await remove(videoPath)
+  if (thumbnailfile) await remove(thumbnailfile)
 
   console.log('Uploaded video "%s"!\n', videoAttributes.name)
 }