Using cache middleware instead of various caching micro-strategies,

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

diff --git a/apps/catalogue/utils.py b/apps/catalogue/utils.py
index fd74c94..bcc5a0b 100644 (file)
--- a/apps/catalogue/utils.py
+++ b/apps/catalogue/utils.py
@@ -2,8 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from __future__ import with_statement
-
+from collections import defaultdict
 import hashlib
 import random
 import re
@@ -14,7 +13,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.utils.translation import get_language
 from django.conf import settings
 from os import mkdir, path, unlink
 from errno import EEXIST, ENOENT
@@ -38,36 +36,24 @@ def get_random_hash(seed):
     return urlsafe_b64encode(sha_digest).replace('=', '').replace('_', '-').lower()
 
 
-def split_tags(tags, initial=None):
-    if initial is None:
-        result = {}
+def split_tags(*tag_lists):
+    if len(tag_lists) == 1:
+        result = defaultdict(list)
+        for tag in tag_lists[0]:
+            result[tag.category].append(tag)
     else:
-        result = initial
-    
-    for tag in tags:
-        result.setdefault(tag.category, []).append(tag)
+        result = defaultdict(dict)
+        for tag_list in tag_lists:
+            for tag in tag_list:
+                try:
+                    result[tag.category][tag.pk].count += tag.count
+                except KeyError:
+                    result[tag.category][tag.pk] = tag
+        for k, v in result.items():
+            result[k] = sorted(v.values(), key=lambda tag: tag.sort_key)
     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):
@@ -149,7 +135,7 @@ def remove_zip(zip_slug):
 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
@@ -163,18 +149,18 @@ class MultiQuerySet(object):
     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 __len__(self):
         return self.count()
-        
+
     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]
@@ -197,14 +183,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.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:
-            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]
@@ -215,27 +201,30 @@ class SortedMultiQuerySet(MultiQuerySet):
 
         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()
+                        candidate_i = i
                     else:
                         competitor = get_next()
                         if self.sortfn(candidate, competitor) > 0:
                             candidate = competitor
+                            candidate_i = i
                 except IndexError:
                     continue # continue next sort_head
-                sort_heads[i] += 1
             # 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)
-        
+
         return items
 
 
@@ -365,10 +354,5 @@ This can sometimes occupy lots of memory, so trim it here a bit.
             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])