X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/dfd584e3b136d770bf56569030d10712a8722569..013ec8a416d4ff1ea3e1f2fa9ee2935623197ecd:/apps/catalogue/utils.py?ds=sidebyside

diff --git a/apps/catalogue/utils.py b/apps/catalogue/utils.py
index df7e438e4..bcc5a0b33 100644
--- 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,14 +36,21 @@ 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
 
 
@@ -155,7 +160,7 @@ class MultiQuerySet(object):
 
     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]
@@ -185,7 +190,7 @@ class SortedMultiQuerySet(MultiQuerySet):
     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]