Fix create transcoding job script

Depending on the file and the webtorrent/hls config
pull/3745/head
Chocobozzz 2021-02-11 15:40:54 +01:00
parent ff9112ad21
commit 20eb3a5be0
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 22 additions and 13 deletions

View File

@ -7,6 +7,7 @@ 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'
program
.option('-v, --video [videoUUID]', 'Video UUID')
@ -42,7 +43,8 @@ async function run () {
const dataInput: VideoTranscodingPayload[] = []
const { videoFileResolution } = await video.getMaxQualityResolution()
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 ])
@ -57,7 +59,8 @@ async function run () {
isMaxQuality: false
})
}
} else if (options.resolution !== undefined) {
} else {
if (options.resolution !== undefined) {
dataInput.push({
type: 'new-resolution-to-webtorrent',
videoUUID: video.uuid,
@ -65,12 +68,18 @@ async function run () {
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()