Add feature to download all of your pictures as a user

core/views/files.py

@@ -24,6 +24,7 @@
 
 # This file contains all the views that concern the page model
 from django.shortcuts import redirect, get_object_or_404
+from django.utils.http import http_date
 from django.views.generic import ListView, DetailView, TemplateView
 from django.views.generic.edit import UpdateView, FormMixin, DeleteView
 from django.views.generic.detail import SingleObjectMixin
@@ -68,6 +69,7 @@ def send_file(request, file_id, file_class=SithFile, file_attr="file"):
     with open(filepath.encode("utf-8"), "rb") as filename:
         wrapper = FileWrapper(filename)
         response = HttpResponse(wrapper, content_type=f.mime_type)
+        response["Last-Modified"] = http_date(f.date.timestamp())
         response["Content-Length"] = os.path.getsize(filepath.encode("utf-8"))
         response["Content-Disposition"] = ('inline; filename="%s"' % f.name).encode(
             "utf-8"

core/views/user.py

@@ -48,6 +48,7 @@ from django.views.generic.dates import YearMixin, MonthMixin
 
 from datetime import timedelta, date
 import logging
+from api.views.sas import all_pictures_of_user
 
 from core.views import (
     CanViewMixin,
@@ -325,19 +326,15 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
         kwargs = super(UserPicturesView, self).get_context_data(**kwargs)
         kwargs["albums"] = []
         kwargs["pictures"] = {}
-        picture_qs = (
-            self.object.pictures.exclude(picture=None)
-            .order_by("-picture__parent__date", "id")
-            .select_related("picture__parent")
-        )
+        picture_qs = all_pictures_of_user(self.object)
         last_album = None
-        for pict_relation in picture_qs:
-            album = pict_relation.picture.parent
+        for picture in picture_qs:
+            album = picture.parent
             if album.id != last_album:
                 kwargs["albums"].append(album)
                 kwargs["pictures"][album.id] = []
                 last_album = album.id
-            kwargs["pictures"][album.id].append(pict_relation.picture)
+            kwargs["pictures"][album.id].append(picture)
         return kwargs