Improvements to extension handling

This commit is contained in:
Alan Grainger
2026-05-28 17:19:28 +08:00
parent b8f6b7340a
commit 8be7ac9179
+37 -30
View File
@@ -159,11 +159,9 @@ class Render {
/** /**
* Map an Immich asset MIME type to a file extension (including the dot). * Map an Immich asset MIME type to a file extension (including the dot).
* * Returns '' for unknown types; obscure RAW types fall through to '' so
* Returns '' for unknown types so callers can fall back to parsing the * the original filename (which usually has the correct extension) is
* extension from `originalFileName`. The map only covers the formats Immich * preserved by `withMimeExtension`.
* commonly serves; obscure RAW types are expected to fall through to the
* filename fallback (which usually has a correct extension).
*/ */
private mimeToExt (mime: string | undefined): string { private mimeToExt (mime: string | undefined): string {
if (!mime) return '' if (!mime) return ''
@@ -187,6 +185,25 @@ class Render {
return map[mime] || '' return map[mime] || ''
} }
/**
* Append the MIME-derived extension to `filename` if it isn't already
* present (case-insensitive). Returns the filename unchanged when the
* MIME isn't in our map. Aliases that share a MIME type (`.jpg`/`.jpeg`,
* `.tif`/`.tiff`) are accepted as already-present so we don't produce
* `IMG.jpeg.jpg` for an `image/jpeg` asset.
*/
private withMimeExtension (filename: string, mime: string | undefined): string {
const ext = this.mimeToExt(mime)
if (!ext) return filename
const aliases: Record<string, string[]> = {
'.jpg': ['.jpg', '.jpeg'],
'.tiff': ['.tif', '.tiff']
}
const acceptable = aliases[ext] ?? [ext]
const lower = filename.toLowerCase()
return acceptable.some(a => lower.endsWith(a)) ? filename : filename + ext
}
/** /**
* Render a gallery page for a given SharedLink. * Render a gallery page for a given SharedLink.
* *
@@ -473,42 +490,32 @@ class Render {
* @param [servedSize] - what size Immich will actually serve. Defaults to * @param [servedSize] - what size Immich will actually serve. Defaults to
* ImageSize.original (the bytes match the original asset). * ImageSize.original (the bytes match the original asset).
*/ */
getFilename (asset: Asset, servedSize: ImageSize = ImageSize.original) { getFilename (asset: Asset, servedSize: ImageSize = ImageSize.original): string {
let extension: string let servedMime: string | undefined
if (servedSize === ImageSize.original) { if (servedSize === ImageSize.original) {
// Bytes match the original asset (image as-is, or video container from servedMime = asset.originalMimeType
// /video/playback). Prefer the MIME type since `originalFileName` may
// be missing an extension; fall back to the filename for MIME types
// not in our map (uncommon RAW formats etc.).
extension = this.mimeToExt(asset.originalMimeType) ||
asset.originalFileName?.match(/(\.\w+)$/)?.[1] || ''
} else if (servedSize === ImageSize.thumbnail) { } else if (servedSize === ImageSize.thumbnail) {
// Immich currently returns thumbnails as image/webp (verified against servedMime = 'image/webp'
// the live API). If Immich changes thumbnail format, update here.
extension = '.webp'
} else { } else {
// Preview. Immich currently returns image/jpeg for `?size=preview` servedMime = 'image/jpeg'
// (verified against the live API), including for video posters. If
// Immich changes preview format, update here.
extension = '.jpg'
} }
switch (getConfigOption('ipp.downloadedFilename')) { switch (getConfigOption('ipp.downloadedFilename')) {
case 1: case 1:
// Immich's ID number for this asset // Immich's ID number for this asset
return asset.id + extension return this.withMimeExtension(asset.id, servedMime)
case 2: case 2:
// A sanitised version of the ID number // A sanitised version of the ID number
return 'img_' + asset.id.slice(0, 8) + extension return this.withMimeExtension('img_' + asset.id.slice(0, 8), servedMime)
default: default: {
// By default, use the asset's original filename. When we're serving // By default, use the asset's original filename
// a downgraded preview/thumbnail, swap the extension so it matches const cleanName = asset.originalFileName ? sanitize(asset.originalFileName) : ''
// the actual bytes (e.g. photo.heic original → photo.jpg preview). if (!cleanName) return this.withMimeExtension(asset.id, servedMime)
if (!asset.originalFileName) return asset.id + extension const stem = servedSize === ImageSize.original
if (servedSize !== ImageSize.original) { ? cleanName
return asset.originalFileName.replace(/\.[^.]+$/, '') + extension : cleanName.replace(/\.[a-zA-Z0-9]{2,5}$/, '')
return this.withMimeExtension(stem, servedMime)
} }
return asset.originalFileName
} }
} }
} }