jpeg is not a format

This commit is contained in:
henryruhs
2025-01-13 13:26:48 +01:00
parent 169d578a14
commit 9d9805a03b
4 changed files with 4 additions and 2 deletions

View File

@@ -45,7 +45,6 @@ image_type_set : ImageTypeSet =\
{ {
'bmp': 'image/bmp', 'bmp': 'image/bmp',
'jpg': 'image/jpeg', 'jpg': 'image/jpeg',
'jpeg': 'image/jpeg',
'png': 'image/png', 'png': 'image/png',
'webp': 'image/webp' 'webp': 'image/webp'
} }

View File

@@ -32,6 +32,8 @@ def get_file_format(file_path : str) -> Optional[str]:
file_extension = get_file_extension(file_path) file_extension = get_file_extension(file_path)
if file_extension: if file_extension:
if file_extension == '.jpeg':
return 'jpg'
return file_extension.lower().lstrip('.') return file_extension.lower().lstrip('.')
return None return None

View File

@@ -110,7 +110,7 @@ FaceMaskRegion = Literal['skin', 'left-eyebrow', 'right-eyebrow', 'left-eye', 'r
FaceMaskRegionSet = Dict[FaceMaskRegion, int] FaceMaskRegionSet = Dict[FaceMaskRegion, int]
AudioFormat = Literal['mp3', 'ogg', 'wav'] AudioFormat = Literal['mp3', 'ogg', 'wav']
ImageFormat = Literal['bmp', 'jpg', 'jpeg', 'png', 'webp'] ImageFormat = Literal['bmp', 'jpg', 'png', 'webp']
VideoFormat = Literal['avi', 'mkv', 'mov', 'mp4', 'webm'] VideoFormat = Literal['avi', 'mkv', 'mov', 'mp4', 'webm']
TempFrameFormat = Literal['bmp', 'jpg', 'png'] TempFrameFormat = Literal['bmp', 'jpg', 'png']
AudioTypeSet = Dict[AudioFormat, str] AudioTypeSet = Dict[AudioFormat, str]

View File

@@ -30,6 +30,7 @@ def test_get_file_extension() -> None:
def test_get_file_format() -> None: def test_get_file_format() -> None:
assert get_file_format('source.jpg') == 'jpg' assert get_file_format('source.jpg') == 'jpg'
assert get_file_format('source.jpeg') == 'jpg'
assert get_file_format('source.mp3') == 'mp3' assert get_file_format('source.mp3') == 'mp3'
assert get_file_format('invalid') is None assert get_file_format('invalid') is None