client(hotkeys): remove seekstep VLC behavior

[github/Chocobozzz/PeerTube.git] / server / controllers / lazy-static.ts

diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts
index 4285fd727f0938fc99defb9d4f4a19deb13fe0b7..656dea2230b4650a517fecf676d771645fc6729e 100644 (file)
--- a/server/controllers/lazy-static.ts
+++ b/server/controllers/lazy-static.ts
@@ -6,6 +6,7 @@ import { asyncMiddleware } from '../middlewares'
 import { AvatarModel } from '../models/avatar/avatar'
 import { logger } from '../helpers/logger'
 import { avatarPathUnsafeCache, pushAvatarProcessInQueue } from '../lib/avatar'
+import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
 
 const lazyStaticRouter = express.Router()
 
@@ -17,12 +18,12 @@ lazyStaticRouter.use(
 )
 
 lazyStaticRouter.use(
-  LAZY_STATIC_PATHS.PREVIEWS + ':uuid.jpg',
+  LAZY_STATIC_PATHS.PREVIEWS + ':filename',
   asyncMiddleware(getPreview)
 )
 
 lazyStaticRouter.use(
-  LAZY_STATIC_PATHS.VIDEO_CAPTIONS + ':videoId-:captionLanguage([a-z]+).vtt',
+  LAZY_STATIC_PATHS.VIDEO_CAPTIONS + ':filename',
   asyncMiddleware(getVideoCaption)
 )
 
@@ -44,12 +45,19 @@ async function getAvatar (req: express.Request, res: express.Response) {
   }
 
   const avatar = await AvatarModel.loadByName(filename)
+  if (!avatar) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+
   if (avatar.onDisk === false) {
-    if (!avatar.fileUrl) return res.sendStatus(404)
+    if (!avatar.fileUrl) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
 
     logger.info('Lazy serve remote avatar image %s.', avatar.fileUrl)
 
-    await pushAvatarProcessInQueue({ filename: avatar.filename, fileUrl: avatar.fileUrl })
+    try {
+      await pushAvatarProcessInQueue({ filename: avatar.filename, fileUrl: avatar.fileUrl })
+    } catch (err) {
+      logger.warn('Cannot process remote avatar %s.', avatar.fileUrl, { err })
+      return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+    }
 
     avatar.onDisk = true
     avatar.save()
@@ -63,18 +71,15 @@ async function getAvatar (req: express.Request, res: express.Response) {
 }
 
 async function getPreview (req: express.Request, res: express.Response) {
-  const result = await VideosPreviewCache.Instance.getFilePath(req.params.uuid)
-  if (!result) return res.sendStatus(404)
+  const result = await VideosPreviewCache.Instance.getFilePath(req.params.filename)
+  if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
 
   return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.SERVER })
 }
 
 async function getVideoCaption (req: express.Request, res: express.Response) {
-  const result = await VideosCaptionCache.Instance.getFilePath({
-    videoId: req.params.videoId,
-    language: req.params.captionLanguage
-  })
-  if (!result) return res.sendStatus(404)
+  const result = await VideosCaptionCache.Instance.getFilePath(req.params.filename)
+  if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
 
   return res.sendFile(result.path, { maxAge: STATIC_MAX_AGE.SERVER })
 }