interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correctly handle unknown remote actor image size

This commit is contained in:
Chocobozzz 2022-06-20 11:48:40 +02:00
parent 73114c103a
commit 0f07c28951
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/controllers/lazy-static.ts
View File

@ -1,9 +1,10 @@
import cors from 'cors' import cors from 'cors'
import express from 'express' import express from 'express'
import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache' import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache'
import { MActorImage } from '@server/types/models'
import { HttpStatusCode } from '../../shared/models/http/http-error-codes' import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
import { logger } from '../helpers/logger' import { logger } from '../helpers/logger'
import { LAZY_STATIC_PATHS, STATIC_MAX_AGE } from '../initializers/constants' import { ACTOR_IMAGES_SIZE, LAZY_STATIC_PATHS, STATIC_MAX_AGE } from '../initializers/constants'
import { VideosCaptionCache, VideosPreviewCache } from '../lib/files-cache' import { VideosCaptionCache, VideosPreviewCache } from '../lib/files-cache'
import { actorImagePathUnsafeCache, pushActorImageProcessInQueue } from '../lib/local-actor' import { actorImagePathUnsafeCache, pushActorImageProcessInQueue } from '../lib/local-actor'
import { asyncMiddleware } from '../middlewares' import { asyncMiddleware } from '../middlewares'
@ -67,10 +68,7 @@ async function getActorImage (req: express.Request, res: express.Response, next:
await pushActorImageProcessInQueue({ await pushActorImageProcessInQueue({
filename: image.filename, filename: image.filename,
fileUrl: image.fileUrl, fileUrl: image.fileUrl,
size: { size: getActorImageSize(image),
height: image.height,
width: image.width
},
type: image.type type: image.type
}) })
} catch (err) { } catch (err) {
@ -94,7 +92,7 @@ async function getActorImage (req: express.Request, res: express.Response, next:
if (err.status === HttpStatusCode.NOT_FOUND_404 && !image.isOwned()) { if (err.status === HttpStatusCode.NOT_FOUND_404 && !image.isOwned()) {
logger.error('Cannot lazy serve actor image %s.', filename, { err }) logger.error('Cannot lazy serve actor image %s.', filename, { err })
actorImagePathUnsafeCache.del(filename) actorImagePathUnsafeCache.delete(filename)
image.onDisk = false image.onDisk = false
image.save() image.save()
@ -105,6 +103,17 @@ async function getActorImage (req: express.Request, res: express.Response, next:
}) })
} }
function getActorImageSize (image: MActorImage): { width: number, height: number } {
if (image.width && image.height) {
return {
height: image.height,
width: image.width
}
}
return ACTOR_IMAGES_SIZE[image.type][0]
}
async function getPreview (req: express.Request, res: express.Response) { async function getPreview (req: express.Request, res: express.Response) {
const result = await VideosPreviewCache.Instance.getFilePath(req.params.filename) const result = await VideosPreviewCache.Instance.getFilePath(req.params.filename)
if (!result) return res.status(HttpStatusCode.NOT_FOUND_404).end() if (!result) return res.status(HttpStatusCode.NOT_FOUND_404).end()