X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo.ts;h=b843b11bc4d65844710ac63a1eee2d595592293a;hb=1bb4c9ab2e8b3b3022351b33a82a5e527fa5d4d7;hp=a98e45c604d6482f637e97c3b193c30fa0661d01;hpb=1808a1f8e4b7b102823492a2007a46929aebf189;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/video.ts b/server/lib/video.ts index a98e45c60..b843b11bc 100644 --- a/server/lib/video.ts +++ b/server/lib/video.ts @@ -1,6 +1,6 @@ import { UploadFiles } from 'express' import { Transaction } from 'sequelize/types' -import { DEFAULT_AUDIO_RESOLUTION, JOB_PRIORITY } from '@server/initializers/constants' +import { DEFAULT_AUDIO_RESOLUTION, JOB_PRIORITY, MEMOIZE_LENGTH, MEMOIZE_TTL } from '@server/initializers/constants' import { TagModel } from '@server/models/video/tag' import { VideoModel } from '@server/models/video/video' import { VideoJobInfoModel } from '@server/models/video/video-job-info' @@ -10,6 +10,7 @@ import { ThumbnailType, VideoCreate, VideoPrivacy, VideoState, VideoTranscodingP import { CreateJobOptions, JobQueue } from './job-queue/job-queue' import { updateVideoMiniatureFromExisting } from './thumbnail' import { CONFIG } from '@server/initializers/config' +import memoizee from 'memoizee' function buildLocalVideoFromReq (videoInfo: VideoCreate, channelId: number): FilteredModelAttributes { return { @@ -25,7 +26,7 @@ function buildLocalVideoFromReq (videoInfo: VideoCreate, channelId: number): Fil description: videoInfo.description, support: videoInfo.support, privacy: videoInfo.privacy || VideoPrivacy.PRIVATE, - channelId: channelId, + channelId, originallyPublishedAt: videoInfo.originallyPublishedAt ? new Date(videoInfo.originallyPublishedAt) : null @@ -121,7 +122,7 @@ async function addOptimizeOrMergeAudioJob (options: { async function addTranscodingJob (payload: VideoTranscodingPayload, options: CreateJobOptions = {}) { await VideoJobInfoModel.increaseOrCreate(payload.videoUUID, 'pendingTranscode') - return JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: payload }, options) + return JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload }, options) } async function getTranscodingJobPriority (user: MUserId) { @@ -150,6 +151,24 @@ async function addMoveToObjectStorageJob (options: { // --------------------------------------------------------------------------- +async function getVideoDuration (videoId: number | string) { + const video = await VideoModel.load(videoId) + + const duration = video.isLive + ? undefined + : video.duration + + return { duration, isLive: video.isLive } +} + +const getCachedVideoDuration = memoizee(getVideoDuration, { + promise: true, + max: MEMOIZE_LENGTH.VIDEO_DURATION, + maxAge: MEMOIZE_TTL.VIDEO_DURATION +}) + +// --------------------------------------------------------------------------- + export { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, @@ -157,5 +176,6 @@ export { addOptimizeOrMergeAudioJob, addTranscodingJob, addMoveToObjectStorageJob, - getTranscodingJobPriority + getTranscodingJobPriority, + getCachedVideoDuration }