X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-upload.ts;h=6248fb47d648f6cc1519f9892080991582e8b363;hb=26b415176212b44ff6ce168cb00aeb93b10c0cb3;hp=1f871e660ff555e7a59b2be1f21365822bc0c425;hpb=dc27668fceb1d0270c391c93c3bbc95d12e83218;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts
index 1f871e660..6248fb47d 100644
--- a/server/tools/peertube-upload.ts
+++ b/server/tools/peertube-upload.ts
@@ -15,6 +15,7 @@ program
   .option('-P, --privacy <privacy_number>', 'Privacy')
   .option('-N, --nsfw', 'Video is Not Safe For Work')
   .option('-c, --category <category_number>', 'Category number')
+  .option('-C, --channel-id <channel_id>', 'Channel ID')
   .option('-m, --comments-enabled', 'Enable comments')
   .option('-l, --licence <licence_number>', 'Licence number')
   .option('-L, --language <language_code>', 'Language ISO 639 code (fr or en...)')
@@ -75,7 +76,10 @@ getSettings()
       process.exit(-1)
     }
 
-    run().catch(err => console.error(err))
+    run().catch(err => {
+      console.error(err)
+      process.exit(-1)
+    })
   })
 
 async function run () {
@@ -90,8 +94,13 @@ async function run () {
     password: program[ 'password' ]
   }
 
-  const res2 = await login(program[ 'url' ], client, user)
-  const accessToken = res2.body.access_token
+  let accessToken: string
+  try {
+    const res2 = await login(program[ 'url' ], client, user)
+    accessToken = res2.body.access_token
+  } catch (err) {
+    throw new Error('Cannot authenticate. Please check your username/password.')
+  }
 
   await access(program[ 'file' ], constants.F_OK)
 
@@ -100,6 +109,7 @@ async function run () {
   const videoAttributes = {
     name: program['videoName'],
     category: program['category'],
+    channelId: program['channelId'],
     licence: program['licence'],
     language: program['language'],
     nsfw: program['nsfw'],
@@ -114,7 +124,7 @@ async function run () {
     support: undefined
   }
 
-  await uploadVideo(program['url'], accessToken, videoAttributes)
+  await uploadVideo(program[ 'url' ], accessToken, videoAttributes)
 
   console.log(`Video ${program['videoName']} uploaded.`)
   process.exit(0)