mirror of https://github.com/Chocobozzz/PeerTube
Fix create transcoding job script
Depending on the file and the webtorrent/hls configpull/3745/head
parent
ff9112ad21
commit
20eb3a5be0
|
@ -7,6 +7,7 @@ import { initDatabaseModels } from '../server/initializers/database'
|
||||||
import { JobQueue } from '../server/lib/job-queue'
|
import { JobQueue } from '../server/lib/job-queue'
|
||||||
import { computeResolutionsToTranscode } from '@server/helpers/ffprobe-utils'
|
import { computeResolutionsToTranscode } from '@server/helpers/ffprobe-utils'
|
||||||
import { VideoTranscodingPayload } from '@shared/models'
|
import { VideoTranscodingPayload } from '@shared/models'
|
||||||
|
import { CONFIG } from '@server/initializers/config'
|
||||||
|
|
||||||
program
|
program
|
||||||
.option('-v, --video [videoUUID]', 'Video UUID')
|
.option('-v, --video [videoUUID]', 'Video UUID')
|
||||||
|
@ -42,7 +43,8 @@ async function run () {
|
||||||
const dataInput: VideoTranscodingPayload[] = []
|
const dataInput: VideoTranscodingPayload[] = []
|
||||||
const { videoFileResolution } = await video.getMaxQualityResolution()
|
const { videoFileResolution } = await video.getMaxQualityResolution()
|
||||||
|
|
||||||
if (options.generateHls) {
|
// Generate HLS files
|
||||||
|
if (options.generateHls || CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
|
||||||
const resolutionsEnabled = options.resolution
|
const resolutionsEnabled = options.resolution
|
||||||
? [ options.resolution ]
|
? [ options.resolution ]
|
||||||
: computeResolutionsToTranscode(videoFileResolution, 'vod').concat([ videoFileResolution ])
|
: computeResolutionsToTranscode(videoFileResolution, 'vod').concat([ videoFileResolution ])
|
||||||
|
@ -57,7 +59,8 @@ async function run () {
|
||||||
isMaxQuality: false
|
isMaxQuality: false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
} else if (options.resolution !== undefined) {
|
} else {
|
||||||
|
if (options.resolution !== undefined) {
|
||||||
dataInput.push({
|
dataInput.push({
|
||||||
type: 'new-resolution-to-webtorrent',
|
type: 'new-resolution-to-webtorrent',
|
||||||
videoUUID: video.uuid,
|
videoUUID: video.uuid,
|
||||||
|
@ -65,12 +68,18 @@ async function run () {
|
||||||
resolution: options.resolution
|
resolution: options.resolution
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
if (video.VideoFiles.length === 0) {
|
||||||
|
console.error('Cannot regenerate webtorrent files with a HLS only video.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
dataInput.push({
|
dataInput.push({
|
||||||
type: 'optimize-to-webtorrent',
|
type: 'optimize-to-webtorrent',
|
||||||
videoUUID: video.uuid,
|
videoUUID: video.uuid,
|
||||||
isNewVideo: false
|
isNewVideo: false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
await JobQueue.Instance.init()
|
await JobQueue.Instance.init()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue