X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fcreate-transcoding-job.ts;h=f8c0ed4618e4149457ae88c8a2541d4411fce497;hb=5e2afe4290103bf0d54ae7b3e62781f2a00487c9;hp=65e65b6162cff629bc1526e0df924c887830eb0c;hpb=8cc6120118a9fb75b3165c9f84b2d0068d1ade72;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index 65e65b616..f8c0ed461 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -1,14 +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 { addTranscodingJob } 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 { VideoTranscodingPayload } from '@shared/models'
-import { CONFIG } from '@server/initializers/config'
-import { isUUIDValid } from '@server/helpers/custom-validators/misc'
+import { VideoModel } from '../server/models/video/video'
 
 program
   .option('-v, --video [videoUUID]', 'Video UUID')
@@ -38,31 +36,37 @@ run()
 async function run () {
   await initDatabaseModels(true)
 
-  if (isUUIDValid(options.video) === false) {
+  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.loadAndPopulateAccountAndServerAndTags(options.video)
+  const video = await VideoModel.loadFull(uuid)
   if (!video) throw new Error('Video not found.')
 
   const dataInput: VideoTranscodingPayload[] = []
-  const { videoFileResolution } = await video.getMaxQualityResolution()
+  const maxResolution = video.getMaxQualityFile().resolution
 
   // Generate HLS files
   if (options.generateHls || CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
     const resolutionsEnabled = options.resolution
-      ? [ options.resolution ]
-      : computeResolutionsToTranscode(videoFileResolution, 'vod').concat([ videoFileResolution ])
+      ? [ parseInt(options.resolution) ]
+      : computeResolutionsToTranscode({ input: maxResolution, type: 'vod', includeInput: true, strictLower: false })
 
     for (const resolution of resolutionsEnabled) {
       dataInput.push({
         type: 'new-resolution-to-hls',
         videoUUID: video.uuid,
         resolution,
-        isPortraitMode: false,
+
+        hasAudio: true,
+
         copyCodecs: false,
-        isMaxQuality: false
+        isNewVideo: false,
+        isMaxQuality: maxResolution === resolution,
+        autoDeleteWebTorrentIfNeeded: false
       })
     }
   } else {
@@ -70,8 +74,14 @@ async function run () {
       dataInput.push({
         type: 'new-resolution-to-webtorrent',
         videoUUID: video.uuid,
+
+        createHLSIfNeeded: true,
+
+        // FIXME: check the file has audio
+        hasAudio: true,
+
         isNewVideo: false,
-        resolution: options.resolution
+        resolution: parseInt(options.resolution)
       })
     } else {
       if (video.VideoFiles.length === 0) {
@@ -87,10 +97,13 @@ async function run () {
     }
   }
 
-  await JobQueue.Instance.init()
+  JobQueue.Instance.init(true)
+
+  video.state = VideoState.TO_TRANSCODE
+  await video.save()
 
   for (const d of dataInput) {
-    await JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: d })
+    await addTranscodingJob(d, {})
     console.log('Transcoding job for video %s created.', video.uuid)
   }
 }