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

Chunk download: use the new sendfile to serve files.

Browse Source
This commit is contained in:
Tom Hacohen 2020-12-14 16:40:08 +02:00
parent a19a982b1c
commit 9559a0fd35
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django_etebase/views.py
View File

@ -36,6 +36,7 @@ import nacl.signing
import nacl.secret import nacl.secret
import nacl.hash import nacl.hash
from .sendfile import sendfile
from .token_auth.models import AuthToken from .token_auth.models import AuthToken
from .drf_msgpack.parsers import MessagePackParser from .drf_msgpack.parsers import MessagePackParser
@ -456,19 +457,11 @@ class CollectionItemChunkViewSet(viewsets.ViewSet):
@action_decorator(detail=True, methods=["GET"]) @action_decorator(detail=True, methods=["GET"])
def download(self, request, collection_uid=None, collection_item_uid=None, uid=None, *args, **kwargs): def download(self, request, collection_uid=None, collection_item_uid=None, uid=None, *args, **kwargs):
import os
from django.views.static import serve
col = get_object_or_404(self.get_collection_queryset(), uid=collection_uid) col = get_object_or_404(self.get_collection_queryset(), uid=collection_uid)
# IGNORED FOR NOW: col_it = get_object_or_404(col.items, uid=collection_item_uid)
chunk = get_object_or_404(col.chunks, uid=uid) chunk = get_object_or_404(col.chunks, uid=uid)
filename = chunk.chunkFile.path filename = chunk.chunkFile.path
dirname = os.path.dirname(filename) return sendfile(request, filename)
basename = os.path.basename(filename)
# FIXME: DO NOT USE! Use django-send file or etc instead.
return serve(request, basename, dirname)
class CollectionMemberViewSet(BaseViewSet): class CollectionMemberViewSet(BaseViewSet):

4
etebase_server/settings.py
View File

@ -173,6 +173,10 @@ ETEBASE_API_AUTHENTICATORS = (
) )
ETEBASE_CREATE_USER_FUNC = "django_etebase.utils.create_user_blocked" ETEBASE_CREATE_USER_FUNC = "django_etebase.utils.create_user_blocked"
# Efficient file streaming (for large files)
SENDFILE_BACKEND = "django_etebase.sendfile.backends.simple"
SENDFILE_ROOT = MEDIA_URL
# Make an `etebase_server_settings` module available to override settings. # Make an `etebase_server_settings` module available to override settings.
try: try:
from etebase_server_settings import * from etebase_server_settings import *