Small refactor in messaging.

[wolnelektury.git] / src / catalogue / helpers.py

diff --git a/src/catalogue/helpers.py b/src/catalogue/helpers.py
index 4dd7bda..c4b9267 100644 (file)
--- a/src/catalogue/helpers.py
+++ b/src/catalogue/helpers.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
@@ -8,14 +7,14 @@ from django.core.cache import cache
 
 from .models import Tag, Book
 from os.path import getmtime
-import cPickle
+import pickle
 from collections import defaultdict
 
 
 BOOK_CATEGORIES = ('author', 'epoch', 'genre', 'kind')
 
 _COUNTERS = None
-_COUNTER_TIME = None
+_COUNTER_TIME = 0
 
 
 def get_top_level_related_tags(tags, categories=None):
@@ -28,10 +27,10 @@ def get_top_level_related_tags(tags, categories=None):
     global _COUNTERS, _COUNTER_TIME
     # First, check that we have a valid and recent version of the counters.
     if getmtime(settings.CATALOGUE_COUNTERS_FILE) > _COUNTER_TIME:
-        for i in xrange(10):
+        for i in range(10):
             try:
-                with open(settings.CATALOGUE_COUNTERS_FILE) as f:
-                    _COUNTERS = cPickle.load(f)
+                with open(settings.CATALOGUE_COUNTERS_FILE, 'rb') as f:
+                    _COUNTERS = pickle.load(f)
             except (EOFError, ValueError):
                 if i < 9:
                     continue
@@ -78,7 +77,7 @@ def update_counters():
             count_for_book(child, count_by_combination, combs_for_child)
 
     count_by_combination = defaultdict(lambda: 0)
-    for b in Book.objects.filter(parent=None):
+    for b in Book.objects.filter(findable=True, parent=None):
         count_for_book(b, count_by_combination)
 
     next_combinations = defaultdict(set)
@@ -95,14 +94,14 @@ def update_counters():
         "next": dict(next_combinations),
     }
 
-    with open(settings.CATALOGUE_COUNTERS_FILE, 'w') as f:
-        cPickle.dump(counters, f)
+    with open(settings.CATALOGUE_COUNTERS_FILE, 'wb') as f:
+        pickle.dump(counters, f)
 
 
 def get_audiobook_tags():
     audiobook_tag_ids = cache.get('audiobook_tags')
     if audiobook_tag_ids is None:
-        books_with_audiobook = Book.objects.filter(media__type__in=('mp3', 'ogg'))\
+        books_with_audiobook = Book.objects.filter(findable=True, media__type__in=('mp3', 'ogg'))\
             .distinct().values_list('pk', flat=True)
         audiobook_tag_ids = Tag.objects.filter(
             items__content_type=ContentType.objects.get_for_model(Book),