From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Tue, 21 Aug 2012 14:30:35 +0000 (+0200)
Subject: Can't pass FieldFile directly to Celery
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/3912237450eea1aa3575751c8ae5a9b696c77334?hp=be1db8462cee5313361b832b4ff48b633d6d811b

Can't pass FieldFile directly to Celery
---

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index fad697f44..0e02ff90f 100644
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -17,11 +17,11 @@ class EbookFieldFile(FieldFile):
 
     def build(self):
         """Build the ebook immediately."""
-        return self.field.builder(self)
+        return self.field.builder.build(self)
 
     def build_delay(self):
         """Builds the ebook in a delayed task."""
-        return self.field.builder.delay(self)
+        return self.field.builder.delay(self.instance, self.field.attname)
 
 
 class EbookField(models.FileField):
@@ -74,7 +74,11 @@ class BuildEbook(Task):
         """
         return getattr(wldoc, "as_%s" % fieldfile.field.format_name)()
 
-    def run(self, fieldfile):
+    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))
+
+    def build(self, fieldfile):
         book = fieldfile.instance
         out = self.transform(book.wldocument(), fieldfile)
         fieldfile.save(None, File(open(out.get_filename())), save=False)
@@ -103,15 +107,15 @@ class BuildPdf(BuildEbook):
     def transform(wldoc, fieldfile):
         return wldoc.as_pdf(morefloats=settings.LIBRARIAN_PDF_MOREFLOATS)
 
-    def run(self, fieldfile):
-        BuildEbook.run(self, fieldfile)
+    def build(self, fieldfile):
+        BuildEbook.build(self, fieldfile)
         clear_cache(fieldfile.instance.slug)
 
 
 @BuildEbook.register('html')
 @task(ignore_result=True)
 class BuildHtml(BuildEbook):
-    def run(self, fieldfile):
+    def build(self, fieldfile):
         from django.core.files.base import ContentFile
         from slughifi import slughifi
         from sortify import sortify