X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-import-videos.ts;h=9a366dbbda3bca26376bb11f3f577a8a5eeafe87;hb=2b4dd7e26d93c2d9bef4f365cb03c511eff4ca8f;hp=024f640a4f1b64f971dd179a2111f7ed3da0b842;hpb=47f6409bb8bc49a50027b9579bb651c0506b6912;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts
index 024f640a4..9a366dbbd 100644
--- a/server/tools/peertube-import-videos.ts
+++ b/server/tools/peertube-import-videos.ts
@@ -12,7 +12,7 @@ import * as prompt from 'prompt'
 import { remove } from 'fs-extra'
 import { sha256 } from '../helpers/core-utils'
 import { buildOriginallyPublishedAt, safeGetYoutubeDL } from '../helpers/youtube-dl'
-import { getSettings, netrc } from './cli'
+import { getNetrc, getRemoteObjectOrDie, getSettings } from './cli'
 
 let accessToken: string
 let client: { id: string, secret: string }
@@ -32,48 +32,30 @@ program
   .option('-v, --verbose', 'Verbose mode')
   .parse(process.argv)
 
-getSettings()
-.then(settings => {
-  if ((!program['url'] || !program['username'] || !program['targetUrl']) && settings.remotes.length === 0) {
-    if (!program['url']) console.error('--url field is required.')
-    if (!program['username']) console.error('--username field is required.')
-    if (!program['targetUrl']) console.error('--targetUrl field is required.')
+Promise.all([ getSettings(), getNetrc() ])
+       .then(([ settings, netrc ]) => {
+         const { url, username, password } = getRemoteObjectOrDie(program, settings)
 
-    process.exit(-1)
-  }
-
-  if ((!program[ 'url' ] || !program[ 'username' ]) && settings.remotes.length > 0) {
-    if (!program[ 'url' ]) {
-      program[ 'url' ] = settings.default !== -1
-        ? settings.remotes[ settings.default ]
-        : settings.remotes[ 0 ]
-    }
-
-    if (!program['username']) program['username'] = netrc.machines[program['url']].login
-    if (!program['password']) program['password'] = netrc.machines[program['url']].password
-  }
+         if (!program[ 'targetUrl' ]) {
+           console.error('--targetUrl field is required.')
 
-  if (
-    !program['targetUrl']
-  ) {
-    if (!program['targetUrl']) console.error('--targetUrl field is required.')
-    process.exit(-1)
-  }
+           process.exit(-1)
+         }
 
-  removeEndSlashes(program['url'])
-  removeEndSlashes(program['targetUrl'])
+         removeEndSlashes(url)
+         removeEndSlashes(program[ 'targetUrl' ])
 
-  const user = {
-    username: program['username'],
-    password: program['password']
-  }
+         const user = {
+           username: username,
+           password: password
+         }
 
-  run(user, program['url'])
-    .catch(err => {
-      console.error(err)
-      process.exit(-1)
-    })
-})
+         run(user, url)
+           .catch(err => {
+             console.error(err)
+             process.exit(-1)
+           })
+       })
 
 async function promptPassword () {
   return new Promise((res, rej) => {
@@ -116,7 +98,7 @@ async function run (user, url: string) {
   const youtubeDL = await safeGetYoutubeDL()
 
   const options = [ '-j', '--flat-playlist', '--playlist-reverse' ]
-  youtubeDL.getInfo(program['targetUrl'], options, processOptions, async (err, info) => {
+  youtubeDL.getInfo(program[ 'targetUrl' ], options, processOptions, async (err, info) => {
     if (err) {
       console.log(err.message)
       process.exit(1)
@@ -133,20 +115,20 @@ async function run (user, url: string) {
     console.log('Will download and upload %d videos.\n', infoArray.length)
 
     for (const info of infoArray) {
-      await processVideo(info, program['language'], processOptions.cwd, url, user)
+      await processVideo(info, program[ 'language' ], processOptions.cwd, url, user)
     }
 
-    console.log('Video/s for user %s imported: %s', program['username'], program['targetUrl'])
+    console.log('Video/s for user %s imported: %s', program[ 'username' ], program[ 'targetUrl' ])
     process.exit(0)
   })
 }
 
 function processVideo (info: any, languageCode: string, cwd: string, url: string, user) {
   return new Promise(async res => {
-    if (program['verbose']) console.log('Fetching object.', info)
+    if (program[ 'verbose' ]) console.log('Fetching object.', info)
 
     const videoInfo = await fetchObject(info)
-    if (program['verbose']) console.log('Fetched object.', videoInfo)
+    if (program[ 'verbose' ]) console.log('Fetched object.', videoInfo)
 
     const result = await searchVideoWithSort(url, videoInfo.title, '-match')
 
@@ -187,9 +169,9 @@ async function uploadVideoOnPeerTube (videoInfo: any, videoPath: string, cwd: st
   let tags = []
   if (Array.isArray(videoInfo.tags)) {
     tags = videoInfo.tags
-      .filter(t => t.length < CONSTRAINTS_FIELDS.VIDEOS.TAG.max && t.length > CONSTRAINTS_FIELDS.VIDEOS.TAG.min)
-      .map(t => t.normalize())
-      .slice(0, 5)
+                    .filter(t => t.length < CONSTRAINTS_FIELDS.VIDEOS.TAG.max && t.length > CONSTRAINTS_FIELDS.VIDEOS.TAG.min)
+                    .map(t => t.normalize())
+                    .slice(0, 5)
   }
 
   let thumbnailfile
@@ -253,7 +235,7 @@ async function uploadVideoOnPeerTube (videoInfo: any, videoPath: string, cwd: st
 async function getCategory (categories: string[], url: string) {
   if (!categories) return undefined
 
-  const categoryString = categories[0]
+  const categoryString = categories[ 0 ]
 
   if (categoryString === 'News & Politics') return 11
 
@@ -261,7 +243,7 @@ async function getCategory (categories: string[], url: string) {
   const categoriesServer = res.body
 
   for (const key of Object.keys(categoriesServer)) {
-    const categoryServer = categoriesServer[key]
+    const categoryServer = categoriesServer[ key ]
     if (categoryString.toLowerCase() === categoryServer.toLowerCase()) return parseInt(key, 10)
   }
 
@@ -285,12 +267,12 @@ function normalizeObject (obj: any) {
     // Deprecated key
     if (key === 'resolution') continue
 
-    const value = obj[key]
+    const value = obj[ key ]
 
     if (typeof value === 'string') {
-      newObj[key] = value.normalize()
+      newObj[ key ] = value.normalize()
     } else {
-      newObj[key] = value
+      newObj[ key ] = value
     }
   }