diff options
Diffstat (limited to 'server/helpers')
-rw-r--r-- | server/helpers/custom-validators/jobs.ts | 2 | ||||
-rw-r--r-- | server/helpers/ffmpeg/ffmpeg-commons.ts | 4 | ||||
-rw-r--r-- | server/helpers/ffmpeg/ffmpeg-vod.ts | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/server/helpers/custom-validators/jobs.ts b/server/helpers/custom-validators/jobs.ts index f6777ecd5..c168b3e91 100644 --- a/server/helpers/custom-validators/jobs.ts +++ b/server/helpers/custom-validators/jobs.ts | |||
@@ -2,7 +2,7 @@ import { JobState } from '../../../shared/models' | |||
2 | import { exists } from './misc' | 2 | import { exists } from './misc' |
3 | import { jobTypes } from '@server/lib/job-queue/job-queue' | 3 | import { jobTypes } from '@server/lib/job-queue/job-queue' |
4 | 4 | ||
5 | const jobStates: JobState[] = [ 'active', 'completed', 'failed', 'waiting', 'delayed', 'paused' ] | 5 | const jobStates: JobState[] = [ 'active', 'completed', 'failed', 'waiting', 'delayed', 'paused', 'waiting-children' ] |
6 | 6 | ||
7 | function isValidJobState (value: JobState) { | 7 | function isValidJobState (value: JobState) { |
8 | return exists(value) && jobStates.includes(value) | 8 | return exists(value) && jobStates.includes(value) |
diff --git a/server/helpers/ffmpeg/ffmpeg-commons.ts b/server/helpers/ffmpeg/ffmpeg-commons.ts index ee338889c..b01989899 100644 --- a/server/helpers/ffmpeg/ffmpeg-commons.ts +++ b/server/helpers/ffmpeg/ffmpeg-commons.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Job } from 'bull' | 1 | import { Job } from 'bullmq' |
2 | import ffmpeg, { FfmpegCommand } from 'fluent-ffmpeg' | 2 | import ffmpeg, { FfmpegCommand } from 'fluent-ffmpeg' |
3 | import { execPromise } from '@server/helpers/core-utils' | 3 | import { execPromise } from '@server/helpers/core-utils' |
4 | import { logger, loggerTagsFactory } from '@server/helpers/logger' | 4 | import { logger, loggerTagsFactory } from '@server/helpers/logger' |
@@ -81,7 +81,7 @@ async function runCommand (options: { | |||
81 | command.on('progress', progress => { | 81 | command.on('progress', progress => { |
82 | if (!progress.percent) return | 82 | if (!progress.percent) return |
83 | 83 | ||
84 | job.progress(Math.round(progress.percent)) | 84 | job.updateProgress(Math.round(progress.percent)) |
85 | .catch(err => logger.warn('Cannot set ffmpeg job progress.', { err, ...lTags() })) | 85 | .catch(err => logger.warn('Cannot set ffmpeg job progress.', { err, ...lTags() })) |
86 | }) | 86 | }) |
87 | } | 87 | } |
diff --git a/server/helpers/ffmpeg/ffmpeg-vod.ts b/server/helpers/ffmpeg/ffmpeg-vod.ts index f84157e0f..7a81a1313 100644 --- a/server/helpers/ffmpeg/ffmpeg-vod.ts +++ b/server/helpers/ffmpeg/ffmpeg-vod.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Job } from 'bull' | 1 | import { Job } from 'bullmq' |
2 | import { FfmpegCommand } from 'fluent-ffmpeg' | 2 | import { FfmpegCommand } from 'fluent-ffmpeg' |
3 | import { readFile, writeFile } from 'fs-extra' | 3 | import { readFile, writeFile } from 'fs-extra' |
4 | import { dirname } from 'path' | 4 | import { dirname } from 'path' |