Move attachmentDisposition to filename.ts

This commit is contained in:
Alan Grainger
2026-10-05 09:21:48 +13:00
parent f8b7776bc4
commit bbc23b6250
4 changed files with 11 additions and 12 deletions
+7
View File
@@ -103,6 +103,13 @@ export function downloadFilename (asset: Asset): string {
return getFilename(asset, resolveImageEndpoint(ImageSize.original, asset).servedSize)
}
/** Download Content-Disposition, RFC 5987-encoded so `,` and `;` can't split the header. */
export function attachmentDisposition (filename: string): string {
const encoded = encodeURIComponent(filename)
.replace(/['()*]/g, c => '%' + c.charCodeAt(0).toString(16).toUpperCase())
return `attachment; filename*=UTF-8''${encoded}`
}
/** Content-type without its parameters, or undefined if absent. */
export function responseMime (response: globalThis.Response): string | undefined {
return (response.headers.get('content-type') || '').split(';')[0].trim() || undefined
+1 -2
View File
@@ -7,12 +7,11 @@ import {
import { Response } from 'express-serve-static-core'
import { Asset, ImageSize, IncomingShareRequest, SharedLink } from '../types'
import { respondToInvalidRequest } from '../invalidRequestHandler'
import { getFilename, servedMimeFrom } from '../gallery/filename'
import { attachmentDisposition, getFilename, servedMimeFrom } from '../gallery/filename'
import { isVideoAsset, resolveDownloadEndpoint, resolveImageEndpoint } from '../gallery/sizing'
import { pipeline } from 'stream/promises'
import { readableFromWeb } from '../utils/webStream'
import { log } from '../utils/log'
import { attachmentDisposition } from './download'
/**
* Stream an asset from Immich back to the client.
+1 -9
View File
@@ -6,7 +6,7 @@ import archiver, { Archiver } from 'archiver'
import { sanitize } from '../utils/sanitize'
import { resolveDownloadEndpoint, ImageEndpoint } from '../gallery/sizing'
import { title } from '../share'
import { getFilename, responseMime, servedMimeFrom } from '../gallery/filename'
import { attachmentDisposition, getFilename, responseMime, servedMimeFrom } from '../gallery/filename'
import { readableFromWeb } from '../utils/webStream'
import { respondToInvalidRequest } from '../invalidRequestHandler'
@@ -238,14 +238,6 @@ function enrichFromHeaders (asset: Asset, response: globalThis.Response): Asset
}
}
export function attachmentDisposition (filename: string): string {
// encodeURI leaves `,` and `;` raw, which split the header: Chrome reads a
// comma as a second Content-Disposition and refuses the download.
const encoded = encodeURIComponent(filename)
.replace(/['()*]/g, c => '%' + c.charCodeAt(0).toString(16).toUpperCase())
return `attachment; filename*=UTF-8''${encoded}`
}
/**
* Extract a filename from a `Content-Disposition` header. Prefers the RFC 5987
* `filename*=UTF-8''...` form (percent-decoded) over the plain `filename=`.