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

Don't download file as attachment for podcast

This commit is contained in:
Agate 2020-08-06 10:53:04 +02:00
parent 964ec53ffb
commit 547c4ea554
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/funkwhale_api/audio/serializers.py
View File

@ -829,7 +829,9 @@ def rss_serialize_item(upload):
"enclosure": [ "enclosure": [
{ {
# we enforce MP3, since it's the only format supported everywhere # we enforce MP3, since it's the only format supported everywhere
"url": federation_utils.full_url(upload.get_listen_url(to="mp3")), "url": federation_utils.full_url(
upload.get_listen_url(to="mp3", download=False)
),
"length": upload.size or 0, "length": upload.size or 0,
"type": "audio/mpeg", "type": "audio/mpeg",
} }

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

@ -890,10 +890,13 @@ class Upload(models.Model):
def listen_url(self): def listen_url(self):
return self.track.listen_url + "?upload={}".format(self.uuid) return self.track.listen_url + "?upload={}".format(self.uuid)
def get_listen_url(self, to=None): def get_listen_url(self, to=None, download=True):
url = self.listen_url url = self.listen_url
if to: if to:
url += "&to={}".format(to) url += "&to={}".format(to)
if not download:
url += "&download=false"
return url return url
@property @property

4
api/tests/audio/test_serializers.py
View File

@ -314,7 +314,9 @@ def test_rss_item_serializer(factories):
"link": [{"value": federation_utils.full_url(upload.track.get_absolute_url())}], "link": [{"value": federation_utils.full_url(upload.track.get_absolute_url())}],
"enclosure": [ "enclosure": [
{ {
"url": federation_utils.full_url(upload.get_listen_url("mp3")), "url": federation_utils.full_url(
upload.get_listen_url("mp3", download=False)
),
"length": upload.size, "length": upload.size,
"type": "audio/mpeg", "type": "audio/mpeg",
} }