Updated to the latest rosarior/django-sending repository changeset

3rd_party_apps/sendfile/backends/simple.py

@@ -1,6 +1,56 @@
-from django.core.servers.basehttp import FileWrapper
-from django.http import HttpResponse
+import os
+import stat
+import re
+from email.Utils import parsedate_tz, mktime_tz
+
+from django.core.files.base import File
+from django.http import HttpResponse, HttpResponseNotModified
+from django.utils.http import http_date
+
+def sendfile(request, filename, **kwargs):
+    # Respect the If-Modified-Since header.
+    statobj = os.stat(filename)
+    mimetype = kwargs.get('mimetype', 'application/octet-stream')
+
+    if not was_modified_since(request.META.get('HTTP_IF_MODIFIED_SINCE'),
+                              statobj[stat.ST_MTIME], statobj[stat.ST_SIZE]):
+        return HttpResponseNotModified(mimetype=mimetype)
+    
+    
+    response = HttpResponse(File(file(filename, 'rb')))
+
+    response["Last-Modified"] = http_date(statobj[stat.ST_MTIME])
+    return response
+    
+def was_modified_since(header=None, mtime=0, size=0):
+    """
+    Was something modified since the user last downloaded it?
+
+    header
+      This is the value of the If-Modified-Since header.  If this is None,
+      I'll just return True.
+
+    mtime
+      This is the modification time of the item we're talking about.
+
+    size
+      This is the size of the item we're talking about.
+    """
+    try:
+        if header is None:
+            raise ValueError
+        matches = re.match(r"^([^;]+)(; length=([0-9]+))?$", header,
+                           re.IGNORECASE)
+        header_date = parsedate_tz(matches.group(1))
+        if header_date is None:
+            raise ValueError
+        header_mtime = mktime_tz(header_date)
+        header_len = matches.group(3)
+        if header_len and int(header_len) != size:
+            raise ValueError
+        if mtime > header_mtime:
+            raise ValueError
+    except (AttributeError, ValueError, OverflowError):
+        return True
+    return False
 
-def sendfile(request, filename):
-    wrapper = FileWrapper(file(filename))
-    return HttpResponse(wrapper)