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

See #170: fixed fetch of channel track not working

Browse source
This commit is contained in:
Eliot Berriot 2020-04-08 11:47:34 +02:00
parent 1d37a2c819
commit e7622729a9
No known key found for this signature in database
GPG key ID: 6B501DFD73514E14
7 changed files with 100 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
api/funkwhale_api/federation/tasks.py
View file

@ -374,8 +374,8 @@ def fetch(fetch_obj):
except IndexError:
return error("missing_jsonld_type")
try:
serializer_class = fetch_obj.serializers[type]
model = serializer_class.Meta.model
serializer_classes = fetch_obj.serializers[type]
model = serializer_classes[0].Meta.model
except (KeyError, AttributeError):
fetch_obj.status = "skipped"
fetch_obj.fetch_date = timezone.now()
@ -388,8 +388,14 @@ def fetch(fetch_obj):
else:
existing = model.objects.filter(fid=id).first()
serializer = serializer_class(existing, data=payload)
if not serializer.is_valid():
serializer = None
for serializer_class in serializer_classes:
serializer = serializer_class(existing, data=payload)
if not serializer.is_valid():
continue
else:
break
if serializer.errors:
return error("validation", validation_errors=serializer.errors)
try:
obj = serializer.save()