MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #857: Fix broken upload for specific files when using S3 storage

This commit is contained in:
Eliot Berriot 2019-06-13 11:05:28 +02:00
parent d52e804a3c
commit 0a25243e25
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/music/utils.py
View File

@ -12,7 +12,7 @@ def guess_mimetype(f):
t = magic.from_buffer(f.read(b), mime=True) t = magic.from_buffer(f.read(b), mime=True)
if not t.startswith("audio/"): if not t.startswith("audio/"):
# failure, we try guessing by extension # failure, we try guessing by extension
mt, _ = mimetypes.guess_type(f.path) mt, _ = mimetypes.guess_type(f.name)
if mt: if mt:
t = mt t = mt
return t return t

9
api/tests/music/test_utils.py
View File

@ -36,3 +36,12 @@ def test_get_audio_file_data(name, expected):
result = utils.get_audio_file_data(f) result = utils.get_audio_file_data(f)
assert result == expected assert result == expected
def test_guess_mimetype_dont_crash_with_s3(factories, mocker, settings):
"""See #857"""
settings.DEFAULT_FILE_STORAGE = "funkwhale_api.common.storage.ASCIIS3Boto3Storage"
mocker.patch("magic.from_buffer", return_value="none")
f = factories["music.Upload"].build(audio_file__filename="test.mp3")
assert utils.guess_mimetype(f.audio_file) == "audio/mpeg"

1
changes/changelog.d/857.bugfix Normal file
View File

@ -0,0 +1 @@
Fix broken upload for specific files when using S3 storage (#857)