X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fcreate-transcoding-job.ts;h=c77a5805f9d87a491ee22fd9eb8cc63d2f5d3eec;hb=81bd40d2cb563a4c1c7be9c2b17e37fc04bfff6a;hp=30846cd15d5ba45561e8bf63de92e10ae4afe005;hpb=c186a67f90203af6bfa434f026efdc99193bcd65;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index 30846cd15..c77a5805f 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -1,15 +1,12 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
 import { program } from 'commander'
-import { VideoModel } from '../server/models/video/video'
+import { isUUIDValid, toCompleteUUID } from '@server/helpers/custom-validators/misc'
+import { computeResolutionsToTranscode } from '@server/helpers/ffmpeg'
+import { CONFIG } from '@server/initializers/config'
+import { buildTranscodingJob } from '@server/lib/video'
+import { VideoState, VideoTranscodingPayload } from '@shared/models'
 import { initDatabaseModels } from '../server/initializers/database'
 import { JobQueue } from '../server/lib/job-queue'
-import { computeResolutionsToTranscode } from '@server/helpers/ffprobe-utils'
-import { VideoState, VideoTranscodingPayload } from '@shared/models'
-import { CONFIG } from '@server/initializers/config'
-import { isUUIDValid, toCompleteUUID } from '@server/helpers/custom-validators/misc'
-import { addTranscodingJob } from '@server/lib/video'
+import { VideoModel } from '../server/models/video/video'
 
 program
   .option('-v, --video [videoUUID]', 'Video UUID')
@@ -46,36 +43,47 @@ async function run () {
     return
   }
 
-  const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(uuid)
+  const video = await VideoModel.loadFull(uuid)
   if (!video) throw new Error('Video not found.')
 
   const dataInput: VideoTranscodingPayload[] = []
-  const resolution = video.getMaxQualityFile().resolution
+  const maxResolution = video.getMaxQualityFile().resolution
+
+  // FIXME: check the file has audio
+  const hasAudio = true
 
   // Generate HLS files
   if (options.generateHls || CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
     const resolutionsEnabled = options.resolution
-      ? [ options.resolution ]
-      : computeResolutionsToTranscode(resolution, 'vod').concat([ resolution ])
+      ? [ parseInt(options.resolution) ]
+      : computeResolutionsToTranscode({ input: maxResolution, type: 'vod', includeInput: true, strictLower: false, hasAudio })
 
     for (const resolution of resolutionsEnabled) {
       dataInput.push({
-        type: 'new-resolution-to-hls',
+        type: 'new-resolution-to-hls' as 'new-resolution-to-hls',
         videoUUID: video.uuid,
         resolution,
-        isPortraitMode: false,
+
+        hasAudio,
+
         copyCodecs: false,
         isNewVideo: false,
-        isMaxQuality: false
+        isMaxQuality: maxResolution === resolution,
+        autoDeleteWebTorrentIfNeeded: false
       })
     }
   } else {
     if (options.resolution !== undefined) {
       dataInput.push({
-        type: 'new-resolution-to-webtorrent',
+        type: 'new-resolution-to-webtorrent' as 'new-resolution-to-webtorrent',
         videoUUID: video.uuid,
+
+        createHLSIfNeeded: true,
+
+        hasAudio,
+
         isNewVideo: false,
-        resolution: options.resolution
+        resolution: parseInt(options.resolution)
       })
     } else {
       if (video.VideoFiles.length === 0) {
@@ -84,7 +92,7 @@ async function run () {
       }
 
       dataInput.push({
-        type: 'optimize-to-webtorrent',
+        type: 'optimize-to-webtorrent' as 'optimize-to-webtorrent',
         videoUUID: video.uuid,
         isNewVideo: false
       })
@@ -97,7 +105,8 @@ async function run () {
   await video.save()
 
   for (const d of dataInput) {
-    await addTranscodingJob(d, {})
+    await JobQueue.Instance.createJob(await buildTranscodingJob(d))
+
     console.log('Transcoding job for video %s created.', video.uuid)
   }
 }