Remove stale indexing bits.

[wolnelektury.git] / apps / catalogue / models / listeners.py

diff --git a/apps/catalogue/models/listeners.py b/apps/catalogue/models/listeners.py
index 9e9fcab..788957e 100644 (file)
--- a/apps/catalogue/models/listeners.py
+++ b/apps/catalogue/models/listeners.py
@@ -3,13 +3,17 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.conf import settings
+from django.core.cache import get_cache
 from django.db.models.signals import post_save, pre_delete, post_delete
 import django.dispatch
-from catalogue.models import Tag, BookMedia, Book, Fragment
+from catalogue.models import Tag, BookMedia, Book, Fragment, Collection
 from catalogue import tasks
 from newtagging.models import tags_updated
 
 
+permanent_cache = get_cache('permanent')
+
+
 def _tags_updated_handler(sender, affected_tags, **kwargs):
     # reset tag global counter
     # we want Tag.changed_at updated for API to know the tag was touched
@@ -40,19 +44,24 @@ def _post_save_handler(sender, instance, **kwargs):
     """ refresh all the short_html stuff on BookMedia update """
     if sender == BookMedia:
         instance.book.save()
+        permanent_cache.delete_many([
+            'catalogue.audiobook_list', 'catalogue.daisy_list'])
+    elif sender == Collection:
+        permanent_cache.delete('catalogue.collection:%s' % instance.slug)
 post_save.connect(_post_save_handler)
 
 
+def post_publish(sender, **kwargs):
+    permanent_cache.delete('catalogue.book_list')
+    permanent_cache.delete('catalogue.catalogue')
+Book.published.connect(post_publish)
+
+
 if not settings.NO_SEARCH_INDEX:
     @django.dispatch.receiver(post_delete, sender=Book)
     def _remove_book_from_index_handler(sender, instance, **kwargs):
         """ remove the book from search index, when it is deleted."""
         import search
-        search.JVM.attachCurrentThread()
         idx = search.Index()
-        idx.open(timeout=10000)  # 10 seconds timeout.
-        try:
-            idx.remove_book(instance)
-            idx.index_tags()
-        finally:
-            idx.close()
+        idx.remove_book(instance)
+        idx.index_tags()