import * as express from 'express'
-import { extname, join } from 'path'
+import { extname } from 'path'
import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared'
-import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
+import { getMetadataFromFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
import { logger } from '../../../helpers/logger'
import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger'
-import { getFormattedObjects, getServerActor } from '../../../helpers/utils'
+import { getFormattedObjects } from '../../../helpers/utils'
import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist'
import {
DEFAULT_AUDIO_RESOLUTION,
VIDEO_LICENCES,
VIDEO_PRIVACIES
} from '../../../initializers/constants'
-import {
- changeVideoChannelShare,
- federateVideoIfNeeded,
- fetchRemoteVideoDescription,
- getVideoActivityPubUrl
-} from '../../../lib/activitypub'
+import { federateVideoIfNeeded, fetchRemoteVideoDescription } from '../../../lib/activitypub/videos'
import { JobQueue } from '../../../lib/job-queue'
import { Redis } from '../../../lib/redis'
import {
paginationValidator,
setDefaultPagination,
setDefaultSort,
+ videoFileMetadataGetValidator,
videosAddValidator,
videosCustomGetValidator,
videosGetValidator,
import { rateVideoRouter } from './rate'
import { ownershipVideoRouter } from './ownership'
import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
-import { buildNSFWFilter, createReqFiles } from '../../../helpers/express-utils'
+import { buildNSFWFilter, createReqFiles, getCountVideos } from '../../../helpers/express-utils'
import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'
import { videoCaptionsRouter } from './captions'
import { videoImportsRouter } from './import'
import { sequelizeTypescript } from '../../../initializers/database'
import { createVideoMiniatureFromExisting, generateVideoMiniature } from '../../../lib/thumbnail'
import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type'
-import { VideoTranscodingPayload } from '../../../lib/job-queue/handlers/video-transcoding'
import { Hooks } from '../../../lib/plugins/hooks'
-import { MVideoFullLight } from '@server/typings/models'
+import { MVideoDetails, MVideoFullLight } from '@server/typings/models'
+import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
+import { getVideoFilePath } from '@server/lib/video-paths'
+import toInt from 'validator/lib/toInt'
+import { addOptimizeOrMergeAudioJob } from '@server/helpers/video'
+import { getServerActor } from '@server/models/application/application'
+import { changeVideoChannelShare } from '@server/lib/activitypub/share'
+import { getVideoActivityPubUrl } from '@server/lib/activitypub/url'
const auditLogger = auditLoggerFactory('videos')
const videosRouter = express.Router()
asyncMiddleware(videosGetValidator),
asyncMiddleware(getVideoDescription)
)
+videosRouter.get('/:id/metadata/:videoFileId',
+ asyncMiddleware(videoFileMetadataGetValidator),
+ asyncMiddleware(getVideoFileMetadata)
+)
videosRouter.get('/:id',
optionalAuthenticate,
asyncMiddleware(videosCustomGetValidator('only-video-with-rights')),
asyncMiddleware(getVideo)
)
videosRouter.post('/:id/views',
- asyncMiddleware(videosGetValidator),
+ asyncMiddleware(videosCustomGetValidator('only-immutable-attributes')),
asyncMiddleware(viewVideo)
)
category: videoInfo.category,
licence: videoInfo.licence,
language: videoInfo.language,
- commentsEnabled: videoInfo.commentsEnabled || false,
- downloadEnabled: videoInfo.downloadEnabled || true,
+ commentsEnabled: videoInfo.commentsEnabled !== false, // If the value is not "false", the default is "true"
+ downloadEnabled: videoInfo.downloadEnabled !== false,
waitTranscoding: videoInfo.waitTranscoding || false,
state: CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED,
nsfw: videoInfo.nsfw || false,
originallyPublishedAt: videoInfo.originallyPublishedAt
}
- const video = new VideoModel(videoData)
+ const video = new VideoModel(videoData) as MVideoDetails
video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
const videoFile = new VideoFileModel({
extname: extname(videoPhysicalFile.filename),
- size: videoPhysicalFile.size
+ size: videoPhysicalFile.size,
+ videoStreamingPlaylistId: null,
+ metadata: await getMetadataFromFile<any>(videoPhysicalFile.path)
})
if (videoFile.isAudio()) {
}
// Move physical file
- const videoDir = CONFIG.STORAGE.VIDEOS_DIR
- const destination = join(videoDir, video.getVideoFilename(videoFile))
+ const destination = getVideoFilePath(video, videoFile)
await move(videoPhysicalFile.path, destination)
// This is important in case if there is another attempt in the retry process
- videoPhysicalFile.filename = video.getVideoFilename(videoFile)
+ videoPhysicalFile.filename = getVideoFilePath(video, videoFile)
videoPhysicalFile.path = destination
// Process thumbnail or create it from the video
: await generateVideoMiniature(video, videoFile, ThumbnailType.PREVIEW)
// Create the torrent file
- await video.createTorrentAndSetInfoHash(videoFile)
+ await createTorrentAndSetInfoHash(video, videoFile)
const { videoCreated } = await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = { transaction: t }
Notifier.Instance.notifyOnNewVideoIfNeeded(videoCreated)
if (video.state === VideoState.TO_TRANSCODE) {
- // Put uuid because we don't have id auto incremented for now
- let dataInput: VideoTranscodingPayload
-
- if (videoFile.isAudio()) {
- dataInput = {
- type: 'merge-audio' as 'merge-audio',
- resolution: DEFAULT_AUDIO_RESOLUTION,
- videoUUID: videoCreated.uuid,
- isNewVideo: true
- }
- } else {
- dataInput = {
- type: 'optimize' as 'optimize',
- videoUUID: videoCreated.uuid,
- isNewVideo: true
- }
- }
-
- await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput })
+ await addOptimizeOrMergeAudioJob(videoCreated, videoFile)
}
Hooks.runAction('action:api.video.uploaded', { video: videoCreated })
const oldVideoAuditView = new VideoAuditView(videoInstance.toFormattedDetailsJSON())
const videoInfoToUpdate: VideoUpdate = req.body
- const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE
- const wasNotPrivateVideo = videoInstance.privacy !== VideoPrivacy.PRIVATE
- const wasUnlistedVideo = videoInstance.privacy === VideoPrivacy.UNLISTED
+ const wasConfidentialVideo = videoInstance.isConfidential()
+ const hadPrivacyForFederation = videoInstance.hasPrivacyForFederation()
// Process thumbnail or create it from the video
- const thumbnailModel = req.files && req.files['thumbnailfile']
+ const thumbnailModel = req.files?.['thumbnailfile']
? await createVideoMiniatureFromExisting(req.files['thumbnailfile'][0].path, videoInstance, ThumbnailType.MINIATURE, false)
: undefined
- const previewModel = req.files && req.files['previewfile']
+ const previewModel = req.files?.['previewfile']
? await createVideoMiniatureFromExisting(req.files['previewfile'][0].path, videoInstance, ThumbnailType.PREVIEW, false)
: undefined
videoInstance.originallyPublishedAt = new Date(videoInfoToUpdate.originallyPublishedAt)
}
+ let isNewVideo = false
if (videoInfoToUpdate.privacy !== undefined) {
- const newPrivacy = parseInt(videoInfoToUpdate.privacy.toString(), 10)
- videoInstance.privacy = newPrivacy
+ isNewVideo = videoInstance.isNewVideo(videoInfoToUpdate.privacy)
- // The video was private, and is not anymore -> publish it
- if (wasPrivateVideo === true && newPrivacy !== VideoPrivacy.PRIVATE) {
- videoInstance.publishedAt = new Date()
- }
+ const newPrivacy = parseInt(videoInfoToUpdate.privacy.toString(), 10)
+ videoInstance.setPrivacy(newPrivacy)
- // The video was not private, but now it is -> we need to unfederate it
- if (wasNotPrivateVideo === true && newPrivacy === VideoPrivacy.PRIVATE) {
+ // Unfederate the video if the new privacy is not compatible with federation
+ if (hadPrivacyForFederation && !videoInstance.hasPrivacyForFederation()) {
await VideoModel.sendDelete(videoInstance, { transaction: t })
}
}
await videoInstanceUpdated.$set('VideoChannel', res.locals.videoChannel, { transaction: t })
videoInstanceUpdated.VideoChannel = res.locals.videoChannel
- if (wasPrivateVideo === false) await changeVideoChannelShare(videoInstanceUpdated, oldVideoChannel, t)
+ if (hadPrivacyForFederation === true) await changeVideoChannelShare(videoInstanceUpdated, oldVideoChannel, t)
}
// Schedule an update in the future?
transaction: t
})
- const isNewVideo = wasPrivateVideo && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE
await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t)
auditLogger.update(
return videoInstanceUpdated
})
- if (wasUnlistedVideo || wasPrivateVideo) {
+ if (wasConfidentialVideo) {
Notifier.Instance.notifyOnNewVideoIfNeeded(videoInstanceUpdated)
}
if (video.isOutdated()) {
JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video', url: video.url } })
- .catch(err => logger.error('Cannot create AP refresher job for video %s.', video.url, { err }))
}
return res.json(video.toFormattedDetailsJSON())
}
async function viewVideo (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.videoAll
+ const videoInstance = res.locals.onlyImmutableVideo
const ip = req.ip
const exists = await Redis.Instance.doesVideoIPViewExist(ip, videoInstance.uuid)
return res.json({ description })
}
+async function getVideoFileMetadata (req: express.Request, res: express.Response) {
+ const videoFile = await VideoFileModel.loadWithMetadata(toInt(req.params.videoFileId))
+ return res.json(videoFile.metadata)
+}
+
async function listVideos (req: express.Request, res: express.Response) {
+ const countVideos = getCountVideos(req)
+
const apiOptions = await Hooks.wrapObject({
start: req.query.start,
count: req.query.count,
nsfw: buildNSFWFilter(res, req.query.nsfw),
filter: req.query.filter as VideoFilter,
withFiles: false,
- user: res.locals.oauth ? res.locals.oauth.token.User : undefined
+ user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
+ countVideos
}, 'filter:api.videos.list.params')
const resultList = await Hooks.wrapPromiseFun(
projects / oweals / peertube.git / blobdiff