import * as express from 'express'
-import { getFormattedObjects, getServerActor } from '../../helpers/utils'
+import { getFormattedObjects } from '../../helpers/utils'
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
authenticate,
- commonVideosFiltersValidator,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
setDefaultSort
} from '../../middlewares'
-import { VideoChannelModel } from '../../models/video/video-channel'
import { videoPlaylistsSortValidator } from '../../middlewares/validators'
-import { buildNSFWFilter, createReqFiles, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils'
-import { CONFIG, MIMETYPES, sequelizeTypescript, THUMBNAILS_SIZE, VIDEO_PLAYLIST_PRIVACIES } from '../../initializers'
+import { buildNSFWFilter, createReqFiles } from '../../helpers/express-utils'
+import { MIMETYPES, VIDEO_PLAYLIST_PRIVACIES } from '../../initializers/constants'
import { logger } from '../../helpers/logger'
import { resetSequelizeInstance } from '../../helpers/database-utils'
import { VideoPlaylistModel } from '../../models/video/video-playlist'
} from '../../middlewares/validators/videos/video-playlists'
import { VideoPlaylistCreate } from '../../../shared/models/videos/playlist/video-playlist-create.model'
import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model'
-import { processImage } from '../../helpers/image-utils'
import { join } from 'path'
-import { UserModel } from '../../models/account/user'
import { sendCreateVideoPlaylist, sendDeleteVideoPlaylist, sendUpdateVideoPlaylist } from '../../lib/activitypub/send'
import { getVideoPlaylistActivityPubUrl, getVideoPlaylistElementActivityPubUrl } from '../../lib/activitypub/url'
import { VideoPlaylistUpdate } from '../../../shared/models/videos/playlist/video-playlist-update.model'
-import { VideoModel } from '../../models/video/video'
import { VideoPlaylistElementModel } from '../../models/video/video-playlist-element'
import { VideoPlaylistElementCreate } from '../../../shared/models/videos/playlist/video-playlist-element-create.model'
import { VideoPlaylistElementUpdate } from '../../../shared/models/videos/playlist/video-playlist-element-update.model'
-import { copy, pathExists } from 'fs-extra'
import { AccountModel } from '../../models/account/account'
+import { VideoPlaylistReorder } from '../../../shared/models/videos/playlist/video-playlist-reorder.model'
+import { JobQueue } from '../../lib/job-queue'
+import { CONFIG } from '../../initializers/config'
+import { sequelizeTypescript } from '../../initializers/database'
+import { createPlaylistMiniatureFromExisting } from '../../lib/thumbnail'
+import { MVideoPlaylistFull, MVideoPlaylistThumbnail, MVideoThumbnail } from '@server/types/models'
+import { getServerActor } from '@server/models/application/application'
const reqThumbnailFile = createReqFiles([ 'thumbnailfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { thumbnailfile: CONFIG.STORAGE.TMP_DIR })
)
videoPlaylistRouter.get('/:playlistId',
- asyncMiddleware(videoPlaylistsGetValidator),
+ asyncMiddleware(videoPlaylistsGetValidator('summary')),
getVideoPlaylist
)
)
videoPlaylistRouter.get('/:playlistId/videos',
- asyncMiddleware(videoPlaylistsGetValidator),
+ asyncMiddleware(videoPlaylistsGetValidator('summary')),
paginationValidator,
setDefaultPagination,
optionalAuthenticate,
- commonVideosFiltersValidator,
asyncMiddleware(getVideoPlaylistVideos)
)
asyncRetryTransactionMiddleware(reorderVideosPlaylist)
)
-videoPlaylistRouter.put('/:playlistId/videos/:videoId',
+videoPlaylistRouter.put('/:playlistId/videos/:playlistElementId',
authenticate,
asyncMiddleware(videoPlaylistsUpdateOrRemoveVideoValidator),
asyncRetryTransactionMiddleware(updateVideoPlaylistElement)
)
-videoPlaylistRouter.delete('/:playlistId/videos/:videoId',
+videoPlaylistRouter.delete('/:playlistId/videos/:playlistElementId',
authenticate,
asyncMiddleware(videoPlaylistsUpdateOrRemoveVideoValidator),
asyncRetryTransactionMiddleware(removeVideoFromPlaylist)
}
function getVideoPlaylist (req: express.Request, res: express.Response) {
- const videoPlaylist = res.locals.videoPlaylist as VideoPlaylistModel
+ const videoPlaylist = res.locals.videoPlaylistSummary
+
+ if (videoPlaylist.isOutdated()) {
+ JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'video-playlist', url: videoPlaylist.url } })
+ }
return res.json(videoPlaylist.toFormattedJSON())
}
async function addVideoPlaylist (req: express.Request, res: express.Response) {
const videoPlaylistInfo: VideoPlaylistCreate = req.body
- const user: UserModel = res.locals.oauth.token.User
+ const user = res.locals.oauth.token.User
const videoPlaylist = new VideoPlaylistModel({
name: videoPlaylistInfo.displayName,
description: videoPlaylistInfo.description,
privacy: videoPlaylistInfo.privacy || VideoPlaylistPrivacy.PRIVATE,
ownerAccountId: user.Account.id
- })
+ }) as MVideoPlaylistFull
videoPlaylist.url = getVideoPlaylistActivityPubUrl(videoPlaylist) // We use the UUID, so set the URL after building the object
if (videoPlaylistInfo.videoChannelId) {
- const videoChannel = res.locals.videoChannel as VideoChannelModel
+ const videoChannel = res.locals.videoChannel
videoPlaylist.videoChannelId = videoChannel.id
videoPlaylist.VideoChannel = videoChannel
}
const thumbnailField = req.files['thumbnailfile']
- if (thumbnailField) {
- const thumbnailPhysicalFile = thumbnailField[ 0 ]
- await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, videoPlaylist.getThumbnailName()), THUMBNAILS_SIZE)
- }
+ const thumbnailModel = thumbnailField
+ ? await createPlaylistMiniatureFromExisting(thumbnailField[0].path, videoPlaylist, false)
+ : undefined
+
+ const videoPlaylistCreated = await sequelizeTypescript.transaction(async t => {
+ const videoPlaylistCreated = await videoPlaylist.save({ transaction: t }) as MVideoPlaylistFull
- const videoPlaylistCreated: VideoPlaylistModel = await sequelizeTypescript.transaction(async t => {
- const videoPlaylistCreated = await videoPlaylist.save({ transaction: t })
+ if (thumbnailModel) {
+ thumbnailModel.automaticallyGenerated = false
+ await videoPlaylistCreated.setAndSaveThumbnail(thumbnailModel, t)
+ }
// We need more attributes for the federation
videoPlaylistCreated.OwnerAccount = await AccountModel.load(user.Account.id, t)
}
async function updateVideoPlaylist (req: express.Request, res: express.Response) {
- const videoPlaylistInstance = res.locals.videoPlaylist as VideoPlaylistModel
+ const videoPlaylistInstance = res.locals.videoPlaylistFull
const videoPlaylistFieldsSave = videoPlaylistInstance.toJSON()
const videoPlaylistInfoToUpdate = req.body as VideoPlaylistUpdate
+
const wasPrivatePlaylist = videoPlaylistInstance.privacy === VideoPlaylistPrivacy.PRIVATE
+ const wasNotPrivatePlaylist = videoPlaylistInstance.privacy !== VideoPlaylistPrivacy.PRIVATE
const thumbnailField = req.files['thumbnailfile']
- if (thumbnailField) {
- const thumbnailPhysicalFile = thumbnailField[ 0 ]
- await processImage(
- thumbnailPhysicalFile,
- join(CONFIG.STORAGE.THUMBNAILS_DIR, videoPlaylistInstance.getThumbnailName()),
- THUMBNAILS_SIZE
- )
- }
+ const thumbnailModel = thumbnailField
+ ? await createPlaylistMiniatureFromExisting(thumbnailField[0].path, videoPlaylistInstance, false)
+ : undefined
try {
await sequelizeTypescript.transaction(async t => {
if (videoPlaylistInfoToUpdate.videoChannelId === null) {
videoPlaylistInstance.videoChannelId = null
} else {
- const videoChannel = res.locals.videoChannel as VideoChannelModel
+ const videoChannel = res.locals.videoChannel
videoPlaylistInstance.videoChannelId = videoChannel.id
videoPlaylistInstance.VideoChannel = videoChannel
if (videoPlaylistInfoToUpdate.privacy !== undefined) {
videoPlaylistInstance.privacy = parseInt(videoPlaylistInfoToUpdate.privacy.toString(), 10)
+
+ if (wasNotPrivatePlaylist === true && videoPlaylistInstance.privacy === VideoPlaylistPrivacy.PRIVATE) {
+ await sendDeleteVideoPlaylist(videoPlaylistInstance, t)
+ }
}
const playlistUpdated = await videoPlaylistInstance.save(sequelizeOptions)
+ if (thumbnailModel) {
+ thumbnailModel.automaticallyGenerated = false
+ await playlistUpdated.setAndSaveThumbnail(thumbnailModel, t)
+ }
+
const isNewPlaylist = wasPrivatePlaylist && playlistUpdated.privacy !== VideoPlaylistPrivacy.PRIVATE
if (isNewPlaylist) {
}
async function removeVideoPlaylist (req: express.Request, res: express.Response) {
- const videoPlaylistInstance: VideoPlaylistModel = res.locals.videoPlaylist
+ const videoPlaylistInstance = res.locals.videoPlaylistSummary
await sequelizeTypescript.transaction(async t => {
await videoPlaylistInstance.destroy({ transaction: t })
async function addVideoInPlaylist (req: express.Request, res: express.Response) {
const body: VideoPlaylistElementCreate = req.body
- const videoPlaylist: VideoPlaylistModel = res.locals.videoPlaylist
- const video: VideoModel = res.locals.video
+ const videoPlaylist = res.locals.videoPlaylistFull
+ const video = res.locals.onlyVideo
- const playlistElement: VideoPlaylistElementModel = await sequelizeTypescript.transaction(async t => {
+ const playlistElement = await sequelizeTypescript.transaction(async t => {
const position = await VideoPlaylistElementModel.getNextPositionOf(videoPlaylist.id, t)
const playlistElement = await VideoPlaylistElementModel.create({
videoId: video.id
}, { transaction: t })
- // If the user did not set a thumbnail, automatically take the video thumbnail
- if (playlistElement.position === 1) {
- const playlistThumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, videoPlaylist.getThumbnailName())
-
- if (await pathExists(playlistThumbnailPath) === false) {
- logger.info('Generating default thumbnail to playlist %s.', videoPlaylist.url)
-
- const videoThumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName())
- await copy(videoThumbnailPath, playlistThumbnailPath)
- }
- }
-
- await sendUpdateVideoPlaylist(videoPlaylist, t)
+ videoPlaylist.changed('updatedAt', true)
+ await videoPlaylist.save({ transaction: t })
return playlistElement
})
+ // If the user did not set a thumbnail, automatically take the video thumbnail
+ if (videoPlaylist.hasThumbnail() === false || (videoPlaylist.hasGeneratedThumbnail() && playlistElement.position === 1)) {
+ await generateThumbnailForPlaylist(videoPlaylist, video)
+ }
+
+ sendUpdateVideoPlaylist(videoPlaylist, undefined)
+ .catch(err => logger.error('Cannot send video playlist update.', { err }))
+
logger.info('Video added in playlist %s at position %d.', videoPlaylist.uuid, playlistElement.position)
return res.json({
async function updateVideoPlaylistElement (req: express.Request, res: express.Response) {
const body: VideoPlaylistElementUpdate = req.body
- const videoPlaylist: VideoPlaylistModel = res.locals.videoPlaylist
- const videoPlaylistElement: VideoPlaylistElementModel = res.locals.videoPlaylistElement
+ const videoPlaylist = res.locals.videoPlaylistFull
+ const videoPlaylistElement = res.locals.videoPlaylistElement
const playlistElement: VideoPlaylistElementModel = await sequelizeTypescript.transaction(async t => {
if (body.startTimestamp !== undefined) videoPlaylistElement.startTimestamp = body.startTimestamp
const element = await videoPlaylistElement.save({ transaction: t })
+ videoPlaylist.changed('updatedAt', true)
+ await videoPlaylist.save({ transaction: t })
+
await sendUpdateVideoPlaylist(videoPlaylist, t)
return element
}
async function removeVideoFromPlaylist (req: express.Request, res: express.Response) {
- const videoPlaylistElement: VideoPlaylistElementModel = res.locals.videoPlaylistElement
- const videoPlaylist: VideoPlaylistModel = res.locals.videoPlaylist
+ const videoPlaylistElement = res.locals.videoPlaylistElement
+ const videoPlaylist = res.locals.videoPlaylistFull
const positionToDelete = videoPlaylistElement.position
await sequelizeTypescript.transaction(async t => {
// Decrease position of the next elements
await VideoPlaylistElementModel.increasePositionOf(videoPlaylist.id, positionToDelete, null, -1, t)
- await sendUpdateVideoPlaylist(videoPlaylist, t)
+ videoPlaylist.changed('updatedAt', true)
+ await videoPlaylist.save({ transaction: t })
logger.info('Video playlist element %d of playlist %s deleted.', videoPlaylistElement.position, videoPlaylist.uuid)
})
+ // Do we need to regenerate the default thumbnail?
+ if (positionToDelete === 1 && videoPlaylist.hasGeneratedThumbnail()) {
+ await regeneratePlaylistThumbnail(videoPlaylist)
+ }
+
+ sendUpdateVideoPlaylist(videoPlaylist, undefined)
+ .catch(err => logger.error('Cannot send video playlist update.', { err }))
+
return res.type('json').status(204).end()
}
async function reorderVideosPlaylist (req: express.Request, res: express.Response) {
- const videoPlaylist: VideoPlaylistModel = res.locals.videoPlaylist
+ const videoPlaylist = res.locals.videoPlaylistFull
+ const body: VideoPlaylistReorder = req.body
- const start: number = req.body.startPosition
- const insertAfter: number = req.body.insertAfterPosition
- const reorderLength: number = req.body.reorderLength || 1
+ const start: number = body.startPosition
+ const insertAfter: number = body.insertAfterPosition
+ const reorderLength: number = body.reorderLength || 1
if (start === insertAfter) {
return res.status(204).end()
// Decrease positions of elements after the old position of our ordered elements (decrease)
await VideoPlaylistElementModel.increasePositionOf(videoPlaylist.id, oldPosition, null, -reorderLength, t)
+ videoPlaylist.changed('updatedAt', true)
+ await videoPlaylist.save({ transaction: t })
+
await sendUpdateVideoPlaylist(videoPlaylist, t)
})
+ // The first element changed
+ if ((start === 1 || insertAfter === 0) && videoPlaylist.hasGeneratedThumbnail()) {
+ await regeneratePlaylistThumbnail(videoPlaylist)
+ }
+
logger.info(
- 'Reordered playlist %s (inserted after %d elements %d - %d).',
+ 'Reordered playlist %s (inserted after position %d elements %d - %d).',
videoPlaylist.uuid, insertAfter, start, start + reorderLength - 1
)
}
async function getVideoPlaylistVideos (req: express.Request, res: express.Response) {
- const videoPlaylistInstance: VideoPlaylistModel = res.locals.videoPlaylist
- const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined
+ const videoPlaylistInstance = res.locals.videoPlaylistSummary
+ const user = res.locals.oauth ? res.locals.oauth.token.User : undefined
+ const server = await getServerActor()
- const resultList = await VideoModel.listForApi({
- followerActorId,
+ const resultList = await VideoPlaylistElementModel.listForApi({
start: req.query.start,
count: req.query.count,
- sort: 'VideoPlaylistElements.position',
- includeLocalVideos: true,
- categoryOneOf: req.query.categoryOneOf,
- licenceOneOf: req.query.licenceOneOf,
- languageOneOf: req.query.languageOneOf,
- tagsOneOf: req.query.tagsOneOf,
- tagsAllOf: req.query.tagsAllOf,
- filter: req.query.filter,
- nsfw: buildNSFWFilter(res, req.query.nsfw),
- withFiles: false,
videoPlaylistId: videoPlaylistInstance.id,
- user: res.locals.oauth ? res.locals.oauth.token.User : undefined
+ serverAccount: server.Account,
+ user
})
- const additionalAttributes = { playlistInfo: true }
- return res.json(getFormattedObjects(resultList.data, resultList.total, { additionalAttributes }))
+ const options = {
+ displayNSFW: buildNSFWFilter(res, req.query.nsfw),
+ accountId: user ? user.Account.id : undefined
+ }
+ return res.json(getFormattedObjects(resultList.data, resultList.total, options))
+}
+
+async function regeneratePlaylistThumbnail (videoPlaylist: MVideoPlaylistThumbnail) {
+ await videoPlaylist.Thumbnail.destroy()
+ videoPlaylist.Thumbnail = null
+
+ const firstElement = await VideoPlaylistElementModel.loadFirstElementWithVideoThumbnail(videoPlaylist.id)
+ if (firstElement) await generateThumbnailForPlaylist(videoPlaylist, firstElement.Video)
+}
+
+async function generateThumbnailForPlaylist (videoPlaylist: MVideoPlaylistThumbnail, video: MVideoThumbnail) {
+ logger.info('Generating default thumbnail to playlist %s.', videoPlaylist.url)
+
+ const videoMiniature = video.getMiniature()
+ if (!videoMiniature) {
+ logger.info('Cannot generate thumbnail for playlist %s because video %s does not have any.', videoPlaylist.url, video.url)
+ return
+ }
+
+ const inputPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, videoMiniature.filename)
+ const thumbnailModel = await createPlaylistMiniatureFromExisting(inputPath, videoPlaylist, true, true)
+
+ thumbnailModel.videoPlaylistId = videoPlaylist.id
+
+ videoPlaylist.Thumbnail = await thumbnailModel.save()
}
projects / github / Chocobozzz / PeerTube.git / blobdiff