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

diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index eb620aeca..30846cd15 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -1,12 +1,15 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
 registerTSPaths()
 
-import * as program from 'commander'
+import { program } from 'commander'
 import { VideoModel } from '../server/models/video/video'
 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 { 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'
 
 program
   .option('-v, --video [videoUUID]', 'Video UUID')
@@ -36,16 +39,24 @@ run()
 async function run () {
   await initDatabaseModels(true)
 
-  const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(options.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.loadAndPopulateAccountAndServerAndTags(uuid)
   if (!video) throw new Error('Video not found.')
 
   const dataInput: VideoTranscodingPayload[] = []
-  const { videoFileResolution } = await video.getMaxQualityResolution()
+  const resolution = video.getMaxQualityFile().resolution
 
-  if (options.generateHls) {
+  // Generate HLS files
+  if (options.generateHls || CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
     const resolutionsEnabled = options.resolution
       ? [ options.resolution ]
-      : computeResolutionsToTranscode(videoFileResolution, 'vod').concat([ videoFileResolution ])
+      : computeResolutionsToTranscode(resolution, 'vod').concat([ resolution ])
 
     for (const resolution of resolutionsEnabled) {
       dataInput.push({
@@ -53,28 +64,40 @@ async function run () {
         videoUUID: video.uuid,
         resolution,
         isPortraitMode: false,
-        copyCodecs: false
+        copyCodecs: false,
+        isNewVideo: false,
+        isMaxQuality: false
       })
     }
-  } else if (options.resolution !== undefined) {
-    dataInput.push({
-      type: 'new-resolution-to-webtorrent',
-      videoUUID: video.uuid,
-      isNewVideo: false,
-      resolution: options.resolution
-    })
   } else {
-    dataInput.push({
-      type: 'optimize-to-webtorrent',
-      videoUUID: video.uuid,
-      isNewVideo: false
-    })
+    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()
+  JobQueue.Instance.init()
+
+  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)
   }
 }