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

Fix #204: missing dot when downloading file

This commit is contained in:
Eliot Berriot 2018-05-15 19:01:49 +02:00
parent 8d2529f4f7
commit 6e168a54ec
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,7 +467,7 @@ class TrackFile(models.Model):
@property @property
def filename(self): def filename(self):
return '{}{}'.format( return '{}.{}'.format(
self.track.full_name, self.track.full_name,
self.extension) self.extension)

5
api/funkwhale_api/music/views.py
View File

@ -275,7 +275,10 @@ def handle_serve(track_file):
file_path = get_file_path(audio_file) file_path = get_file_path(audio_file)
elif f.source and f.source.startswith('file://'): elif f.source and f.source.startswith('file://'):
file_path = get_file_path(f.source.replace('file://', '', 1)) file_path = get_file_path(f.source.replace('file://', '', 1))
response = Response() if mt:
response = Response(content_type=mt)
else:
response = Response()
filename = f.filename filename = f.filename
mapping = { mapping = {
'nginx': 'X-Accel-Redirect', 'nginx': 'X-Accel-Redirect',

8
api/tests/music/test_models.py
View File

@ -77,3 +77,11 @@ def test_audio_track_mime_type(extention, mimetype, factories):
tf = factories['music.TrackFile'](audio_file__from_path=path) tf = factories['music.TrackFile'](audio_file__from_path=path)
assert tf.mimetype == mimetype assert tf.mimetype == mimetype
def test_track_file_file_name(factories):
name = 'test.mp3'
path = os.path.join(DATA_DIR, name)
tf = factories['music.TrackFile'](audio_file__from_path=path)
assert tf.filename == tf.track.full_name + '.mp3'

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

@ -0,0 +1 @@
Fixed missing dot when downloading file (#204)