X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo.ts;h=61fee4949291ec3786f5da203c44528f82e26869;hb=764b1a14fc494f2cfd7ea590d2f07b01df65c7ad;hp=9469b817899dcce5fd3292afefbd15ceacc074bc;hpb=c7027c06e9a73dad99d3f9bd9937a41a763850ce;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/video.ts b/server/lib/video.ts index 9469b8178..61fee4949 100644 --- a/server/lib/video.ts +++ b/server/lib/video.ts @@ -1,15 +1,16 @@ +import { UploadFiles } from 'express' import { Transaction } from 'sequelize/types' import { DEFAULT_AUDIO_RESOLUTION, JOB_PRIORITY } from '@server/initializers/constants' import { sequelizeTypescript } from '@server/initializers/database' import { TagModel } from '@server/models/video/tag' import { VideoModel } from '@server/models/video/video' import { FilteredModelAttributes } from '@server/types' -import { MThumbnail, MUserId, MVideo, MVideoFile, MVideoTag, MVideoThumbnail, MVideoUUID } from '@server/types/models' +import { MThumbnail, MUserId, MVideoFile, MVideoTag, MVideoThumbnail, MVideoUUID } from '@server/types/models' import { ThumbnailType, VideoCreate, VideoPrivacy, VideoTranscodingPayload } from '@shared/models' import { federateVideoIfNeeded } from './activitypub/videos' import { JobQueue } from './job-queue/job-queue' import { Notifier } from './notifier' -import { createVideoMiniatureFromExisting } from './thumbnail' +import { updateVideoMiniatureFromExisting } from './thumbnail' function buildLocalVideoFromReq (videoInfo: VideoCreate, channelId: number): FilteredModelAttributes { return { @@ -27,12 +28,14 @@ function buildLocalVideoFromReq (videoInfo: VideoCreate, channelId: number): Fil privacy: videoInfo.privacy || VideoPrivacy.PRIVATE, channelId: channelId, originallyPublishedAt: videoInfo.originallyPublishedAt + ? new Date(videoInfo.originallyPublishedAt) + : null } } async function buildVideoThumbnailsFromReq (options: { video: MVideoThumbnail - files: { [fieldname: string]: Express.Multer.File[] } | Express.Multer.File[] + files: UploadFiles fallback: (type: ThumbnailType) => Promise automaticallyGenerated?: boolean }) { @@ -51,7 +54,7 @@ async function buildVideoThumbnailsFromReq (options: { const fields = files?.[p.fieldName] if (fields) { - return createVideoMiniatureFromExisting({ + return updateVideoMiniatureFromExisting({ inputPath: fields[0].path, video, type: p.type, @@ -102,7 +105,7 @@ async function publishAndFederateIfNeeded (video: MVideoUUID, wasLive = false) { } } -async function addOptimizeOrMergeAudioJob (video: MVideo, videoFile: MVideoFile, user: MUserId) { +async function addOptimizeOrMergeAudioJob (video: MVideoUUID, videoFile: MVideoFile, user: MUserId) { let dataInput: VideoTranscodingPayload if (videoFile.isAudio()) {