Display fixes: shelf tags, search results.

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

diff --git a/apps/catalogue/utils.py b/apps/catalogue/utils.py
index fd74c94..91e782e 100644 (file)
--- a/apps/catalogue/utils.py
+++ b/apps/catalogue/utils.py
@@ -14,7 +14,6 @@ from django.http import HttpResponse
 from django.core.files.uploadedfile import UploadedFile
 from django.core.files.storage import DefaultStorage
 from django.utils.encoding import force_unicode
 from django.core.files.uploadedfile import UploadedFile
 from django.core.files.storage import DefaultStorage
 from django.utils.encoding import force_unicode

-from django.utils.translation import get_language

 from django.conf import settings
 from os import mkdir, path, unlink
 from errno import EEXIST, ENOENT
 from django.conf import settings
 from os import mkdir, path, unlink
 from errno import EEXIST, ENOENT


@@ -43,31 +42,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 +129,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,18 +143,18 @@ 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:
     def __getitem__(self, item):
         try:

-            indices = (offset, stop, step) = item.indices(self.count())
+            (offset, stop, step) = item.indices(self.count())

         except AttributeError:
             # it's not a slice - make it one
             return self[item : item + 1][0]
         except AttributeError:
             # it's not a slice - make it one
             return self[item : item + 1][0]


@@ -197,14 +177,14 @@ 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), 
-                                           getattr(b, self.order_by))
+            self.sortfn = lambda a, b: cmp((getattr(a, f) for f in self.order_by),
+                                           (getattr(b, f) for f in self.order_by))

         super(SortedMultiQuerySet, self).__init__(*args, **kwargs)
 
     def __getitem__(self, item):
         sort_heads = [0] * len(self.querysets)
         try:
         super(SortedMultiQuerySet, self).__init__(*args, **kwargs)
 
     def __getitem__(self, item):
         sort_heads = [0] * len(self.querysets)
         try:

-            indices = (offset, stop, step) = item.indices(self.count())
+            (offset, stop, step) = item.indices(self.count())

         except AttributeError:
             # it's not a slice - make it one
             return self[item : item + 1][0]
         except AttributeError:
             # it's not a slice - make it one
             return self[item : item + 1][0]


@@ -215,27 +195,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
 
 


@@ -365,10 +348,5 @@ This can sometimes occupy lots of memory, so trim it here a bit.
             or []
 
 
             or []
 
 

-def related_tag_name(tag_info, language=None):
-    return tag_info.get("name_%s" % (language or get_language()),
-        tag_info.get("name_%s" % settings.LANGUAGE_CODE, ""))
-
-

 def delete_from_cache_by_language(cache, key_template):
     cache.delete_many([key_template % lc for lc, ln in settings.LANGUAGES])
 def delete_from_cache_by_language(cache, key_template):
     cache.delete_many([key_template % lc for lc, ln in settings.LANGUAGES])