graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-03 20:53:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix correctFilename extが.から始まる場合も考慮する

Browse source
This commit is contained in:
tamaina 2023-03-06 01:17:13 +00:00
parent 824398509d
commit 87d0f56dc7
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/misc/correct-filename.ts
View file

@ -1,7 +1,7 @@
// 与えられた拡張子とファイル名が一致しているかどうかを確認し、
// 一致していない場合は拡張子を付与して返す
export function correctFilename(filename: string, ext: string | null) {
const dotExt = ext ? `.${ext}` : '.unknown';
const dotExt = ext ? ext.startsWith('.') ? ext : `.${ext}` : '.unknown';
if (filename.endsWith(dotExt)) {
return filename;
}

3
packages/backend/test/unit/misc/others.ts
View file

@ -21,6 +21,9 @@ describe('misc:correct-filename', () => {
test('with same ext', () => {
expect(correctFilename('filename.jpg', 'jpg')).toBe('filename.jpg');
});
test('.ext', () => {
expect(correctFilename('filename.jpg', '.jpg')).toBe('filename.jpg');
});
test('with different ext', () => {
expect(correctFilename('filename.webp', 'jpg')).toBe('filename.webp.jpg');
});