yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 01:39:18 +02:00
Code Issues Releases Wiki Activity

Fix #1165: Fixed broken mimetype detection during import

Browse source
This commit is contained in:
Agate 2020-06-21 16:21:16 +02:00
parent 08e9469163
commit 989f66315b
No known key found for this signature in database
GPG key ID: 6B501DFD73514E14
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
api/funkwhale_api/music/utils.py
View file

@ -18,12 +18,18 @@ def guess_mimetype(f):
b = min(1000000, f.size)
t = magic.from_buffer(f.read(b), mime=True)
if not t.startswith("audio/"):
# failure, we try guessing by extension
mt, _ = mimetypes.guess_type(f.name)
if mt:
t = mt
else:
t = EXTENSION_TO_MIMETYPE.get(f.name.split(".")[-1])
t = guess_mimetype_from_name(f.name)
return t
def guess_mimetype_from_name(name):
# failure, we try guessing by extension
mt, _ = mimetypes.guess_type(name)
if mt:
t = mt
else:
t = EXTENSION_TO_MIMETYPE.get(name.split(".")[-1])
return t