From c9afc413aa0e0195247c2583c42dfb53865399d6 Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Mon, 15 Dec 2014 15:05:44 +0100 Subject: [PATCH] Server: remove streaming capabilities for transcoded media --- timeside/server/utils.py | 1 - timeside/server/views.py | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/timeside/server/utils.py b/timeside/server/utils.py index d09f73b..ab911c4 100644 --- a/timeside/server/utils.py +++ b/timeside/server/utils.py @@ -7,4 +7,3 @@ TS_ENCODERS = timeside.core.processors(IEncoder) TS_ENCODERS_EXT = {encoder.file_extension(): encoder.id() for encoder in TS_ENCODERS if encoder.file_extension()} - diff --git a/timeside/server/views.py b/timeside/server/views.py index 624bfd6..f39bc7d 100644 --- a/timeside/server/views.py +++ b/timeside/server/views.py @@ -183,8 +183,8 @@ class ItemExport(DetailView): result.delete() return self.get(request, pk, extension) # Result and file exist --> OK - return HttpResponse(stream_from_file(result.file.path), - content_type=result.mime_type) + return StreamingHttpResponse(stream_from_file(result.file.path), + content_type=result.mime_type) except Result.DoesNotExist: # Result does not exist # the corresponding task has to be created and run @@ -211,10 +211,10 @@ class ItemExport(DetailView): selection.items.add(item) task, created = Task.objects.get_or_create(experience=experience, selection=selection) - task.save() - - # Run task in streaming mode - response = StreamingHttpResponse() - response['streaming_content'] = task.run(streaming=True) - response['content-type'] = mime_type - return response + task.run() + # TODO Run task in streaming mode + #response = StreamingHttpResponse(streaming_ + #response = StreamingHttpResponse(streaming_content=stream_from_task(task), + # content_type=mime_type) + # return response + return self.get(request, pk, extension) -- 2.39.5