Fixes #3509: support for long titles.

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

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 89b76ee..590f265 100644 (file)
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -33,6 +33,11 @@ class EbookField(models.FileField):
         super(EbookField, self).__init__(*args, **kwargs)
         self.format_name = format_name
 
         super(EbookField, self).__init__(*args, **kwargs)
         self.format_name = format_name
 

+    def deconstruct(self):
+        name, path, args, kwargs = super(EbookField, self).deconstruct()
+        args.insert(0, self.format_name)
+        return name, path, args, kwargs
+

     @property
     def builder(self):
         """Finds a celery task suitable for the format of the field."""
     @property
     def builder(self):
         """Finds a celery task suitable for the format of the field."""


@@ -44,7 +49,7 @@ class EbookField(models.FileField):
         def has(model_instance):
             return bool(getattr(model_instance, self.attname, None))
         has.__doc__ = None
         def has(model_instance):
             return bool(getattr(model_instance, self.attname, None))
         has.__doc__ = None

-        has.__name__ = "has_%s" % self.attname
+        has.__name__ = str("has_%s" % self.attname)

         has.short_description = self.name
         has.boolean = True
         setattr(cls, 'has_%s' % self.attname, has)
         has.short_description = self.name
         has.boolean = True
         setattr(cls, 'has_%s' % self.attname, has)


@@ -77,7 +82,9 @@ class BuildEbook(Task):
 
     def run(self, obj, field_name):
         """Just run `build` on FieldFile, can't pass it directly to Celery."""
 
     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))
+        ret = self.build(getattr(obj, field_name))
+        obj.flush_includes()
+        return ret

 
     def build(self, fieldfile):
         book = fieldfile.instance
 
     def build(self, fieldfile):
         book = fieldfile.instance


@@ -144,7 +151,6 @@ class BuildHtml(BuildEbook):
         if html_output:
             meta_tags = list(book.tags.filter(
                 category__in=('author', 'epoch', 'genre', 'kind')))
         if html_output:
             meta_tags = list(book.tags.filter(
                 category__in=('author', 'epoch', 'genre', 'kind')))

-            book_tag = book.book_tag()

 
             lang = book.language
             lang = LANGUAGES_3TO2.get(lang, lang)
 
             lang = book.language
             lang = LANGUAGES_3TO2.get(lang, lang)


@@ -157,13 +163,6 @@ class BuildHtml(BuildEbook):
                 fieldfile.field.attname: fieldfile
             })
 
                 fieldfile.field.attname: fieldfile
             })
 

-            # get ancestor l-tags for adding to new fragments
-            ancestor_tags = []
-            p = book.parent
-            while p:
-                ancestor_tags.append(p.book_tag())
-                p = p.parent
-

             # Extract fragments
             closed_fragments, open_fragments = html.extract_fragments(fieldfile.path)
             for fragment in closed_fragments.values():
             # Extract fragments
             closed_fragments, open_fragments = html.extract_fragments(fieldfile.path)
             for fragment in closed_fragments.values():


@@ -206,11 +205,9 @@ class BuildHtml(BuildEbook):
                         book=book, text=text, short_text=short_text)
 
                 new_fragment.save()
                         book=book, text=text, short_text=short_text)
 
                 new_fragment.save()

-                new_fragment.tags = set(meta_tags + themes + [book_tag] + ancestor_tags)
-            book.fix_tree_tags()
-            book.html_built.send(sender=book)
+                new_fragment.tags = set(meta_tags + themes)
+            book.html_built.send(sender=type(self), instance=book)

             return True
             return True

-        book.fix_tree_tags()

         return False
 
 @BuildEbook.register('cover_thumb')
         return False
 
 @BuildEbook.register('cover_thumb')


@@ -240,19 +237,3 @@ class OverwritingFieldFile(FieldFile):
 
 class OverwritingFileField(models.FileField):
     attr_class = OverwritingFieldFile
 
 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"])