Overdue fixes.

[edumed.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index 916c5b1..e20d58c 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -7,10 +7,10 @@ from curriculum.models import Level, Curriculum, CurriculumCourse
 
 class Section(models.Model):
     title = models.CharField(max_length=255, unique=True)
 
 class Section(models.Model):
     title = models.CharField(max_length=255, unique=True)

-    slug = models.SlugField(unique=True)
+    slug = models.SlugField(max_length=255, unique=True)

     order = models.IntegerField()
     xml_file = models.FileField(upload_to="catalogue/section/xml",
     order = models.IntegerField()
     xml_file = models.FileField(upload_to="catalogue/section/xml",

-        null=True, blank=True)
+        null=True, blank=True, max_length=255)

 
     class Meta:
         ordering = ['order']
 
     class Meta:
         ordering = ['order']


@@ -67,24 +67,24 @@ class Lesson(models.Model):
     section = models.ForeignKey(Section, null=True, blank=True)
     level = models.ForeignKey(Level)
     title = models.CharField(max_length=255)
     section = models.ForeignKey(Section, null=True, blank=True)
     level = models.ForeignKey(Level)
     title = models.CharField(max_length=255)

-    slug = models.SlugField(unique=True)
+    slug = models.SlugField(max_length=255, unique=True)

     type = models.CharField(max_length=15, db_index=True)
     order = models.IntegerField(db_index=True)
     dc = JSONField(default='{}')
     curriculum_courses = models.ManyToManyField(CurriculumCourse)
 
     xml_file = models.FileField(upload_to="catalogue/lesson/xml",
     type = models.CharField(max_length=15, db_index=True)
     order = models.IntegerField(db_index=True)
     dc = JSONField(default='{}')
     curriculum_courses = models.ManyToManyField(CurriculumCourse)
 
     xml_file = models.FileField(upload_to="catalogue/lesson/xml",

-        null=True, blank=True) # FIXME: slug in paths
+        null=True, blank=True, max_length=255)

     html_file = models.FileField(upload_to="catalogue/lesson/html",
     html_file = models.FileField(upload_to="catalogue/lesson/html",

-        null=True, blank=True)
+        null=True, blank=True, max_length=255)

     package = models.FileField(upload_to="catalogue/lesson/pack",
     package = models.FileField(upload_to="catalogue/lesson/pack",

-        null=True, blank=True)
+        null=True, blank=True, max_length=255)

     student_package = models.FileField(upload_to="catalogue/lesson/student_pack",
     student_package = models.FileField(upload_to="catalogue/lesson/student_pack",

-        null=True, blank=True)
+        null=True, blank=True, max_length=255)

     pdf = models.FileField(upload_to="catalogue/lesson/pdf",
     pdf = models.FileField(upload_to="catalogue/lesson/pdf",

-        null=True, blank=True)
+        null=True, blank=True, max_length=255)

     student_pdf = models.FileField(upload_to="catalogue/lesson/student_pdf",
     student_pdf = models.FileField(upload_to="catalogue/lesson/student_pdf",

-        null=True, blank=True)
+        null=True, blank=True, max_length=255)

 
     class Meta:
         ordering = ['section', 'level', 'order']
 
     class Meta:
         ordering = ['section', 'level', 'order']


@@ -110,25 +110,19 @@ class Lesson(models.Model):
         slug = wldoc.book_info.url.slug
         try:
             lesson = cls.objects.get(slug=slug)
         slug = wldoc.book_info.url.slug
         try:
             lesson = cls.objects.get(slug=slug)

+            lesson.attachment_set.all().delete()

         except cls.DoesNotExist:
             lesson = cls(slug=slug, order=0)
 
         except cls.DoesNotExist:
             lesson = cls(slug=slug, order=0)
 

-        lesson.attachment_set.all().delete()
-        for att_name, att_file in infile.attachments.items():
-            try:
-                slug, ext = att_name.rsplit('.', 1)
-            except ValueError:
-                slug, ext = att_name, ''
-            attachment = lesson.attachment_set.create(slug=slug, ext=ext)
-            attachment.file.save(att_name, ContentFile(att_file.get_string()))
-

         # Save XML file
         lesson.xml_file.save('%s.xml' % slug, ContentFile(xml), save=False)
         lesson.title = wldoc.book_info.title
 
         lesson.level = Level.objects.get(slug=wldoc.book_info.audience)
         lesson.populate_dc()
         # Save XML file
         lesson.xml_file.save('%s.xml' % slug, ContentFile(xml), save=False)
         lesson.title = wldoc.book_info.title
 
         lesson.level = Level.objects.get(slug=wldoc.book_info.audience)
         lesson.populate_dc()

-        lesson.build_html()
+        lesson.build_html(infile=infile)
+        lesson.build_pdf(infile=infile)
+        lesson.build_pdf(student=True, infile=infile)

         lesson.build_package()
         lesson.build_package(student=True)
         return lesson
         lesson.build_package()
         lesson.build_package(student=True)
         return lesson


@@ -150,20 +144,48 @@ class Lesson(models.Model):
                 courses.add(curr.course)
         self.curriculum_courses = courses
 
                 courses.add(curr.course)
         self.curriculum_courses = courses
 

-    def build_html(self):
+    def wldocument(self, infile=None):
+        from librarian import IOFile

         from librarian.parser import WLDocument
         from librarian.parser import WLDocument

-        wldoc = WLDocument.from_file(self.xml_file.path)
-        html = wldoc.as_html()
+        from .publish import OrmDocProvider
+
+        if infile is None:
+            infile = IOFile.from_filename(self.xml_file.path)
+            for att in self.attachment_set.all():
+                infile.attachments["%s.%s" % (att.slug, att.ext)] = \
+                    IOFile.from_filename(att.file.path)
+        return WLDocument(infile, provider=OrmDocProvider())
+
+    def build_html(self, infile=None):
+        from .publish import HtmlFormat
+        wldoc = self.wldocument(infile)
+        html = HtmlFormat(wldoc).build()

         self.html_file.save("%s.html" % self.slug,
             File(open(html.get_filename())))
 
         self.html_file.save("%s.html" % self.slug,
             File(open(html.get_filename())))
 

+    def build_pdf(self, student=False, infile=None):
+        from .publish import PdfFormat
+        wldoc = self.wldocument(infile)
+        if student:
+            pdf = PdfFormat(wldoc).build()
+            self.student_pdf.save("%s.pdf" % self.slug,
+                File(open(pdf.get_filename())))
+        else:
+            pdf = PdfFormat(wldoc, teacher=True).build()
+            self.pdf.save("%s.pdf" % self.slug,
+                File(open(pdf.get_filename())))
+

     def add_to_zip(self, zipf, student=False, prefix=''):
         zipf.write(self.xml_file.path,
             "%spliki-zrodlowe/%s.xml" % (prefix, self.slug))
         pdf = self.student_pdf if student else self.pdf
         if pdf:
     def add_to_zip(self, zipf, student=False, prefix=''):
         zipf.write(self.xml_file.path,
             "%spliki-zrodlowe/%s.xml" % (prefix, self.slug))
         pdf = self.student_pdf if student else self.pdf
         if pdf:

-            zipf.write(self.xml_file.path, 
+            zipf.write(pdf.path, 

                 "%s%s%s.pdf" % (prefix, self.slug, "_student" if student else ""))
                 "%s%s%s.pdf" % (prefix, self.slug, "_student" if student else ""))

+        for attachment in self.attachment_set.all():
+            zipf.write(attachment.file.path,
+                u"%smaterialy/%s.%s" % (prefix, attachment.slug, attachment.ext))
+            

         
 
     def build_package(self, student=False):
         
 
     def build_package(self, student=False):