Fix download file extensions when Immich serves WebP previews
With maxDownloadQuality=preview and Immich generating WebP previews, the zip entries and per-asset downloads were named .jpg while carrying WebP bytes. Previews, converted fullsize images and transcodes follow the server's image settings, so derive the extension from the upstream content-type for every non-/original endpoint, via a shared servedMimeFrom() in gallery/sizing.ts.
This commit is contained in:
@@ -53,10 +53,9 @@ function withMimeExtension (filename: string, mime: string | undefined): string
|
||||
/**
|
||||
* Generate a filename for the downloaded asset based on the configuration option chosen.
|
||||
*
|
||||
* The extension reflects what bytes the user will receive, not what the
|
||||
* original was - when Immich downgrades an image-original to preview (see
|
||||
* resolveImageEndpoint), the served bytes are JPEG even if the original is
|
||||
* HEIC/DNG/RAW, and the filename must match the bytes.
|
||||
* The extension reflects the served bytes, not the original: converted
|
||||
* bytes follow Immich's image settings, so pass the upstream content-type
|
||||
* as `servedMimeOverride`.
|
||||
*
|
||||
* @param asset
|
||||
* @param [servedSize] - what size Immich will actually serve. Defaults to
|
||||
|
||||
@@ -165,3 +165,13 @@ function endpointFor (size: ImageSize, asset: Asset, attachment: boolean): Image
|
||||
return { subpath: '/thumbnail', sizeQueryParam: 'preview', attachment, servedSize: ImageSize.preview }
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Served content-type for filename derivation: everything but /original is
|
||||
* Immich-generated (previews can be WebP), so the response headers are the
|
||||
* only reliable extension signal.
|
||||
*/
|
||||
export function servedMimeFrom (subpath: string, response: globalThis.Response): string | undefined {
|
||||
if (subpath === '/original') return undefined
|
||||
return (response.headers.get('content-type') || '').split(';')[0].trim() || undefined
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import { Response } from 'express-serve-static-core'
|
||||
import { Asset, ImageSize, IncomingShareRequest, SharedLink } from '../types'
|
||||
import { respondToInvalidRequest } from '../invalidRequestHandler'
|
||||
import { getFilename } from '../gallery/filename'
|
||||
import { isVideoAsset, resolveDownloadEndpoint, resolveImageEndpoint } from '../gallery/sizing'
|
||||
import { isVideoAsset, resolveDownloadEndpoint, resolveImageEndpoint, servedMimeFrom } from '../gallery/sizing'
|
||||
import { pipeline } from 'stream/promises'
|
||||
import { readableFromWeb } from '../utils/webStream'
|
||||
import { log } from '../utils/log'
|
||||
@@ -99,12 +99,7 @@ export async function assetBuffer (req: IncomingShareRequest, res: Response, ass
|
||||
if (attachment) {
|
||||
res.setHeader('X-Accel-Buffering', 'no')
|
||||
if (asset.originalFileName) {
|
||||
// Playback downloads serve Immich's transcode, so the filename extension
|
||||
// must follow the response's content-type, not the original file's.
|
||||
const playbackMime = useVideoPlayback
|
||||
? (data.headers.get('content-type') || '').split(';')[0].trim() || undefined
|
||||
: undefined
|
||||
const filename = encodeURI(getFilename(asset, servedSize, playbackMime))
|
||||
const filename = encodeURI(getFilename(asset, servedSize, servedMimeFrom(subpath, data)))
|
||||
res.setHeader('Content-Disposition', `attachment; filename*=UTF-8''${filename}`)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import { Asset, SharedLink } from '../types'
|
||||
import { log } from '../utils/log'
|
||||
import archiver, { Archiver } from 'archiver'
|
||||
import { sanitize } from '../utils/sanitize'
|
||||
import { resolveDownloadEndpoint, ImageEndpoint } from '../gallery/sizing'
|
||||
import { resolveDownloadEndpoint, servedMimeFrom, ImageEndpoint } from '../gallery/sizing'
|
||||
import { title } from '../share'
|
||||
import { getFilename } from '../gallery/filename'
|
||||
import { readableFromWeb } from '../utils/webStream'
|
||||
@@ -220,13 +220,7 @@ async function fetchOne (share: SharedLink, asset: Asset, signal: AbortSignal):
|
||||
// so recover them from the headers we already fetched - no extra calls.
|
||||
const namedAsset = asset.originalFileName ? asset : enrichFromHeaders(asset, fetched.response)
|
||||
|
||||
// Playback-fallback downloads serve Immich's transcode; carry the response
|
||||
// content-type so the zip entry's extension matches the actual bytes.
|
||||
const servedMime = endpoint.subpath === '/video/playback'
|
||||
? (fetched.response.headers.get('content-type') || '').split(';')[0].trim() || undefined
|
||||
: undefined
|
||||
|
||||
return { response: fetched.response, asset: namedAsset, endpoint, servedMime, url }
|
||||
return { response: fetched.response, asset: namedAsset, endpoint, servedMime: servedMimeFrom(endpoint.subpath, fetched.response), url }
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user