X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/dfd584e3b136d770bf56569030d10712a8722569..ccf1868db403f603a87db2194a8ced22a05766f1:/apps/catalogue/fields.py?ds=sidebyside diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py index d5cec2e62..0ff2ca9ef 100644 --- a/apps/catalogue/fields.py +++ b/apps/catalogue/fields.py @@ -10,8 +10,11 @@ from catalogue import app_settings from catalogue.constants import LANGUAGES_3TO2 from catalogue.utils import remove_zip, truncate_html_words from celery.task import Task, task +from celery.utils.log import get_task_logger from waiter.utils import clear_cache +task_logger = get_task_logger(__name__) + class EbookFieldFile(FieldFile): """Represents contents of an ebook file field.""" @@ -82,7 +85,10 @@ class BuildEbook(Task): def run(self, obj, field_name): """Just run `build` on FieldFile, can't pass it directly to Celery.""" - return self.build(getattr(obj, field_name)) + task_logger.info("%s -> %s" % (obj.slug, field_name)) + ret = self.build(getattr(obj, field_name)) + obj.flush_includes() + return ret def build(self, fieldfile): book = fieldfile.instance @@ -204,7 +210,7 @@ class BuildHtml(BuildEbook): new_fragment.save() new_fragment.tags = set(meta_tags + themes) - book.html_built.send(sender=book) + book.html_built.send(sender=type(self), instance=book) return True return False @@ -235,19 +241,3 @@ class OverwritingFieldFile(FieldFile): class OverwritingFileField(models.FileField): attr_class = OverwritingFieldFile - - -try: - # check for south - from south.modelsinspector import add_introspection_rules -except ImportError: - pass -else: - add_introspection_rules([ - ( - [EbookField], - [], - {'format_name': ('format_name', {})} - ) - ], ["^catalogue\.fields\.EbookField"]) - add_introspection_rules([], ["^catalogue\.fields\.OverwritingFileField"])