diff --git a/facefusion/choices.py b/facefusion/choices.py index 3f446e7..9a448f8 100755 --- a/facefusion/choices.py +++ b/facefusion/choices.py @@ -45,7 +45,6 @@ image_type_set : ImageTypeSet =\ { 'bmp': 'image/bmp', 'jpg': 'image/jpeg', - 'jpeg': 'image/jpeg', 'png': 'image/png', 'webp': 'image/webp' } diff --git a/facefusion/filesystem.py b/facefusion/filesystem.py index 901e7c8..afa4f31 100644 --- a/facefusion/filesystem.py +++ b/facefusion/filesystem.py @@ -32,6 +32,8 @@ def get_file_format(file_path : str) -> Optional[str]: file_extension = get_file_extension(file_path) if file_extension: + if file_extension == '.jpeg': + return 'jpg' return file_extension.lower().lstrip('.') return None diff --git a/facefusion/typing.py b/facefusion/typing.py index a44add2..1c7977f 100755 --- a/facefusion/typing.py +++ b/facefusion/typing.py @@ -110,7 +110,7 @@ FaceMaskRegion = Literal['skin', 'left-eyebrow', 'right-eyebrow', 'left-eye', 'r FaceMaskRegionSet = Dict[FaceMaskRegion, int] 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'] TempFrameFormat = Literal['bmp', 'jpg', 'png'] AudioTypeSet = Dict[AudioFormat, str] diff --git a/tests/test_filesystem.py b/tests/test_filesystem.py index 3c84952..f12c9aa 100644 --- a/tests/test_filesystem.py +++ b/tests/test_filesystem.py @@ -30,6 +30,7 @@ def test_get_file_extension() -> None: def test_get_file_format() -> None: 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('invalid') is None