views: avoid Document read by django, use serve_media with X-Accel instead

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index 16c896927418a869dfed25ba6a4405a9829c2c60..6357f19ebc939382a98e1e86dbbf486536535da6 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -61,4 +61,4 @@ $(document).ready(function(){
  {% endif %}
 {% endif %}
 {% endif %}
-{% endblock chat %}
\ No newline at end of file
+{% endblock chat %}

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 2c15236d9e5d7de2e5617238ab3debabd624b2b1..073481af3d21492e5cc89feab87ea0156c114378 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -12,7 +12,6 @@ $(document).ready(function(){
 </script>
 {% endblock extra_javascript %}
 
-
 {% block content %}
 
 <div id="module-set-left" style="width: 18%">

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 695600fcec2dbb4387331e127a99f72981e8651e..61ee19749d6587e812d3d30735a1404614492b2b 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -432,13 +432,14 @@ class DocumentView(CourseAccessMixin, DetailView):
         courses = get_courses(request.user)
         document = Document.objects.get(id=pk)
         if get_access(document, courses):
-            fsock = open(document.file.path.encode('utf8'), 'r')
-            mimetype = mimetypes.guess_type(document.file.path)[0]
-            extension = mimetypes.guess_extension(mimetype)
-            response = HttpResponse(fsock, mimetype=mimetype)
-            response['Content-Disposition'] = "attachment; filename=%s%s" % \
-                                             (document.title.encode('utf8'), extension)
-            return response
+            return serve_media(document.file.path.encode('utf8'), streaming=False) 
+            #fsock = open(document.file.path.encode('utf8'), 'r')
+            #mimetype = mimetypes.guess_type(document.file.path)[0]
+            #extension = mimetypes.guess_extension(mimetype)
+            #response = HttpResponse(fsock, mimetype=mimetype)
+            #response['Content-Disposition'] = "attachment; filename=%s%s" % \
+            #                                 (document.title.encode('utf8'), extension)
+            #return response
         else:
             return redirect('teleforma-home')
 
@@ -446,11 +447,12 @@ class DocumentView(CourseAccessMixin, DetailView):
         courses = get_courses(request.user)
         document = Document.objects.get(id=pk)
         if get_access(document, courses):
-            fsock = open(document.file.path.encode('utf8'), 'r')
-            mimetype = mimetypes.guess_type(document.file.path)[0]
-            extension = mimetypes.guess_extension(mimetype)
-            response = HttpResponse(fsock, mimetype=mimetype)
-            return response
+            return serve_media(document.file.path.encode('utf8'), streaming=True) 
+            #fsock = open(document.file.path.encode('utf8'), 'r')
+            #mimetype = mimetypes.guess_type(document.file.path)[0]
+            #extension = mimetypes.guess_extension(mimetype)
+            #response = HttpResponse(fsock, mimetype=mimetype)
+            #return response
         else:
             return redirect('teleforma-home')