Alex Kotov
afa9798001
-----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEExEqtY4NnkSypPt1XWDphLYkBWb4FAmVlmW0ACgkQWDphLYkB Wb5XAwf9EyZxDg4ELjmqNIl+Za44TsnhcuSqY15o4vff3VkDXWZM1Fwd5YBGBlZ2 eNU+PzMN4uE+NJpX4JAip5KkJoMtETyAdo/9Uu6t0xbkyF/UMNY4xozZfRY5NDYL croGdU3KGP05V3y+yzA+Hkp/B08NrbsN/vqQN9wMdDkHDxHAZHvDoYkRgdPYVeEU as3dUSXUA1FcNahCl2ZUxUtoyIhnH5/xe/UnSRYofi9VmNE558f2YZ4ub5aUBZm0 cRQepnJ3v//yOK+xbn6lGVCr2T2kzBwiI5wM4iGQOxpeo5FOItE0nYco+ZRF+wCf ikGI3Dnd8JLhapH1+YkdxfykhyfEEw== =+/8Y -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJNBAABCAA3FiEEGCBYi9NGimfngx9dVTwOu+tdXwgFAmV6RXYZHGtvdG92YWxl eGFyaWFuQGdtYWlsLmNvbQAKCRBVPA67611fCK3YEACiwegaokQ+WLOs0MRapmra MrzeKPZAzVXfr9obJ1dWRvonxR3YbZ0Fo1y+3uZqVXNF9AZTcNigoe21XT6stB2K tNpO6iT6SxiFWDEBMeSALNrsRir8HjHDaoD2vl4eiDqIlyUPtJj2OjdtXXULMPWY /LeCRGBJPIFNO491Hukk08AE/t9uwFv1Hde8iFwsbYrGtERk1RSfCh3BeZxz0vXA QxO8XqVeFvuyEMEhHar+issMShU3YS6SSTvqpo9+HlH1R1ppdsD5u9eU05U/+dU/ kh8BviBX9cNt4mAvtfV5jtJrH1G7drSt12pw1i+c1beCaZ5OJGjBCLNV5I2p/xED 3vULZqqL32V9lrJjTUQGU5Ta/l8QMM7aSa8WB4eUataO1QPh+GPzJ2T2PCUE2bHS Em6+fKqtDPOO0RcskX+B1Losd8AMrfmdUsu15NFOF/tIgph111Dd11YV87G76wKF 9HUTN5NvFIugUpHctbe/iDU/dblytcMf1noPjKcXrYxmDBTHKGOzQoQzhwERJn33 /MyUjjrSjadCPWuKb7zPNG1MQz6xAtScl8vvrMV+wNExBROoR1Hj1gSmCjAOSoM5 AQK2Kr4ekb2mv7Vz+Mx+pu2r6E3ylB3FnF+rIJz117pFmIrvGXwX479X1oOgS4TT UKlGR5pkLNqSfUo5d+3CMQ== =sV0U -----END PGP SIGNATURE----- Merge tag 'v6.0.0' into changes v6.0.0
192 lines
5.6 KiB
TypeScript
192 lines
5.6 KiB
TypeScript
import { UploadFiles } from 'express'
|
|
import memoizee from 'memoizee'
|
|
import { Transaction } from 'sequelize'
|
|
import {
|
|
ManageVideoTorrentPayload,
|
|
ThumbnailType,
|
|
ThumbnailType_Type,
|
|
VideoCreate,
|
|
VideoPrivacy,
|
|
VideoPrivacyType,
|
|
VideoStateType
|
|
} from '@peertube/peertube-models'
|
|
import { CONFIG } from '@server/initializers/config.js'
|
|
import { MEMOIZE_LENGTH, MEMOIZE_TTL } from '@server/initializers/constants.js'
|
|
import { TagModel } from '@server/models/video/tag.js'
|
|
import { VideoJobInfoModel } from '@server/models/video/video-job-info.js'
|
|
import { VideoModel } from '@server/models/video/video.js'
|
|
import { FilteredModelAttributes } from '@server/types/index.js'
|
|
import { MThumbnail, MVideoFullLight, MVideoTag, MVideoThumbnail, MVideoUUID } from '@server/types/models/index.js'
|
|
import { CreateJobArgument, JobQueue } from './job-queue/job-queue.js'
|
|
import { updateLocalVideoMiniatureFromExisting } from './thumbnail.js'
|
|
import { moveFilesIfPrivacyChanged } from './video-privacy.js'
|
|
|
|
export function buildLocalVideoFromReq (videoInfo: VideoCreate, channelId: number): FilteredModelAttributes<VideoModel> {
|
|
return {
|
|
name: videoInfo.name,
|
|
remote: false,
|
|
category: videoInfo.category,
|
|
licence: videoInfo.licence ?? CONFIG.DEFAULTS.PUBLISH.LICENCE,
|
|
language: videoInfo.language,
|
|
commentsEnabled: videoInfo.commentsEnabled ?? CONFIG.DEFAULTS.PUBLISH.COMMENTS_ENABLED,
|
|
downloadEnabled: videoInfo.downloadEnabled ?? CONFIG.DEFAULTS.PUBLISH.DOWNLOAD_ENABLED,
|
|
waitTranscoding: videoInfo.waitTranscoding || false,
|
|
nsfw: videoInfo.nsfw || false,
|
|
description: videoInfo.description,
|
|
support: videoInfo.support,
|
|
privacy: videoInfo.privacy || VideoPrivacy.PRIVATE,
|
|
channelId,
|
|
importedFrom: videoInfo.importedFrom || null,
|
|
originallyPublishedAt: videoInfo.originallyPublishedAt
|
|
? new Date(videoInfo.originallyPublishedAt)
|
|
: null
|
|
}
|
|
}
|
|
|
|
export async function buildVideoThumbnailsFromReq (options: {
|
|
video: MVideoThumbnail
|
|
files: UploadFiles
|
|
fallback: (type: ThumbnailType_Type) => Promise<MThumbnail>
|
|
automaticallyGenerated?: boolean
|
|
}) {
|
|
const { video, files, fallback, automaticallyGenerated } = options
|
|
|
|
const promises = [
|
|
{
|
|
type: ThumbnailType.MINIATURE,
|
|
fieldName: 'thumbnailfile'
|
|
},
|
|
{
|
|
type: ThumbnailType.PREVIEW,
|
|
fieldName: 'previewfile'
|
|
}
|
|
].map(p => {
|
|
const fields = files?.[p.fieldName]
|
|
|
|
if (fields) {
|
|
return updateLocalVideoMiniatureFromExisting({
|
|
inputPath: fields[0].path,
|
|
video,
|
|
type: p.type,
|
|
automaticallyGenerated: automaticallyGenerated || false
|
|
})
|
|
}
|
|
|
|
return fallback(p.type)
|
|
})
|
|
|
|
return Promise.all(promises)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export async function setVideoTags (options: {
|
|
video: MVideoTag
|
|
tags: string[]
|
|
transaction?: Transaction
|
|
}) {
|
|
const { video, tags, transaction } = options
|
|
|
|
const internalTags = tags || []
|
|
const tagInstances = await TagModel.findOrCreateTags(internalTags, transaction)
|
|
|
|
await video.$set('Tags', tagInstances, { transaction })
|
|
video.Tags = tagInstances
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export async function buildMoveJob (options: {
|
|
video: MVideoUUID
|
|
previousVideoState: VideoStateType
|
|
type: 'move-to-object-storage' | 'move-to-file-system'
|
|
isNewVideo?: boolean // Default true
|
|
}) {
|
|
const { video, previousVideoState, isNewVideo = true, type } = options
|
|
|
|
await VideoJobInfoModel.increaseOrCreate(video.uuid, 'pendingMove')
|
|
|
|
return {
|
|
type,
|
|
payload: {
|
|
videoUUID: video.uuid,
|
|
isNewVideo,
|
|
previousVideoState
|
|
}
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export async function getVideoDuration (videoId: number | string) {
|
|
const video = await VideoModel.load(videoId)
|
|
|
|
const duration = video.isLive
|
|
? undefined
|
|
: video.duration
|
|
|
|
return { duration, isLive: video.isLive }
|
|
}
|
|
|
|
export const getCachedVideoDuration = memoizee(getVideoDuration, {
|
|
promise: true,
|
|
max: MEMOIZE_LENGTH.VIDEO_DURATION,
|
|
maxAge: MEMOIZE_TTL.VIDEO_DURATION
|
|
})
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export async function addVideoJobsAfterUpdate (options: {
|
|
video: MVideoFullLight
|
|
isNewVideo: boolean
|
|
|
|
nameChanged: boolean
|
|
oldPrivacy: VideoPrivacyType
|
|
}) {
|
|
const { video, nameChanged, oldPrivacy, isNewVideo } = options
|
|
const jobs: CreateJobArgument[] = []
|
|
|
|
const filePathChanged = await moveFilesIfPrivacyChanged(video, oldPrivacy)
|
|
|
|
if (!video.isLive && (nameChanged || filePathChanged)) {
|
|
for (const file of (video.VideoFiles || [])) {
|
|
const payload: ManageVideoTorrentPayload = { action: 'update-metadata', videoId: video.id, videoFileId: file.id }
|
|
|
|
jobs.push({ type: 'manage-video-torrent', payload })
|
|
}
|
|
|
|
const hls = video.getHLSPlaylist()
|
|
|
|
for (const file of (hls?.VideoFiles || [])) {
|
|
const payload: ManageVideoTorrentPayload = { action: 'update-metadata', streamingPlaylistId: hls.id, videoFileId: file.id }
|
|
|
|
jobs.push({ type: 'manage-video-torrent', payload })
|
|
}
|
|
}
|
|
|
|
jobs.push({
|
|
type: 'federate-video',
|
|
payload: {
|
|
videoUUID: video.uuid,
|
|
isNewVideo
|
|
}
|
|
})
|
|
|
|
const wasConfidentialVideo = new Set<VideoPrivacyType>([
|
|
VideoPrivacy.PRIVATE,
|
|
VideoPrivacy.UNLISTED,
|
|
VideoPrivacy.INTERNAL
|
|
]).has(oldPrivacy)
|
|
|
|
if (wasConfidentialVideo) {
|
|
jobs.push({
|
|
type: 'notify',
|
|
payload: {
|
|
action: 'new-video',
|
|
videoUUID: video.uuid
|
|
}
|
|
})
|
|
}
|
|
|
|
return JobQueue.Instance.createSequentialJobFlow(...jobs)
|
|
}
|