almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Factor out MIME type detection

Browse source 
Factor out the MIME type detection logic, so that we can use it both in
Qubes and containers.
This commit is contained in:
Alex Pyrgiotis 2023-08-03 17:34:24 +03:00 committed by deeplow
parent 03df60db5f
commit 6736fb0153
No known key found for this signature in database
GPG key ID: 577982871529A52A
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dangerzone/conversion/doc_to_pixels.py
View file

@ -134,11 +134,7 @@ class DocumentToPixels(DangerzoneConverter):
} }
# Detect MIME type # Detect MIME type
try: mime_type = self.detect_mime_type("/tmp/input_file")
mime = magic.Magic(mime=True)
mime_type = mime.from_file("/tmp/input_file")
except TypeError:
mime_type = magic.detect_from_filename("/tmp/input_file").mime_type
# Validate MIME type # Validate MIME type
if mime_type not in conversions: if mime_type not in conversions:
@ -147,7 +143,7 @@ class DocumentToPixels(DangerzoneConverter):
# Temporary fix for the HWPX format # Temporary fix for the HWPX format
# Should be removed after new release of `file' (current release 5.44) # Should be removed after new release of `file' (current release 5.44)
if mime_type == "application/zip": if mime_type == "application/zip":
file_type = magic.from_file("/tmp/input_file") file_type = self.detect_mime_type("/tmp/input_file")
hwpx_file_type = 'Zip data (MIME type "application/hwp+zip"?)' hwpx_file_type = 'Zip data (MIME type "application/hwp+zip"?)'
if file_type == hwpx_file_type: if file_type == hwpx_file_type:
mime_type = "application/x-hwp+zip" mime_type = "application/x-hwp+zip"
@ -342,6 +338,19 @@ class DocumentToPixels(DangerzoneConverter):
timeout=5, timeout=5,
) )
def detect_mime_type(self, path: str) -> str:
"""Detect MIME types in a platform-agnostic type.
Detect the MIME type of a file, either on Qubes or container platforms.
"""
try:
mime = magic.Magic(mime=True)
mime_type = mime.from_file("/tmp/input_file")
except TypeError:
mime_type = magic.detect_from_filename("/tmp/input_file").mime_type
return mime_type
async def main() -> int: async def main() -> int:
converter = DocumentToPixels() converter = DocumentToPixels()