import { move } from 'fs-extra'
import { extname } from 'path'
import toInt from 'validator/lib/toInt'
-import { addOptimizeOrMergeAudioJob } from '@server/helpers/video'
import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
import { changeVideoChannelShare } from '@server/lib/activitypub/share'
-import { getVideoActivityPubUrl } from '@server/lib/activitypub/url'
-import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video'
-import { getVideoFilePath } from '@server/lib/video-paths'
+import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
+import { LiveManager } from '@server/lib/live-manager'
+import { addOptimizeOrMergeAudioJob, buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video'
+import { generateVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
import { getServerActor } from '@server/models/application/application'
-import { MVideoDetails, MVideoFullLight } from '@server/types/models'
+import { MVideoFullLight } from '@server/types/models'
import { VideoCreate, VideoState, VideoUpdate } from '../../../../shared'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger'
import { resetSequelizeInstance } from '../../../helpers/database-utils'
import { buildNSFWFilter, createReqFiles, getCountVideos } from '../../../helpers/express-utils'
-import { getMetadataFromFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
+import { getMetadataFromFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffprobe-utils'
import { logger } from '../../../helpers/logger'
import { getFormattedObjects } from '../../../helpers/utils'
import { CONFIG } from '../../../initializers/config'
videosUpdateValidator
} from '../../../middlewares'
import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'
-import { TagModel } from '../../../models/video/tag'
import { VideoModel } from '../../../models/video/video'
import { VideoFileModel } from '../../../models/video/video-file'
-import { abuseVideoRouter } from './abuse'
import { blacklistRouter } from './blacklist'
import { videoCaptionsRouter } from './captions'
import { videoCommentRouter } from './comment'
}
)
-videosRouter.use('/', abuseVideoRouter)
videosRouter.use('/', blacklistRouter)
videosRouter.use('/', rateVideoRouter)
videosRouter.use('/', videoCommentRouter)
}
async function addVideo (req: express.Request, res: express.Response) {
- // Processing the video could be long
- // Set timeout to 10 minutes
+ // Uploading the video could be long
+ // Set timeout to 10 minutes, as Express's default is 2 minutes
req.setTimeout(1000 * 60 * 10, () => {
logger.error('Upload video has timed out.')
- return res.sendStatus(408)
+ return res.sendStatus(HttpStatusCode.REQUEST_TIMEOUT_408)
})
const videoPhysicalFile = req.files['videofile'][0]
videoData.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED
videoData.duration = videoPhysicalFile['duration'] // duration was added by a previous middleware
- const video = new VideoModel(videoData) as MVideoDetails
- video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
+ const video = new VideoModel(videoData) as MVideoFullLight
+ video.VideoChannel = res.locals.videoChannel
+ video.url = getLocalVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
const videoFile = new VideoFileModel({
extname: extname(videoPhysicalFile.filename),
size: videoPhysicalFile.size,
videoStreamingPlaylistId: null,
- metadata: await getMetadataFromFile<any>(videoPhysicalFile.path)
+ metadata: await getMetadataFromFile(videoPhysicalFile.path)
})
if (videoFile.isAudio()) {
videoFile.resolution = (await getVideoFileResolution(videoPhysicalFile.path)).videoFileResolution
}
+ videoFile.filename = generateVideoFilename(video, false, videoFile.resolution, videoFile.extname)
+
// Move physical file
const destination = getVideoFilePath(video, videoFile)
await move(videoPhysicalFile.path, destination)
const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
video,
files: req.files,
- fallback: type => generateVideoMiniature(video, videoFile, type)
+ fallback: type => generateVideoMiniature({ video, videoFile, type })
})
// Create the torrent file
Notifier.Instance.notifyOnNewVideoIfNeeded(videoCreated)
if (video.state === VideoState.TO_TRANSCODE) {
- await addOptimizeOrMergeAudioJob(videoCreated, videoFile)
+ await addOptimizeOrMergeAudioJob(videoCreated, videoFile, res.locals.oauth.token.User)
}
Hooks.runAction('action:api.video.uploaded', { video: videoCreated })
throw err
}
- return res.type('json').status(204).end()
+ return res.type('json')
+ .status(HttpStatusCode.NO_CONTENT_204)
+ .end()
}
async function getVideo (req: express.Request, res: express.Response) {
}
async function viewVideo (req: express.Request, res: express.Response) {
- const videoInstance = res.locals.onlyImmutableVideo
+ const immutableVideoAttrs = res.locals.onlyImmutableVideo
const ip = req.ip
- const exists = await Redis.Instance.doesVideoIPViewExist(ip, videoInstance.uuid)
+ const exists = await Redis.Instance.doesVideoIPViewExist(ip, immutableVideoAttrs.uuid)
if (exists) {
- logger.debug('View for ip %s and video %s already exists.', ip, videoInstance.uuid)
- return res.status(204).end()
+ logger.debug('View for ip %s and video %s already exists.', ip, immutableVideoAttrs.uuid)
+ return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
+ }
+
+ const video = await VideoModel.load(immutableVideoAttrs.id)
+
+ const promises: Promise<any>[] = [
+ Redis.Instance.setIPVideoView(ip, video.uuid, video.isLive)
+ ]
+
+ let federateView = true
+
+ // Increment our live manager
+ if (video.isLive && video.isOwned()) {
+ LiveManager.Instance.addViewTo(video.id)
+
+ // Views of our local live will be sent by our live manager
+ federateView = false
}
- await Promise.all([
- Redis.Instance.addVideoView(videoInstance.id),
- Redis.Instance.setIPVideoView(ip, videoInstance.uuid)
- ])
+ // Increment our video views cache counter
+ if (!video.isLive) {
+ promises.push(Redis.Instance.addVideoView(video.id))
+ }
+
+ if (federateView) {
+ const serverActor = await getServerActor()
+ promises.push(sendView(serverActor, video, undefined))
+ }
- const serverActor = await getServerActor()
- await sendView(serverActor, videoInstance, undefined)
+ await Promise.all(promises)
- Hooks.runAction('action:api.video.viewed', { video: videoInstance, ip })
+ Hooks.runAction('action:api.video.viewed', { video, ip })
- return res.status(204).end()
+ return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
}
async function getVideoDescription (req: express.Request, res: express.Response) {
Hooks.runAction('action:api.video.deleted', { video: videoInstance })
- return res.type('json').status(204).end()
+ return res.type('json')
+ .status(HttpStatusCode.NO_CONTENT_204)
+ .end()
}