PapaTutuWawa/etesync-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Chunk serialization: support not passing chunk content if exists.

Browse Source
This commit is contained in:
Tom Hacohen 2020-12-16 15:04:00 +02:00
parent 7ae172e44e
commit 3b4ba75930
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django_etebase/serializers.py
View File

@ -37,15 +37,14 @@ def process_revisions_for_item(item, revision_data):
for chunk in chunks: for chunk in chunks:
uid = chunk[0] uid = chunk[0]
chunk_obj = models.CollectionItemChunk.objects.filter(uid=uid).first() chunk_obj = models.CollectionItemChunk.objects.filter(uid=uid).first()
if len(chunk) > 1: content = chunk[1] if len(chunk) > 1 else None
content = chunk[1]
# If the chunk already exists we assume it's fine. Otherwise, we upload it. # If the chunk already exists we assume it's fine. Otherwise, we upload it.
if chunk_obj is None: if chunk_obj is None:
if content is not None:
chunk_obj = models.CollectionItemChunk(uid=uid, collection=item.collection) chunk_obj = models.CollectionItemChunk(uid=uid, collection=item.collection)
chunk_obj.chunkFile.save("IGNORED", ContentFile(content)) chunk_obj.chunkFile.save("IGNORED", ContentFile(content))
chunk_obj.save() chunk_obj.save()
else: else:
if chunk_obj is None:
raise EtebaseValidationError("chunk_no_content", "Tried to create a new chunk without content") raise EtebaseValidationError("chunk_no_content", "Tried to create a new chunk without content")
chunks_objs.append(chunk_obj) chunks_objs.append(chunk_obj)
@ -122,9 +121,10 @@ class ChunksField(serializers.RelatedField):
return (obj.uid,) return (obj.uid,)
def to_internal_value(self, data): def to_internal_value(self, data):
if data[0] is None or data[1] is None: content = data[1] if len(data) > 1 else None
if data[0] is None:
raise EtebaseValidationError("no_null", "null is not allowed") raise EtebaseValidationError("no_null", "null is not allowed")
return (data[0], b64decode_or_bytes(data[1])) return (data[0], b64decode_or_bytes(content) if content is not None else None)
class BetterErrorsMixin: class BetterErrorsMixin: