More robust youtube-dl thumbnail import

[github/Chocobozzz/PeerTube.git] / server / controllers / api / videos / live.ts

diff --git a/server/controllers/api/videos/live.ts b/server/controllers/api/videos/live.ts
index f980c7730ddaa75fd87bdbb9e63822b1cda1eb5f..efafe64e9af7d6c15611d8ad3b8c56fca2497a4b 100644 (file)
--- a/server/controllers/api/videos/live.ts
+++ b/server/controllers/api/videos/live.ts
@@ -1,18 +1,20 @@
-import * as express from 'express'
-import { v4 as uuidv4 } from 'uuid'
+import express from 'express'
 import { createReqFiles } from '@server/helpers/express-utils'
+import { buildUUID, uuidToShort } from '@server/helpers/uuid'
 import { CONFIG } from '@server/initializers/config'
 import { ASSETS_PATH, MIMETYPES } from '@server/initializers/constants'
-import { getVideoActivityPubUrl } from '@server/lib/activitypub/url'
+import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
 import { federateVideoIfNeeded } from '@server/lib/activitypub/videos'
+import { Hooks } from '@server/lib/plugins/hooks'
 import { buildLocalVideoFromReq, buildVideoThumbnailsFromReq, setVideoTags } from '@server/lib/video'
 import { videoLiveAddValidator, videoLiveGetValidator, videoLiveUpdateValidator } from '@server/middlewares/validators/videos/video-live'
 import { VideoLiveModel } from '@server/models/video/video-live'
 import { MVideoDetails, MVideoFullLight } from '@server/types/models'
 import { LiveVideoCreate, LiveVideoUpdate, VideoState } from '../../../../shared'
+import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes'
 import { logger } from '../../../helpers/logger'
 import { sequelizeTypescript } from '../../../initializers/database'
-import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail'
+import { updateVideoMiniatureFromExisting } from '../../../lib/thumbnail'
 import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate } from '../../../middlewares'
 import { VideoModel } from '../../../models/video/video'
 
@@ -37,7 +39,7 @@ liveRouter.post('/live',
 liveRouter.get('/live/:videoId',
   authenticate,
   asyncMiddleware(videoLiveGetValidator),
-  asyncRetryTransactionMiddleware(getLiveVideo)
+  getLiveVideo
 )
 
 liveRouter.put('/live/:videoId',
@@ -55,7 +57,7 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function getLiveVideo (req: express.Request, res: express.Response) {
+function getLiveVideo (req: express.Request, res: express.Response) {
   const videoLive = res.locals.videoLive
 
   return res.json(videoLive.toFormattedJSON())
@@ -66,13 +68,15 @@ async function updateLiveVideo (req: express.Request, res: express.Response) {
 
   const video = res.locals.videoAll
   const videoLive = res.locals.videoLive
+
   videoLive.saveReplay = body.saveReplay || false
+  videoLive.permanentLive = body.permanentLive || false
 
   video.VideoLive = await videoLive.save()
 
   await federateVideoIfNeeded(video, false)
 
-  return res.sendStatus(204)
+  return res.status(HttpStatusCode.NO_CONTENT_204).end()
 }
 
 async function addLiveVideo (req: express.Request, res: express.Response) {
@@ -85,17 +89,18 @@ async function addLiveVideo (req: express.Request, res: express.Response) {
   videoData.duration = 0
 
   const video = new VideoModel(videoData) as MVideoDetails
-  video.url = getVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
+  video.url = getLocalVideoActivityPubUrl(video) // We use the UUID, so set the URL after building the object
 
   const videoLive = new VideoLiveModel()
   videoLive.saveReplay = videoInfo.saveReplay || false
-  videoLive.streamKey = uuidv4()
+  videoLive.permanentLive = videoInfo.permanentLive || false
+  videoLive.streamKey = buildUUID()
 
   const [ thumbnailModel, previewModel ] = await buildVideoThumbnailsFromReq({
     video,
     files: req.files,
     fallback: type => {
-      return createVideoMiniatureFromExisting({
+      return updateVideoMiniatureFromExisting({
         inputPath: ASSETS_PATH.DEFAULT_LIVE_BACKGROUND,
         video,
         type,
@@ -128,9 +133,12 @@ async function addLiveVideo (req: express.Request, res: express.Response) {
     return { videoCreated }
   })
 
+  Hooks.runAction('action:api.live-video.created', { video: videoCreated })
+
   return res.json({
     video: {
       id: videoCreated.id,
+      shortUUID: uuidToShort(videoCreated.uuid),
       uuid: videoCreated.uuid
     }
   })