mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2025-10-05 19:42:24 +02:00
Add ability to set video thumbnail/preview
This commit is contained in:
Chocobozzz
parent
e883399fa6
commit
ac81d1a06d
22 changed files with 454 additions and 143 deletions
|
|
@ -1,13 +1,13 @@
|
|||
import * as express from 'express'
|
||||
import 'multer'
|
||||
import { extname, join } from 'path'
|
||||
import * as sharp from 'sharp'
|
||||
import * as uuidv4 from 'uuid/v4'
|
||||
import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared'
|
||||
import { unlinkPromise } from '../../helpers/core-utils'
|
||||
import { retryTransactionWrapper } from '../../helpers/database-utils'
|
||||
import { processImage } from '../../helpers/image-utils'
|
||||
import { logger } from '../../helpers/logger'
|
||||
import { createReqFiles, getFormattedObjects } from '../../helpers/utils'
|
||||
import { AVATAR_MIMETYPE_EXT, AVATARS_SIZE, CONFIG, sequelizeTypescript } from '../../initializers'
|
||||
import { AVATARS_SIZE, CONFIG, IMAGE_MIMETYPE_EXT, sequelizeTypescript } from '../../initializers'
|
||||
import { updateActorAvatarInstance } from '../../lib/activitypub'
|
||||
import { sendUpdateUser } from '../../lib/activitypub/send'
|
||||
import { Emailer } from '../../lib/emailer'
|
||||
|
|
@ -42,7 +42,7 @@ import { UserModel } from '../../models/account/user'
|
|||
import { OAuthTokenModel } from '../../models/oauth/oauth-token'
|
||||
import { VideoModel } from '../../models/video/video'
|
||||
|
||||
const reqAvatarFile = createReqFiles('avatarfile', CONFIG.STORAGE.AVATARS_DIR, AVATAR_MIMETYPE_EXT)
|
||||
const reqAvatarFile = createReqFiles([ 'avatarfile' ], IMAGE_MIMETYPE_EXT, { avatarfile: CONFIG.STORAGE.AVATARS_DIR })
|
||||
|
||||
const usersRouter = express.Router()
|
||||
|
||||
|
|
@ -288,17 +288,10 @@ async function updateMyAvatar (req: express.Request, res: express.Response, next
|
|||
const user = res.locals.oauth.token.user
|
||||
const actor = user.Account.Actor
|
||||
|
||||
const avatarDir = CONFIG.STORAGE.AVATARS_DIR
|
||||
const source = join(avatarDir, avatarPhysicalFile.filename)
|
||||
const extension = extname(avatarPhysicalFile.filename)
|
||||
const avatarName = uuidv4() + extension
|
||||
const destination = join(avatarDir, avatarName)
|
||||
|
||||
await sharp(source)
|
||||
.resize(AVATARS_SIZE.width, AVATARS_SIZE.height)
|
||||
.toFile(destination)
|
||||
|
||||
await unlinkPromise(source)
|
||||
const destination = join(CONFIG.STORAGE.AVATARS_DIR, avatarName)
|
||||
await processImage(avatarPhysicalFile, destination, AVATARS_SIZE)
|
||||
|
||||
const avatar = await sequelizeTypescript.transaction(async t => {
|
||||
const updatedActor = await updateActorAvatarInstance(actor, avatarName, t)
|
||||
|
|
|
|||
|
|
@ -4,18 +4,36 @@ import { VideoCreate, VideoPrivacy, VideoUpdate } from '../../../../shared'
|
|||
import { renamePromise } from '../../../helpers/core-utils'
|
||||
import { retryTransactionWrapper } from '../../../helpers/database-utils'
|
||||
import { getVideoFileHeight } from '../../../helpers/ffmpeg-utils'
|
||||
import { processImage } from '../../../helpers/image-utils'
|
||||
import { logger } from '../../../helpers/logger'
|
||||
import { createReqFiles, getFormattedObjects, getServerActor, resetSequelizeInstance } from '../../../helpers/utils'
|
||||
import {
|
||||
CONFIG, sequelizeTypescript, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT,
|
||||
CONFIG,
|
||||
IMAGE_MIMETYPE_EXT,
|
||||
PREVIEWS_SIZE,
|
||||
sequelizeTypescript,
|
||||
THUMBNAILS_SIZE,
|
||||
VIDEO_CATEGORIES,
|
||||
VIDEO_LANGUAGES,
|
||||
VIDEO_LICENCES,
|
||||
VIDEO_MIMETYPE_EXT,
|
||||
VIDEO_PRIVACIES
|
||||
} from '../../../initializers'
|
||||
import { fetchRemoteVideoDescription, getVideoActivityPubUrl, shareVideoByServerAndChannel } from '../../../lib/activitypub'
|
||||
import { sendCreateVideo, sendCreateViewToOrigin, sendCreateViewToVideoFollowers, sendUpdateVideo } from '../../../lib/activitypub/send'
|
||||
import { JobQueue } from '../../../lib/job-queue'
|
||||
import {
|
||||
asyncMiddleware, authenticate, paginationValidator, setDefaultSort, setDefaultPagination, videosAddValidator, videosGetValidator,
|
||||
videosRemoveValidator, videosSearchValidator, videosSortValidator, videosUpdateValidator
|
||||
asyncMiddleware,
|
||||
authenticate,
|
||||
paginationValidator,
|
||||
setDefaultPagination,
|
||||
setDefaultSort,
|
||||
videosAddValidator,
|
||||
videosGetValidator,
|
||||
videosRemoveValidator,
|
||||
videosSearchValidator,
|
||||
videosSortValidator,
|
||||
videosUpdateValidator
|
||||
} from '../../../middlewares'
|
||||
import { TagModel } from '../../../models/video/tag'
|
||||
import { VideoModel } from '../../../models/video/video'
|
||||
|
|
@ -28,7 +46,23 @@ import { rateVideoRouter } from './rate'
|
|||
|
||||
const videosRouter = express.Router()
|
||||
|
||||
const reqVideoFile = createReqFiles('videofile', CONFIG.STORAGE.VIDEOS_DIR, VIDEO_MIMETYPE_EXT)
|
||||
const reqVideoFileAdd = createReqFiles(
|
||||
[ 'videofile', 'thumbnailfile', 'previewfile' ],
|
||||
Object.assign({}, VIDEO_MIMETYPE_EXT, IMAGE_MIMETYPE_EXT),
|
||||
{
|
||||
videofile: CONFIG.STORAGE.VIDEOS_DIR,
|
||||
thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR,
|
||||
previewfile: CONFIG.STORAGE.PREVIEWS_DIR
|
||||
}
|
||||
)
|
||||
const reqVideoFileUpdate = createReqFiles(
|
||||
[ 'thumbnailfile', 'previewfile' ],
|
||||
IMAGE_MIMETYPE_EXT,
|
||||
{
|
||||
thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR,
|
||||
previewfile: CONFIG.STORAGE.PREVIEWS_DIR
|
||||
}
|
||||
)
|
||||
|
||||
videosRouter.use('/', abuseVideoRouter)
|
||||
videosRouter.use('/', blacklistRouter)
|
||||
|
|
@ -58,12 +92,13 @@ videosRouter.get('/search',
|
|||
)
|
||||
videosRouter.put('/:id',
|
||||
authenticate,
|
||||
reqVideoFileUpdate,
|
||||
asyncMiddleware(videosUpdateValidator),
|
||||
asyncMiddleware(updateVideoRetryWrapper)
|
||||
)
|
||||
videosRouter.post('/upload',
|
||||
authenticate,
|
||||
reqVideoFile,
|
||||
reqVideoFileAdd,
|
||||
asyncMiddleware(videosAddValidator),
|
||||
asyncMiddleware(addVideoRetryWrapper)
|
||||
)
|
||||
|
|
@ -150,8 +185,7 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi
|
|||
const video = new VideoModel(videoData)
|
||||
video.url = getVideoActivityPubUrl(video)
|
||||
|
||||
const videoFilePath = join(CONFIG.STORAGE.VIDEOS_DIR, videoPhysicalFile.filename)
|
||||
const videoFileHeight = await getVideoFileHeight(videoFilePath)
|
||||
const videoFileHeight = await getVideoFileHeight(videoPhysicalFile.path)
|
||||
|
||||
const videoFileData = {
|
||||
extname: extname(videoPhysicalFile.filename),
|
||||
|
|
@ -160,21 +194,28 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi
|
|||
}
|
||||
const videoFile = new VideoFileModel(videoFileData)
|
||||
const videoDir = CONFIG.STORAGE.VIDEOS_DIR
|
||||
const source = join(videoDir, videoPhysicalFile.filename)
|
||||
const destination = join(videoDir, video.getVideoFilename(videoFile))
|
||||
await renamePromise(videoPhysicalFile.path, destination)
|
||||
|
||||
await renamePromise(source, destination)
|
||||
// This is important in case if there is another attempt in the retry process
|
||||
videoPhysicalFile.filename = video.getVideoFilename(videoFile)
|
||||
// Process thumbnail or create it from the video
|
||||
const thumbnailField = req.files['thumbnailfile']
|
||||
if (thumbnailField) {
|
||||
const thumbnailPhysicalFile = thumbnailField[0]
|
||||
await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName()), THUMBNAILS_SIZE)
|
||||
} else {
|
||||
await video.createThumbnail(videoFile)
|
||||
}
|
||||
|
||||
const tasks = []
|
||||
// Process preview or create it from the video
|
||||
const previewField = req.files['previewfile']
|
||||
if (previewField) {
|
||||
const previewPhysicalFile = previewField[0]
|
||||
await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName()), PREVIEWS_SIZE)
|
||||
} else {
|
||||
await video.createPreview(videoFile)
|
||||
}
|
||||
|
||||
tasks.push(
|
||||
video.createTorrentAndSetInfoHash(videoFile),
|
||||
video.createThumbnail(videoFile),
|
||||
video.createPreview(videoFile)
|
||||
)
|
||||
await Promise.all(tasks)
|
||||
await video.createTorrentAndSetInfoHash(videoFile)
|
||||
|
||||
const videoCreated = await sequelizeTypescript.transaction(async t => {
|
||||
const sequelizeOptions = { transaction: t }
|
||||
|
|
@ -237,6 +278,18 @@ async function updateVideo (req: express.Request, res: express.Response) {
|
|||
const videoInfoToUpdate: VideoUpdate = req.body
|
||||
const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE
|
||||
|
||||
// Process thumbnail or create it from the video
|
||||
if (req.files && req.files['thumbnailfile']) {
|
||||
const thumbnailPhysicalFile = req.files['thumbnailfile'][0]
|
||||
await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, videoInstance.getThumbnailName()), THUMBNAILS_SIZE)
|
||||
}
|
||||
|
||||
// Process preview or create it from the video
|
||||
if (req.files && req.files['previewfile']) {
|
||||
const previewPhysicalFile = req.files['previewfile'][0]
|
||||
await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, videoInstance.getPreviewName()), PREVIEWS_SIZE)
|
||||
}
|
||||
|
||||
try {
|
||||
await sequelizeTypescript.transaction(async t => {
|
||||
const sequelizeOptions = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue