From 754bb92a68712d1382d7d23ebbfc87a83bf7fdfb Mon Sep 17 00:00:00 2001 From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sat, 13 Apr 2024 19:04:21 +0900 Subject: [PATCH] =?UTF-8?q?=E6=8B=A1=E5=BC=B5=E5=AD=90=E5=86=85=E3=81=AB?= =?UTF-8?q?=E3=83=89=E3=83=83=E3=83=88=E3=82=922=E3=81=A4=E3=81=BE?= =?UTF-8?q?=E3=81=A7=E8=A8=B1=E5=AE=B9=E3=81=99=E3=82=8B=E3=82=82=E3=81=AE?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=99=E3=82=8B=E4=BB=95=E6=A7=98?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/scripts/upload.ts | 32 +++++++++++++++---------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/packages/frontend/src/scripts/upload.ts b/packages/frontend/src/scripts/upload.ts index 8172deca77..9440e526fa 100644 --- a/packages/frontend/src/scripts/upload.ts +++ b/packages/frontend/src/scripts/upload.ts @@ -29,24 +29,30 @@ const mimeTypeMap = { 'image/png': 'png', } as const; -// tar.gzなど、拡張子内にドットが含まれるものはここに追加 +// tar.gzなど、拡張子内にドットを2つまで許容するものはここに追加 const specialExtensions = [ - 'tar.gz', - 'tar.bz2', - 'tar.xz', - 'tar.zst', - 'tar.lz', - 'tar.lz4', - 'tar.sz', - 'tar.z', + 'gz', + 'bz2', + 'xz', + 'zst', + 'lz', + 'lz4', + 'sz', + 'z', + 'zstd', ] as const; function getExtension(filename: string): string { - for (const ext of specialExtensions) { - if (filename.endsWith('.' + ext)) return '.' + ext; - } const parts = filename.split('.'); - return parts.length > 1 ? '.' + parts.pop()! : ''; + + if (parts.length <= 1) return ''; + + for (const ext of specialExtensions) { + if (parts[parts.length - 1] === ext && parts.length > 2) { + return '.' + parts[parts.length - 2] + '.' + parts[parts.length - 1]; + } + } + return '.' + parts.pop(); } export function uploadFile(