X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fcreate-import-video-file-job.ts;h=071d36df4c785578651421c0cac05b3b95356d83;hb=e1ab52d7ec7370a6f9f5937192d6003206af1ac0;hp=37738ca40c896b08448ab30417304c72ede0213e;hpb=338eb9d33af690db716805fd2277bf68f473b58f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/create-import-video-file-job.ts b/scripts/create-import-video-file-job.ts
index 37738ca40..071d36df4 100644
--- a/scripts/create-import-video-file-job.ts
+++ b/scripts/create-import-video-file-job.ts
@@ -1,11 +1,12 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
-import * as program from 'commander'
+import { program } from 'commander'
 import { resolve } from 'path'
 import { VideoModel } from '../server/models/video/video'
-import { initDatabaseModels } from '../server/initializers'
+import { initDatabaseModels } from '../server/initializers/database'
 import { JobQueue } from '../server/lib/job-queue'
+import { isUUIDValid, toCompleteUUID } from '@server/helpers/custom-validators/misc'
 
 program
   .option('-v, --video [videoUUID]', 'Video UUID')
@@ -13,7 +14,9 @@ program
   .description('Import a video file to replace an already uploaded file or to add a new resolution')
   .parse(process.argv)
 
-if (program['video'] === undefined || program['import'] === undefined) {
+const options = program.opts()
+
+if (options.video === undefined || options.import === undefined) {
   console.error('All parameters are mandatory.')
   process.exit(-1)
 }
@@ -28,16 +31,23 @@ run()
 async function run () {
   await initDatabaseModels(true)
 
-  const video = await VideoModel.loadByUUID(program['video'])
+  const uuid = toCompleteUUID(options.video)
+
+  if (isUUIDValid(uuid) === false) {
+    console.error('%s is not a valid video UUID.', options.video)
+    return
+  }
+
+  const video = await VideoModel.load(uuid)
   if (!video) throw new Error('Video not found.')
   if (video.isOwned() === false) throw new Error('Cannot import files of a non owned video.')
 
   const dataInput = {
     videoUUID: video.uuid,
-    filePath: resolve(program['import'])
+    filePath: resolve(options.import)
   }
 
-  await JobQueue.Instance.init()
+  JobQueue.Instance.init(true)
   await JobQueue.Instance.createJobWithPromise({ type: 'video-file-import', payload: dataInput })
   console.log('Import job for video %s created.', video.uuid)
 }