Serve the bench before the catalog and never await ffmpeg on /thumb.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { existsSync, createReadStream } from 'node:fs'
|
||||
import { fileEtag, stillPath, stillThumbPath, sniffImageType } from '~/server/utils/library'
|
||||
import { fileEtag, stillPath, existingStillThumbPath, stillThumbPath, sniffImageType } from '~/server/utils/library'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
export default defineEventHandler((event) => {
|
||||
const { owner } = assertLibraryOwner(event)
|
||||
const id = String(getRouterParam(event, 'id') || '')
|
||||
const still = getStill(owner, id)
|
||||
@@ -9,28 +9,36 @@ export default defineEventHandler(async (event) => {
|
||||
const wantThumb = String(getQuery(event).thumb || '') === '1'
|
||||
const original = stillPath(owner, still.id)
|
||||
|
||||
let path = original
|
||||
if (wantThumb) {
|
||||
path = await stillThumbPath(owner, id)
|
||||
// Never fall back to the archive PNG/JPEG for ?thumb=1
|
||||
if (!path || path === original || !existsSync(path)) {
|
||||
throw createError({ statusCode: 404, statusMessage: 'Thumbnail not found' })
|
||||
const path = existingStillThumbPath(owner, id)
|
||||
if (path && path !== original && existsSync(path)) {
|
||||
const etag = fileEtag(path)
|
||||
setHeader(event, 'ETag', etag)
|
||||
setHeader(event, 'Cache-Control', 'public, max-age=86400')
|
||||
if (getHeader(event, 'if-none-match') === etag) {
|
||||
setResponseStatus(event, 304)
|
||||
return null
|
||||
}
|
||||
setHeader(event, 'Content-Type', 'image/jpeg')
|
||||
return sendStream(event, createReadStream(path))
|
||||
}
|
||||
} else if (!existsSync(path)) {
|
||||
void stillThumbPath(owner, id).catch(() => null)
|
||||
setHeader(event, 'Cache-Control', 'no-store')
|
||||
setResponseStatus(event, 204)
|
||||
return null
|
||||
}
|
||||
|
||||
if (!existsSync(original)) {
|
||||
throw createError({ statusCode: 404, statusMessage: 'Image file is missing' })
|
||||
}
|
||||
|
||||
const etag = fileEtag(path)
|
||||
const etag = fileEtag(original)
|
||||
setHeader(event, 'ETag', etag)
|
||||
setHeader(
|
||||
event,
|
||||
'Cache-Control',
|
||||
wantThumb ? 'public, max-age=86400' : 'private, max-age=3600'
|
||||
)
|
||||
setHeader(event, 'Cache-Control', 'private, max-age=3600')
|
||||
if (getHeader(event, 'if-none-match') === etag) {
|
||||
setResponseStatus(event, 304)
|
||||
return null
|
||||
}
|
||||
setHeader(event, 'Content-Type', wantThumb ? 'image/jpeg' : sniffImageType(path))
|
||||
return sendStream(event, createReadStream(path))
|
||||
setHeader(event, 'Content-Type', sniffImageType(original))
|
||||
return sendStream(event, createReadStream(original))
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user