|
@@ -1,43 +1,20 @@
|
|
|
import * as express from 'express'
|
|
|
-import { move } from 'fs-extra'
|
|
|
-import { extname } from 'path'
|
|
|
import toInt from 'validator/lib/toInt'
|
|
|
-import { deleteResumableUploadMetaFile, getResumableUploadPath } from '@server/helpers/upload'
|
|
|
-import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
|
|
|
-import { changeVideoChannelShare } from '@server/lib/activitypub/share'
|
|
|
-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 { MVideo, MVideoFile, MVideoFullLight } from '@server/types/models'
|
|
|
-import { uploadx } from '@uploadx/core'
|
|
|
-import { VideoCreate, VideosCommonQuery, VideoState, VideoUpdate } from '../../../../shared'
|
|
|
+import { VideosCommonQuery } from '../../../../shared'
|
|
|
import { HttpStatusCode } from '../../../../shared/core-utils/miscs'
|
|
|
import { auditLoggerFactory, getAuditIdFromRes, VideoAuditView } from '../../../helpers/audit-logger'
|
|
|
-import { resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers/database-utils'
|
|
|
-import { buildNSFWFilter, createReqFiles, getCountVideos } from '../../../helpers/express-utils'
|
|
|
-import { getMetadataFromFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffprobe-utils'
|
|
|
-import { logger, loggerTagsFactory } from '../../../helpers/logger'
|
|
|
+import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils'
|
|
|
+import { logger } from '../../../helpers/logger'
|
|
|
import { getFormattedObjects } from '../../../helpers/utils'
|
|
|
-import { CONFIG } from '../../../initializers/config'
|
|
|
-import {
|
|
|
- DEFAULT_AUDIO_RESOLUTION,
|
|
|
- MIMETYPES,
|
|
|
- VIDEO_CATEGORIES,
|
|
|
- VIDEO_LANGUAGES,
|
|
|
- VIDEO_LICENCES,
|
|
|
- VIDEO_PRIVACIES
|
|
|
-} from '../../../initializers/constants'
|
|
|
+import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers/constants'
|
|
|
import { sequelizeTypescript } from '../../../initializers/database'
|
|
|
import { sendView } from '../../../lib/activitypub/send/send-view'
|
|
|
-import { federateVideoIfNeeded, fetchRemoteVideoDescription } from '../../../lib/activitypub/videos'
|
|
|
+import { fetchRemoteVideoDescription } from '../../../lib/activitypub/videos'
|
|
|
import { JobQueue } from '../../../lib/job-queue'
|
|
|
-import { Notifier } from '../../../lib/notifier'
|
|
|
import { Hooks } from '../../../lib/plugins/hooks'
|
|
|
import { Redis } from '../../../lib/redis'
|
|
|
-import { generateVideoMiniature } from '../../../lib/thumbnail'
|
|
|
-import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist'
|
|
|
import {
|
|
|
asyncMiddleware,
|
|
|
asyncRetryTransactionMiddleware,
|
|
@@ -49,16 +26,11 @@ import {
|
|
|
setDefaultPagination,
|
|
|
setDefaultVideosSort,
|
|
|
videoFileMetadataGetValidator,
|
|
|
- videosAddLegacyValidator,
|
|
|
- videosAddResumableInitValidator,
|
|
|
- videosAddResumableValidator,
|
|
|
videosCustomGetValidator,
|
|
|
videosGetValidator,
|
|
|
videosRemoveValidator,
|
|
|
- videosSortValidator,
|
|
|
- videosUpdateValidator
|
|
|
+ videosSortValidator
|
|
|
} from '../../../middlewares'
|
|
|
-import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'
|
|
|
import { VideoModel } from '../../../models/video/video'
|
|
|
import { VideoFileModel } from '../../../models/video/video-file'
|
|
|
import { blacklistRouter } from './blacklist'
|
|
@@ -68,40 +40,12 @@ import { videoImportsRouter } from './import'
|
|
|
import { liveRouter } from './live'
|
|
|
import { ownershipVideoRouter } from './ownership'
|
|
|
import { rateVideoRouter } from './rate'
|
|
|
+import { updateRouter } from './update'
|
|
|
+import { uploadRouter } from './upload'
|
|
|
import { watchingRouter } from './watching'
|
|
|
|
|
|
-const lTags = loggerTagsFactory('api', 'video')
|
|
|
const auditLogger = auditLoggerFactory('videos')
|
|
|
const videosRouter = express.Router()
|
|
|
-const uploadxMiddleware = uploadx.upload({ directory: getResumableUploadPath() })
|
|
|
-
|
|
|
-const reqVideoFileAdd = createReqFiles(
|
|
|
- [ 'videofile', 'thumbnailfile', 'previewfile' ],
|
|
|
- Object.assign({}, MIMETYPES.VIDEO.MIMETYPE_EXT, MIMETYPES.IMAGE.MIMETYPE_EXT),
|
|
|
- {
|
|
|
- videofile: CONFIG.STORAGE.TMP_DIR,
|
|
|
- thumbnailfile: CONFIG.STORAGE.TMP_DIR,
|
|
|
- previewfile: CONFIG.STORAGE.TMP_DIR
|
|
|
- }
|
|
|
-)
|
|
|
-
|
|
|
-const reqVideoFileAddResumable = createReqFiles(
|
|
|
- [ 'thumbnailfile', 'previewfile' ],
|
|
|
- MIMETYPES.IMAGE.MIMETYPE_EXT,
|
|
|
- {
|
|
|
- thumbnailfile: getResumableUploadPath(),
|
|
|
- previewfile: getResumableUploadPath()
|
|
|
- }
|
|
|
-)
|
|
|
-
|
|
|
-const reqVideoFileUpdate = createReqFiles(
|
|
|
- [ 'thumbnailfile', 'previewfile' ],
|
|
|
- MIMETYPES.IMAGE.MIMETYPE_EXT,
|
|
|
- {
|
|
|
- thumbnailfile: CONFIG.STORAGE.TMP_DIR,
|
|
|
- previewfile: CONFIG.STORAGE.TMP_DIR
|
|
|
- }
|
|
|
-)
|
|
|
|
|
|
videosRouter.use('/', blacklistRouter)
|
|
|
videosRouter.use('/', rateVideoRouter)
|
|
@@ -111,6 +55,8 @@ videosRouter.use('/', videoImportsRouter)
|
|
|
videosRouter.use('/', ownershipVideoRouter)
|
|
|
videosRouter.use('/', watchingRouter)
|
|
|
videosRouter.use('/', liveRouter)
|
|
|
+videosRouter.use('/', uploadRouter)
|
|
|
+videosRouter.use('/', updateRouter)
|
|
|
|
|
|
videosRouter.get('/categories', listVideoCategories)
|
|
|
videosRouter.get('/licences', listVideoLicences)
|
|
@@ -127,39 +73,6 @@ videosRouter.get('/',
|
|
|
asyncMiddleware(listVideos)
|
|
|
)
|
|
|
|
|
|
-videosRouter.post('/upload',
|
|
|
- authenticate,
|
|
|
- reqVideoFileAdd,
|
|
|
- asyncMiddleware(videosAddLegacyValidator),
|
|
|
- asyncRetryTransactionMiddleware(addVideoLegacy)
|
|
|
-)
|
|
|
-
|
|
|
-videosRouter.post('/upload-resumable',
|
|
|
- authenticate,
|
|
|
- reqVideoFileAddResumable,
|
|
|
- asyncMiddleware(videosAddResumableInitValidator),
|
|
|
- uploadxMiddleware
|
|
|
-)
|
|
|
-
|
|
|
-videosRouter.delete('/upload-resumable',
|
|
|
- authenticate,
|
|
|
- uploadxMiddleware
|
|
|
-)
|
|
|
-
|
|
|
-videosRouter.put('/upload-resumable',
|
|
|
- authenticate,
|
|
|
- uploadxMiddleware, // uploadx doesn't use call next() before the file upload completes
|
|
|
- asyncMiddleware(videosAddResumableValidator),
|
|
|
- asyncMiddleware(addVideoResumable)
|
|
|
-)
|
|
|
-
|
|
|
-videosRouter.put('/:id',
|
|
|
- authenticate,
|
|
|
- reqVideoFileUpdate,
|
|
|
- asyncMiddleware(videosUpdateValidator),
|
|
|
- asyncRetryTransactionMiddleware(updateVideo)
|
|
|
-)
|
|
|
-
|
|
|
videosRouter.get('/:id/description',
|
|
|
asyncMiddleware(videosGetValidator),
|
|
|
asyncMiddleware(getVideoDescription)
|
|
@@ -209,279 +122,7 @@ function listVideoPrivacies (_req: express.Request, res: express.Response) {
|
|
|
res.json(VIDEO_PRIVACIES)
|
|
|
}
|
|
|
|
|
|
-async function addVideoLegacy (req: express.Request, res: express.Response) {
|
|
|
- // 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(HttpStatusCode.REQUEST_TIMEOUT_408)
|
|
|
- })
|
|
|
-
|
|
|
- const videoPhysicalFile = req.files['videofile'][0]
|
|
|
- const videoInfo: VideoCreate = req.body
|
|
|
- const files = req.files
|
|
|
-
|
|
|
- return addVideo({ res, videoPhysicalFile, videoInfo, files })
|
|
|
-}
|
|
|
-
|
|
|
-async function addVideoResumable (_req: express.Request, res: express.Response) {
|
|
|
- const videoPhysicalFile = res.locals.videoFileResumable
|
|
|
- const videoInfo = videoPhysicalFile.metadata
|
|
|
- const files = { previewfile: videoInfo.previewfile }
|
|
|
-
|
|
|
- // Don't need the meta file anymore
|
|
|
- await deleteResumableUploadMetaFile(videoPhysicalFile.path)
|
|
|
-
|
|
|
- return addVideo({ res, videoPhysicalFile, videoInfo, files })
|
|
|
-}
|
|
|
-
|
|
|
-async function addVideo (options: {
|
|
|
- res: express.Response
|
|
|
- videoPhysicalFile: express.VideoUploadFile
|
|
|
- videoInfo: VideoCreate
|
|
|
- files: express.UploadFiles
|
|
|
-}) {
|
|
|
- const { res, videoPhysicalFile, videoInfo, files } = options
|
|
|
- const videoChannel = res.locals.videoChannel
|
|
|
- const user = res.locals.oauth.token.User
|
|
|
-
|
|
|
- const videoData = buildLocalVideoFromReq(videoInfo, videoChannel.id)
|
|
|
-
|
|
|
- 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 MVideoFullLight
|
|
|
- video.VideoChannel = 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(videoPhysicalFile.path)
|
|
|
- })
|
|
|
-
|
|
|
- if (videoFile.isAudio()) {
|
|
|
- videoFile.resolution = DEFAULT_AUDIO_RESOLUTION
|
|
|
- } else {
|
|
|
- videoFile.fps = await getVideoFileFPS(videoPhysicalFile.path)
|
|
|
- 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)
|
|
|
- // This is important in case if there is another attempt in the retry process
|
|
|
- videoPhysicalFile.filename = getVideoFilePath(video, videoFile)
|
|
|
- videoPhysicalFile.path = destination
|
|
|
-
|
|
|
- const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
|
|
|
- video,
|
|
|
- files,
|
|
|
- fallback: type => generateVideoMiniature({ video, videoFile, type })
|
|
|
- })
|
|
|
-
|
|
|
- const { videoCreated } = await sequelizeTypescript.transaction(async t => {
|
|
|
- const sequelizeOptions = { transaction: t }
|
|
|
-
|
|
|
- const videoCreated = await video.save(sequelizeOptions) as MVideoFullLight
|
|
|
-
|
|
|
- await videoCreated.addAndSaveThumbnail(thumbnailModel, t)
|
|
|
- await videoCreated.addAndSaveThumbnail(previewModel, t)
|
|
|
-
|
|
|
- // Do not forget to add video channel information to the created video
|
|
|
- videoCreated.VideoChannel = res.locals.videoChannel
|
|
|
-
|
|
|
- videoFile.videoId = video.id
|
|
|
- await videoFile.save(sequelizeOptions)
|
|
|
-
|
|
|
- video.VideoFiles = [ videoFile ]
|
|
|
-
|
|
|
- await setVideoTags({ video, tags: videoInfo.tags, transaction: t })
|
|
|
-
|
|
|
- // Schedule an update in the future?
|
|
|
- if (videoInfo.scheduleUpdate) {
|
|
|
- await ScheduleVideoUpdateModel.create({
|
|
|
- videoId: video.id,
|
|
|
- updateAt: new Date(videoInfo.scheduleUpdate.updateAt),
|
|
|
- privacy: videoInfo.scheduleUpdate.privacy || null
|
|
|
- }, { transaction: t })
|
|
|
- }
|
|
|
-
|
|
|
- // Channel has a new content, set as updated
|
|
|
- await videoCreated.VideoChannel.setAsUpdated(t)
|
|
|
-
|
|
|
- await autoBlacklistVideoIfNeeded({
|
|
|
- video,
|
|
|
- user,
|
|
|
- isRemote: false,
|
|
|
- isNew: true,
|
|
|
- transaction: t
|
|
|
- })
|
|
|
-
|
|
|
- auditLogger.create(getAuditIdFromRes(res), new VideoAuditView(videoCreated.toFormattedDetailsJSON()))
|
|
|
- logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid, lTags(videoCreated.uuid))
|
|
|
-
|
|
|
- return { videoCreated }
|
|
|
- })
|
|
|
-
|
|
|
- // Create the torrent file in async way because it could be long
|
|
|
- createTorrentAndSetInfoHashAsync(video, videoFile)
|
|
|
- .catch(err => logger.error('Cannot create torrent file for video %s', video.url, { err, ...lTags(video.uuid) }))
|
|
|
- .then(() => VideoModel.loadAndPopulateAccountAndServerAndTags(video.id))
|
|
|
- .then(refreshedVideo => {
|
|
|
- if (!refreshedVideo) return
|
|
|
-
|
|
|
- // Only federate and notify after the torrent creation
|
|
|
- Notifier.Instance.notifyOnNewVideoIfNeeded(refreshedVideo)
|
|
|
-
|
|
|
- return retryTransactionWrapper(() => {
|
|
|
- return sequelizeTypescript.transaction(t => federateVideoIfNeeded(refreshedVideo, true, t))
|
|
|
- })
|
|
|
- })
|
|
|
- .catch(err => logger.error('Cannot federate or notify video creation %s', video.url, { err, ...lTags(video.uuid) }))
|
|
|
-
|
|
|
- if (video.state === VideoState.TO_TRANSCODE) {
|
|
|
- await addOptimizeOrMergeAudioJob(videoCreated, videoFile, user)
|
|
|
- }
|
|
|
-
|
|
|
- Hooks.runAction('action:api.video.uploaded', { video: videoCreated })
|
|
|
-
|
|
|
- return res.json({
|
|
|
- video: {
|
|
|
- id: videoCreated.id,
|
|
|
- uuid: videoCreated.uuid
|
|
|
- }
|
|
|
- })
|
|
|
-}
|
|
|
-
|
|
|
-async function updateVideo (req: express.Request, res: express.Response) {
|
|
|
- const videoInstance = res.locals.videoAll
|
|
|
- const videoFieldsSave = videoInstance.toJSON()
|
|
|
- const oldVideoAuditView = new VideoAuditView(videoInstance.toFormattedDetailsJSON())
|
|
|
- const videoInfoToUpdate: VideoUpdate = req.body
|
|
|
-
|
|
|
- const wasConfidentialVideo = videoInstance.isConfidential()
|
|
|
- const hadPrivacyForFederation = videoInstance.hasPrivacyForFederation()
|
|
|
-
|
|
|
- const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
|
|
|
- video: videoInstance,
|
|
|
- files: req.files,
|
|
|
- fallback: () => Promise.resolve(undefined),
|
|
|
- automaticallyGenerated: false
|
|
|
- })
|
|
|
-
|
|
|
- try {
|
|
|
- const videoInstanceUpdated = await sequelizeTypescript.transaction(async t => {
|
|
|
- const sequelizeOptions = { transaction: t }
|
|
|
- const oldVideoChannel = videoInstance.VideoChannel
|
|
|
-
|
|
|
- if (videoInfoToUpdate.name !== undefined) videoInstance.name = videoInfoToUpdate.name
|
|
|
- if (videoInfoToUpdate.category !== undefined) videoInstance.category = videoInfoToUpdate.category
|
|
|
- if (videoInfoToUpdate.licence !== undefined) videoInstance.licence = videoInfoToUpdate.licence
|
|
|
- if (videoInfoToUpdate.language !== undefined) videoInstance.language = videoInfoToUpdate.language
|
|
|
- if (videoInfoToUpdate.nsfw !== undefined) videoInstance.nsfw = videoInfoToUpdate.nsfw
|
|
|
- if (videoInfoToUpdate.waitTranscoding !== undefined) videoInstance.waitTranscoding = videoInfoToUpdate.waitTranscoding
|
|
|
- if (videoInfoToUpdate.support !== undefined) videoInstance.support = videoInfoToUpdate.support
|
|
|
- if (videoInfoToUpdate.description !== undefined) videoInstance.description = videoInfoToUpdate.description
|
|
|
- if (videoInfoToUpdate.commentsEnabled !== undefined) videoInstance.commentsEnabled = videoInfoToUpdate.commentsEnabled
|
|
|
- if (videoInfoToUpdate.downloadEnabled !== undefined) videoInstance.downloadEnabled = videoInfoToUpdate.downloadEnabled
|
|
|
-
|
|
|
- if (videoInfoToUpdate.originallyPublishedAt !== undefined && videoInfoToUpdate.originallyPublishedAt !== null) {
|
|
|
- videoInstance.originallyPublishedAt = new Date(videoInfoToUpdate.originallyPublishedAt)
|
|
|
- }
|
|
|
-
|
|
|
- let isNewVideo = false
|
|
|
- if (videoInfoToUpdate.privacy !== undefined) {
|
|
|
- isNewVideo = videoInstance.isNewVideo(videoInfoToUpdate.privacy)
|
|
|
-
|
|
|
- const newPrivacy = parseInt(videoInfoToUpdate.privacy.toString(), 10)
|
|
|
- videoInstance.setPrivacy(newPrivacy)
|
|
|
-
|
|
|
- // Unfederate the video if the new privacy is not compatible with federation
|
|
|
- if (hadPrivacyForFederation && !videoInstance.hasPrivacyForFederation()) {
|
|
|
- await VideoModel.sendDelete(videoInstance, { transaction: t })
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- const videoInstanceUpdated = await videoInstance.save(sequelizeOptions) as MVideoFullLight
|
|
|
-
|
|
|
- if (thumbnailModel) await videoInstanceUpdated.addAndSaveThumbnail(thumbnailModel, t)
|
|
|
- if (previewModel) await videoInstanceUpdated.addAndSaveThumbnail(previewModel, t)
|
|
|
-
|
|
|
- // Video tags update?
|
|
|
- if (videoInfoToUpdate.tags !== undefined) {
|
|
|
- await setVideoTags({
|
|
|
- video: videoInstanceUpdated,
|
|
|
- tags: videoInfoToUpdate.tags,
|
|
|
- transaction: t
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
- // Video channel update?
|
|
|
- if (res.locals.videoChannel && videoInstanceUpdated.channelId !== res.locals.videoChannel.id) {
|
|
|
- await videoInstanceUpdated.$set('VideoChannel', res.locals.videoChannel, { transaction: t })
|
|
|
- videoInstanceUpdated.VideoChannel = res.locals.videoChannel
|
|
|
-
|
|
|
- if (hadPrivacyForFederation === true) await changeVideoChannelShare(videoInstanceUpdated, oldVideoChannel, t)
|
|
|
- }
|
|
|
-
|
|
|
- // Schedule an update in the future?
|
|
|
- if (videoInfoToUpdate.scheduleUpdate) {
|
|
|
- await ScheduleVideoUpdateModel.upsert({
|
|
|
- videoId: videoInstanceUpdated.id,
|
|
|
- updateAt: new Date(videoInfoToUpdate.scheduleUpdate.updateAt),
|
|
|
- privacy: videoInfoToUpdate.scheduleUpdate.privacy || null
|
|
|
- }, { transaction: t })
|
|
|
- } else if (videoInfoToUpdate.scheduleUpdate === null) {
|
|
|
- await ScheduleVideoUpdateModel.deleteByVideoId(videoInstanceUpdated.id, t)
|
|
|
- }
|
|
|
-
|
|
|
- await autoBlacklistVideoIfNeeded({
|
|
|
- video: videoInstanceUpdated,
|
|
|
- user: res.locals.oauth.token.User,
|
|
|
- isRemote: false,
|
|
|
- isNew: false,
|
|
|
- transaction: t
|
|
|
- })
|
|
|
-
|
|
|
- await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t)
|
|
|
-
|
|
|
- auditLogger.update(
|
|
|
- getAuditIdFromRes(res),
|
|
|
- new VideoAuditView(videoInstanceUpdated.toFormattedDetailsJSON()),
|
|
|
- oldVideoAuditView
|
|
|
- )
|
|
|
- logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid, lTags(videoInstance.uuid))
|
|
|
-
|
|
|
- return videoInstanceUpdated
|
|
|
- })
|
|
|
-
|
|
|
- if (wasConfidentialVideo) {
|
|
|
- Notifier.Instance.notifyOnNewVideoIfNeeded(videoInstanceUpdated)
|
|
|
- }
|
|
|
-
|
|
|
- Hooks.runAction('action:api.video.updated', { video: videoInstanceUpdated, body: req.body })
|
|
|
- } catch (err) {
|
|
|
- // Force fields we want to update
|
|
|
- // If the transaction is retried, sequelize will think the object has not changed
|
|
|
- // So it will skip the SQL request, even if the last one was ROLLBACKed!
|
|
|
- resetSequelizeInstance(videoInstance, videoFieldsSave)
|
|
|
-
|
|
|
- throw err
|
|
|
- }
|
|
|
-
|
|
|
- return res.type('json')
|
|
|
- .status(HttpStatusCode.NO_CONTENT_204)
|
|
|
- .end()
|
|
|
-}
|
|
|
-
|
|
|
-async function getVideo (req: express.Request, res: express.Response) {
|
|
|
+async function getVideo (_req: express.Request, res: express.Response) {
|
|
|
// We need more attributes
|
|
|
const userId: number = res.locals.oauth ? res.locals.oauth.token.User.id : null
|
|
|
|
|
@@ -543,13 +184,10 @@ async function viewVideo (req: express.Request, res: express.Response) {
|
|
|
|
|
|
async function getVideoDescription (req: express.Request, res: express.Response) {
|
|
|
const videoInstance = res.locals.videoAll
|
|
|
- let description = ''
|
|
|
|
|
|
- if (videoInstance.isOwned()) {
|
|
|
- description = videoInstance.description
|
|
|
- } else {
|
|
|
- description = await fetchRemoteVideoDescription(videoInstance)
|
|
|
- }
|
|
|
+ const description = videoInstance.isOwned()
|
|
|
+ ? videoInstance.description
|
|
|
+ : await fetchRemoteVideoDescription(videoInstance)
|
|
|
|
|
|
return res.json({ description })
|
|
|
}
|
|
@@ -591,7 +229,7 @@ async function listVideos (req: express.Request, res: express.Response) {
|
|
|
return res.json(getFormattedObjects(resultList.data, resultList.total))
|
|
|
}
|
|
|
|
|
|
-async function removeVideo (req: express.Request, res: express.Response) {
|
|
|
+async function removeVideo (_req: express.Request, res: express.Response) {
|
|
|
const videoInstance = res.locals.videoAll
|
|
|
|
|
|
await sequelizeTypescript.transaction(async t => {
|
|
@@ -607,17 +245,3 @@ async function removeVideo (req: express.Request, res: express.Response) {
|
|
|
.status(HttpStatusCode.NO_CONTENT_204)
|
|
|
.end()
|
|
|
}
|
|
|
-
|
|
|
-async function createTorrentAndSetInfoHashAsync (video: MVideo, fileArg: MVideoFile) {
|
|
|
- await createTorrentAndSetInfoHash(video, fileArg)
|
|
|
-
|
|
|
- // Refresh videoFile because the createTorrentAndSetInfoHash could be long
|
|
|
- const refreshedFile = await VideoFileModel.loadWithVideo(fileArg.id)
|
|
|
- // File does not exist anymore, remove the generated torrent
|
|
|
- if (!refreshedFile) return fileArg.removeTorrent()
|
|
|
-
|
|
|
- refreshedFile.infoHash = fileArg.infoHash
|
|
|
- refreshedFile.torrentFilename = fileArg.torrentFilename
|
|
|
-
|
|
|
- return refreshedFile.save()
|
|
|
-}
|