kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-05 18:50:09 +02:00
Code Activity

Fix multiple errors in get_mime_type

Browse Source 
Closes #111
This commit is contained in:
Ciaran Gultnieks 2015-08-13 19:16:28 +02:00
parent 576135ff8f
commit 47032cb4e9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fdroidserver/common.py
View File

@ -1452,23 +1452,25 @@ def get_mime_type(path):
libmagic. Hence this function with the following hacks: libmagic. Hence this function with the following hacks:
''' '''
ms = None
try: try:
import magic import magic
ms = None
try: try:
ms = magic.open(magic.MIME_TYPE) ms = magic.open(magic.MIME_TYPE)
ms.load() ms.load()
return magic.from_file(path, mime=True) result = magic.from_file(path, mime=True)
except AttributeError: except AttributeError:
return ms.file(path) result = ms.file(path)
if ms is not None:
ms.close()
except UnicodeError: except UnicodeError:
logging.warn('Found malformed magic number at %s' % path) logging.warn('Found malformed magic number at %s' % path)
result = None
except ImportError: except ImportError:
import mimetypes import mimetypes
mimetypes.init() mimetypes.init()
return mimetypes.guess_type(path, strict=False) result = mimetypes.guess_type(path, strict=False)
if ms is not None:
ms.close()
return result
# Scan the source code in the given directory (and all subdirectories) # Scan the source code in the given directory (and all subdirectories)