X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo.ts;h=6c4f3ce7b0c00826bd8eab505d9d6f02f640b6eb;hb=97922ecf640eb449f0664f23f9f69eeb4d9f5cd9;hp=f7d7aa186bf589db7279dc7252e6851ea23d512d;hpb=bd911b54b555b11df7e9849cf92d358bccfecf6e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/video.ts b/server/lib/video.ts index f7d7aa186..6c4f3ce7b 100644 --- a/server/lib/video.ts +++ b/server/lib/video.ts @@ -9,7 +9,7 @@ import { VideoJobInfoModel } from '@server/models/video/video-job-info' import { FilteredModelAttributes } from '@server/types' import { MThumbnail, MUserId, MVideoFile, MVideoTag, MVideoThumbnail, MVideoUUID } from '@server/types/models' import { ThumbnailType, VideoCreate, VideoPrivacy, VideoState, VideoTranscodingPayload } from '@shared/models' -import { CreateJobOptions, JobQueue } from './job-queue/job-queue' +import { CreateJobOptions } from './job-queue/job-queue' import { updateVideoMiniatureFromExisting } from './thumbnail' function buildLocalVideoFromReq (videoInfo: VideoCreate, channelId: number): FilteredModelAttributes { @@ -121,10 +121,10 @@ async function buildOptimizeOrMergeAudioJob (options: { } } -async function addTranscodingJob (payload: VideoTranscodingPayload, options: CreateJobOptions = {}) { +async function buildTranscodingJob (payload: VideoTranscodingPayload, options: CreateJobOptions = {}) { await VideoJobInfoModel.increaseOrCreate(payload.videoUUID, 'pendingTranscode') - return JobQueue.Instance.createJob({ type: 'video-transcoding', payload, ...options }) + return { type: 'video-transcoding' as 'video-transcoding', payload, ...options } } async function getTranscodingJobPriority (user: MUserId) { @@ -182,7 +182,7 @@ export { buildVideoThumbnailsFromReq, setVideoTags, buildOptimizeOrMergeAudioJob, - addTranscodingJob, + buildTranscodingJob, buildMoveToObjectStorageJob, getTranscodingJobPriority, getCachedVideoDuration