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

Stoken: always return the stoken object, not the rev.

Browse Source
This commit is contained in:
Tom Hacohen 2020-10-13 13:37:05 +03:00
parent c7bd01b2d1
commit aa7b049b62
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
django_etebase/views.py
View File

@ -138,15 +138,14 @@ class BaseViewSet(viewsets.ModelViewSet):
for row in queryset: for row in queryset:
rowmaxid = getattr(row, 'max_stoken') or -1 rowmaxid = getattr(row, 'max_stoken') or -1
maxid = max(maxid, rowmaxid) maxid = max(maxid, rowmaxid)
new_stoken = (maxid >= 0) and Stoken.objects.get(id=maxid).uid new_stoken = (maxid >= 0) and Stoken.objects.get(id=maxid)
return new_stoken return new_stoken or None
def filter_by_stoken_and_limit(self, request, queryset): def filter_by_stoken_and_limit(self, request, queryset):
limit = int(request.GET.get('limit', 50)) limit = int(request.GET.get('limit', 50))
queryset, stoken_rev = self.filter_by_stoken(request, queryset) queryset, stoken_rev = self.filter_by_stoken(request, queryset)
stoken = stoken_rev.uid if stoken_rev is not None else None
result = list(queryset[:limit + 1]) result = list(queryset[:limit + 1])
if len(result) < limit + 1: if len(result) < limit + 1:
@ -155,9 +154,9 @@ class BaseViewSet(viewsets.ModelViewSet):
done = False done = False
result = result[:-1] result = result[:-1]
new_stoken = self.get_queryset_stoken(result) or stoken new_stoken_obj = self.get_queryset_stoken(result) or stoken_rev
return result, new_stoken, done return result, new_stoken_obj, done
# Change how our list works by default # Change how our list works by default
def list(self, request, collection_uid=None, *args, **kwargs): def list(self, request, collection_uid=None, *args, **kwargs):
@ -211,7 +210,8 @@ class CollectionViewSet(BaseViewSet):
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
queryset = self.get_queryset() queryset = self.get_queryset()
result, new_stoken, done = self.filter_by_stoken_and_limit(request, queryset) result, new_stoken_obj, done = self.filter_by_stoken_and_limit(request, queryset)
new_stoken = new_stoken_obj and new_stoken_obj.uid
serializer = self.get_serializer(result, many=True) serializer = self.get_serializer(result, many=True)
@ -278,7 +278,8 @@ class CollectionItemViewSet(BaseViewSet):
if not self.request.query_params.get('withCollection', False): if not self.request.query_params.get('withCollection', False):
queryset = queryset.filter(parent__isnull=True) queryset = queryset.filter(parent__isnull=True)
result, new_stoken, done = self.filter_by_stoken_and_limit(request, queryset) result, new_stoken_obj, done = self.filter_by_stoken_and_limit(request, queryset)
new_stoken = new_stoken_obj and new_stoken_obj.uid
serializer = self.get_serializer(result, many=True) serializer = self.get_serializer(result, many=True)
@ -342,8 +343,9 @@ class CollectionItemViewSet(BaseViewSet):
revs = CollectionItemRevision.objects.filter(uid__in=etags, current=True) revs = CollectionItemRevision.objects.filter(uid__in=etags, current=True)
queryset = queryset.filter(uid__in=uids).exclude(revisions__in=revs) queryset = queryset.filter(uid__in=uids).exclude(revisions__in=revs)
new_stoken = self.get_queryset_stoken(queryset) new_stoken_obj = self.get_queryset_stoken(queryset)
stoken = getattr(stoken_rev, 'uid', None) if stoken_rev is not None else None new_stoken = new_stoken_obj and new_stoken_obj.uid
stoken = stoken_rev and getattr(stoken_rev, 'uid', None)
new_stoken = new_stoken or stoken new_stoken = new_stoken or stoken
serializer = self.get_serializer(queryset, many=True) serializer = self.get_serializer(queryset, many=True)
@ -481,7 +483,8 @@ class CollectionMemberViewSet(BaseViewSet):
def list(self, request, collection_uid=None, *args, **kwargs): def list(self, request, collection_uid=None, *args, **kwargs):
queryset = self.get_queryset().order_by('id') queryset = self.get_queryset().order_by('id')
result, new_stoken, done = self.filter_by_stoken_and_limit(request, queryset) result, new_stoken_obj, done = self.filter_by_stoken_and_limit(request, queryset)
new_stoken = new_stoken_obj and new_stoken_obj.uid
serializer = self.get_serializer(result, many=True) serializer = self.get_serializer(result, many=True)
ret = { ret = {