X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fcreate-transcoding-job.ts;h=5f56d6d3684039e7be7e65c6691ac3670918e423;hb=fd0c11551cde6fe55b2f32e5c6c510813885a0d8;hp=27170299d657e76a94d9254d6dd9ec1b81c98498;hpb=dee6fe1e4f5c024fd387e8c2b306c174b24aa8b3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index 27170299d..5f56d6d36 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -3,10 +3,10 @@ registerTSPaths()
 
 import * as program from 'commander'
 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 { VideoTranscodingPayload } from '../server/lib/job-queue/handlers/video-transcoding'
-import { computeResolutionsToTranscode } from '@server/helpers/ffmpeg-utils'
+import { computeResolutionsToTranscode } from '@server/helpers/ffprobe-utils'
+import { VideoTranscodingPayload } from '@shared/models'
 
 program
   .option('-v, --video [videoUUID]', 'Video UUID')
@@ -14,12 +14,14 @@ program
   .option('--generate-hls', 'Generate HLS playlist')
   .parse(process.argv)
 
-if (program['video'] === undefined) {
+const options = program.opts()
+
+if (options.video === undefined) {
   console.error('All parameters are mandatory.')
   process.exit(-1)
 }
 
-if (program.resolution !== undefined && Number.isNaN(+program.resolution)) {
+if (options.resolution !== undefined && Number.isNaN(+options.resolution)) {
   console.error('The resolution must be an integer (example: 1080).')
   process.exit(-1)
 }
@@ -34,36 +36,37 @@ run()
 async function run () {
   await initDatabaseModels(true)
 
-  const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(program['video'])
+  const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(options.video)
   if (!video) throw new Error('Video not found.')
 
   const dataInput: VideoTranscodingPayload[] = []
   const { videoFileResolution } = await video.getMaxQualityResolution()
 
-  if (program.generateHls) {
-    const resolutionsEnabled = program.resolution
-      ? [ program.resolution ]
-      : computeResolutionsToTranscode(videoFileResolution).concat([ videoFileResolution ])
+  if (options.generateHls) {
+    const resolutionsEnabled = options.resolution
+      ? [ options.resolution ]
+      : computeResolutionsToTranscode(videoFileResolution, 'vod').concat([ videoFileResolution ])
 
     for (const resolution of resolutionsEnabled) {
       dataInput.push({
-        type: 'hls',
+        type: 'new-resolution-to-hls',
         videoUUID: video.uuid,
         resolution,
         isPortraitMode: false,
-        copyCodecs: false
+        copyCodecs: false,
+        isMaxQuality: false
       })
     }
-  } else if (program.resolution !== undefined) {
+  } else if (options.resolution !== undefined) {
     dataInput.push({
-      type: 'new-resolution' as 'new-resolution',
+      type: 'new-resolution-to-webtorrent',
       videoUUID: video.uuid,
       isNewVideo: false,
-      resolution: program.resolution
+      resolution: options.resolution
     })
   } else {
     dataInput.push({
-      type: 'optimize' as 'optimize',
+      type: 'optimize-to-webtorrent',
       videoUUID: video.uuid,
       isNewVideo: false
     })
@@ -72,7 +75,7 @@ async function run () {
   await JobQueue.Instance.init()
 
   for (const d of dataInput) {
-    await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: d })
+    await JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: d })
     console.log('Transcoding job for video %s created.', video.uuid)
   }
 }