X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fcreate-transcoding-job.ts;h=65e65b6162cff629bc1526e0df924c887830eb0c;hb=39072b2f6ae04d2037ef2cb678ce9c352a370278;hp=2eb872169f00cfad6a07737ba220be51d5b28523;hpb=e2600d8b261994abbbeb1ff921edaefd267fc122;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index 2eb872169..65e65b616 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -1,20 +1,29 @@
-import * as program from 'commander'
+import { registerTSPaths } from '../server/helpers/register-ts-paths'
+registerTSPaths()
+
+import { 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/ffprobe-utils'
+import { VideoTranscodingPayload } from '@shared/models'
+import { CONFIG } from '@server/initializers/config'
+import { isUUIDValid } from '@server/helpers/custom-validators/misc'
 
 program
   .option('-v, --video [videoUUID]', 'Video UUID')
   .option('-r, --resolution [resolution]', 'Video resolution (integer)')
+  .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)
 }
@@ -29,14 +38,59 @@ run()
 async function run () {
   await initDatabaseModels(true)
 
-  const video = await VideoModel.loadByUUID(program['video'])
+  if (isUUIDValid(options.video) === false) {
+    console.error('%s is not a valid video UUID.', options.video)
+    return
+  }
+
+  const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(options.video)
   if (!video) throw new Error('Video not found.')
 
-  const dataInput: VideoTranscodingPayload = program.resolution !== undefined
-   ? { type: 'new-resolution' as 'new-resolution', videoUUID: video.uuid, isNewVideo: false, resolution: program.resolution }
-   : { type: 'optimize' as 'optimize', videoUUID: video.uuid, isNewVideo: false }
+  const dataInput: VideoTranscodingPayload[] = []
+  const { videoFileResolution } = await video.getMaxQualityResolution()
+
+  // Generate HLS files
+  if (options.generateHls || CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
+    const resolutionsEnabled = options.resolution
+      ? [ options.resolution ]
+      : computeResolutionsToTranscode(videoFileResolution, 'vod').concat([ videoFileResolution ])
+
+    for (const resolution of resolutionsEnabled) {
+      dataInput.push({
+        type: 'new-resolution-to-hls',
+        videoUUID: video.uuid,
+        resolution,
+        isPortraitMode: false,
+        copyCodecs: false,
+        isMaxQuality: false
+      })
+    }
+  } else {
+    if (options.resolution !== undefined) {
+      dataInput.push({
+        type: 'new-resolution-to-webtorrent',
+        videoUUID: video.uuid,
+        isNewVideo: false,
+        resolution: options.resolution
+      })
+    } else {
+      if (video.VideoFiles.length === 0) {
+        console.error('Cannot regenerate webtorrent files with a HLS only video.')
+        return
+      }
+
+      dataInput.push({
+        type: 'optimize-to-webtorrent',
+        videoUUID: video.uuid,
+        isNewVideo: false
+      })
+    }
+  }
 
   await JobQueue.Instance.init()
-  await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput })
-  console.log('Transcoding job for video %s created.', video.uuid)
+
+  for (const d of dataInput) {
+    await JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: d })
+    console.log('Transcoding job for video %s created.', video.uuid)
+  }
 }