tcsenpai/Zundler
1
0
Fork 0
mirror of https://github.com/tcsenpai/Zundler.git synced 2025-06-10 13:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add fall back when guessing mime type

Browse Source 
This fixes a bug that appears if the document is built on a system
without libmagic1. The python library python-magic uses it to guess the
mime type. We treat files with unknown mime type as `octet-stream`,
which causes them to be downloaded rather than displayed in the main
iframe. This results in lots of popups when opening the resulting HTML
file in a browser.

In this commit we add a fallback to the built-in library `mimetypes`
which gueses the mime type from the filename alone. This should work in
most cases but could still fail.

Close #2.
This commit is contained in:
Adrian Vollmer 2022-10-18 17:30:40 +02:00
parent 3958492feb
commit 31ff902098
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zundler/embed.py
View File

@ -120,7 +120,7 @@ def prepare_file(filename, before, after):
_, ext = os.path.splitext(filename) _, ext = os.path.splitext(filename)
ext = ext.lower()[1:] ext = ext.lower()[1:]
data = open(filename, 'rb').read() data = open(filename, 'rb').read()
mime_type = mime_type_from_bytes(data) mime_type = mime_type_from_bytes(filename, data)
base64encoded = False base64encoded = False
if ext == 'css': if ext == 'css':
@ -260,7 +260,7 @@ def embed_css_resources(css, filename):
mime_type = 'text/css' mime_type = 'text/css'
content = embed_css_resources(content, filename) content = embed_css_resources(content, filename)
else: else:
mime_type = mime_type_from_bytes(content) mime_type = mime_type_from_bytes(filename, content)
if not mime_type: if not mime_type:
logger.error('Unable to determine mime type: %s' % path) logger.error('Unable to determine mime type: %s' % path)
mime_type = 'application/octet-stream' mime_type = 'application/octet-stream'
@ -278,14 +278,28 @@ def embed_css_resources(css, filename):
return css return css
def mime_type_from_bytes(buffer): def mime_type_from_bytes(filename, buffer):
try: try:
import magic import magic
mime_type = magic.Magic(mime=True).from_buffer(buffer) mime_type = magic.Magic(mime=True).from_buffer(buffer)
except Exception as e: except Exception as e:
logger.error("Error while guessing mime type: " + str(buffer[:10]) + '...') logger.error(
"Error while guessing mime type (%s): %s" %
(filename, str(buffer[:10]) + '...')
)
logger.error(str(e)) logger.error(str(e))
return 'application/octet-stream'
# Fall back to builtin; can happen if libmagic1 is missing
import mimetypes
mime_type = mimetypes.guess_type(filename)[0]
if not mime_type:
logger.error(
"Unknown mime type (%s): %s" %
(filename, str(buffer[:10]) + '...')
)
mime_type = 'application/octet-stream'
return mime_type return mime_type