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

See #170: fixed several feed parsing issues

Browse source
This commit is contained in:
Eliot Berriot 2020-03-13 15:26:11 +01:00
parent b43d0f7009
commit a119a5d90a
No known key found for this signature in database
GPG key ID: 6B501DFD73514E14
4 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
api/funkwhale_api/audio/serializers.py
View file

@ -589,13 +589,21 @@ def get_cached_upload(uploads, expected_track_uuid):
return upload
class PermissiveIntegerField(serializers.IntegerField):
def to_internal_value(self, v):
try:
return super().to_internal_value(v)
except serializers.ValidationError:
return self.default
class RssFeedItemSerializer(serializers.Serializer):
id = serializers.CharField()
title = serializers.CharField()
rights = serializers.CharField(required=False, allow_blank=True)
itunes_season = serializers.IntegerField(required=False)
itunes_episode = serializers.IntegerField(required=False)
itunes_duration = ItunesDurationField()
itunes_episode = PermissiveIntegerField(required=False, default=None)
itunes_duration = ItunesDurationField(required=False)
links = serializers.ListField()
tags = serializers.ListField(required=False)
summary_detail = serializers.DictField(required=False)
@ -627,12 +635,12 @@ class RssFeedItemSerializer(serializers.Serializer):
if row.get("rel") != "enclosure":
continue
try:
size = int(row.get("length"))
size = int(row.get("length", 0)) or None
except (TypeError, ValueError):
raise serializers.ValidationError("Invalid size")
data["audio"] = {
"mimetype": row["type"],
"mimetype": common_utils.get_audio_mimetype(row["type"]),
"size": size,
"source": row["href"],
}
@ -703,7 +711,7 @@ class RssFeedItemSerializer(serializers.Serializer):
"source": validated_data["links"]["audio"]["source"],
"size": validated_data["links"]["audio"]["size"],
"mimetype": validated_data["links"]["audio"]["mimetype"],
"duration": validated_data["itunes_duration"],
"duration": validated_data.get("itunes_duration"),
"import_status": "finished",
"library": channel.library,
}