Upgrade django-allauth.

[wolnelektury.git] / apps / catalogue / utils.py

diff --git a/apps/catalogue/utils.py b/apps/catalogue/utils.py
index fd74c94..a0e834c 100644 (file)
--- a/apps/catalogue/utils.py
+++ b/apps/catalogue/utils.py
@@ -43,31 +43,12 @@ def split_tags(tags, initial=None):
         result = {}
     else:
         result = initial
         result = {}
     else:
         result = initial

-    
+

     for tag in tags:
         result.setdefault(tag.category, []).append(tag)
     return result
 
 
     for tag in tags:
         result.setdefault(tag.category, []).append(tag)
     return result
 
 

-def get_dynamic_path(media, filename, ext=None, maxlen=100):
-    from fnpdjango.utils.text.slughifi import slughifi
-
-    # how to put related book's slug here?
-    if not ext:
-        # BookMedia case
-        ext = media.formats[media.type].ext
-    if media is None or not media.name:
-        name = slughifi(filename.split(".")[0])
-    else:
-        name = slughifi(media.name)
-    return 'book/%s/%s.%s' % (ext, name[:maxlen-len('book/%s/.%s' % (ext, ext))-4], ext)
-
-
-# TODO: why is this hard-coded ?
-def book_upload_path(ext=None, maxlen=100):
-    return lambda *args: get_dynamic_path(*args, ext=ext, maxlen=maxlen)
-
-

 class ExistingFile(UploadedFile):
 
     def __init__(self, path, *args, **kwargs):
 class ExistingFile(UploadedFile):
 
     def __init__(self, path, *args, **kwargs):


@@ -149,7 +130,7 @@ def remove_zip(zip_slug):
 class AttachmentHttpResponse(HttpResponse):
     """Response serving a file to be downloaded.
     """
 class AttachmentHttpResponse(HttpResponse):
     """Response serving a file to be downloaded.
     """

-    def __init__ (self, file_path, file_name, mimetype):
+    def __init__(self, file_path, file_name, mimetype):

         super(AttachmentHttpResponse, self).__init__(mimetype=mimetype)
         self['Content-Disposition'] = 'attachment; filename=%s' % file_name
         self.file_path = file_path
         super(AttachmentHttpResponse, self).__init__(mimetype=mimetype)
         self['Content-Disposition'] = 'attachment; filename=%s' % file_name
         self.file_path = file_path


@@ -163,15 +144,15 @@ class MultiQuerySet(object):
     def __init__(self, *args, **kwargs):
         self.querysets = args
         self._count = None
     def __init__(self, *args, **kwargs):
         self.querysets = args
         self._count = None

-    
+

     def count(self):
         if not self._count:
             self._count = sum(len(qs) for qs in self.querysets)
         return self._count
     def count(self):
         if not self._count:
             self._count = sum(len(qs) for qs in self.querysets)
         return self._count

-    
+

     def __len__(self):
         return self.count()
     def __len__(self):
         return self.count()

-        
+

     def __getitem__(self, item):
         try:
             indices = (offset, stop, step) = item.indices(self.count())
     def __getitem__(self, item):
         try:
             indices = (offset, stop, step) = item.indices(self.count())


@@ -197,7 +178,7 @@ class SortedMultiQuerySet(MultiQuerySet):
         self.order_by = kwargs.pop('order_by', None)
         self.sortfn = kwargs.pop('sortfn', None)
         if self.order_by is not None:
         self.order_by = kwargs.pop('order_by', None)
         self.sortfn = kwargs.pop('sortfn', None)
         if self.order_by is not None:

-            self.sortfn = lambda a, b: cmp(getattr(a, self.order_by), 
+            self.sortfn = lambda a, b: cmp(getattr(a, self.order_by),

                                            getattr(b, self.order_by))
         super(SortedMultiQuerySet, self).__init__(*args, **kwargs)
 
                                            getattr(b, self.order_by))
         super(SortedMultiQuerySet, self).__init__(*args, **kwargs)
 


@@ -215,27 +196,30 @@ class SortedMultiQuerySet(MultiQuerySet):
 
         while len(items) < total_len:
             candidate = None
 
         while len(items) < total_len:
             candidate = None

+            candidate_i = None

             for i in i_s:
                 def get_next():
                     return self.querysets[i][sort_heads[i]]
                 try:
                     if candidate is None:
                         candidate = get_next()
             for i in i_s:
                 def get_next():
                     return self.querysets[i][sort_heads[i]]
                 try:
                     if candidate is None:
                         candidate = get_next()

+                        candidate_i = i

                     else:
                         competitor = get_next()
                         if self.sortfn(candidate, competitor) > 0:
                             candidate = competitor
                     else:
                         competitor = get_next()
                         if self.sortfn(candidate, competitor) > 0:
                             candidate = competitor

+                            candidate_i = i

                 except IndexError:
                     continue # continue next sort_head
                 except IndexError:
                     continue # continue next sort_head

-                sort_heads[i] += 1

             # we have no more elements:
             if candidate is None:
                 break
             # we have no more elements:
             if candidate is None:
                 break

+            sort_heads[candidate_i] += 1

             if skipped < offset:
                 skipped += 1
                 continue # continue next item
             items.append(candidate)
             if skipped < offset:
                 skipped += 1
                 continue # continue next item
             items.append(candidate)

-        
+

         return items
 
 
         return items