# -*- coding: utf-8
+from django.conf import settings
from django.core.files import File
from django.core.urlresolvers import reverse
from django.db import models
student_pdf = models.FileField(
upload_to="catalogue/lesson/student_pdf",
null=True, blank=True, max_length=255, storage=bofh_storage)
+ weasy_pdf = models.FileField(
+ upload_to="catalogue/lesson/weasy",
+ null=True, blank=True, max_length=255, storage=bofh_storage)
class Meta:
ordering = ['section', 'level', 'order']
return 'catalogue_lesson', [self.slug]
@classmethod
- def publish(cls, infile, ignore_incomplete=False):
+ def publish(cls, infile, ignore_incomplete=False, repackage_level=False):
from librarian.parser import WLDocument
from django.core.files.base import ContentFile
wldoc = WLDocument(infile)
if lesson.type != 'project':
lesson.build_pdf(student=True)
lesson.build_package(student=True)
+ if repackage_level:
+ lesson.level.build_packages()
return lesson
def republish(self, repackage_level=True, attachments=None):
from librarian import IOFile
import os.path
+ from django.conf import settings
if attachments is None:
attachments = {}
for attachment in self.attachment_set.all():
- f = IOFile.from_filename(attachment.file.name)
- name = os.path.basename(attachment.file.name)
- attachments[name.decode('utf-8')] = f
- attachments.setdefault(name.replace(" ", "").decode('utf-8'), f)
+ full_name = os.path.join(settings.MEDIA_ROOT, attachment.file.name)
+ f = IOFile.from_filename(full_name)
+ attachments['%s.%s' % (attachment.slug, attachment.ext)] = f
infile = IOFile.from_filename(self.xml_file.path, attachments=attachments)
- Lesson.publish(infile)
- if repackage_level:
- self.level.build_packages()
+ Lesson.publish(infile, repackage_level=repackage_level)
def populate_dc(self):
from librarian.parser import WLDocument
pdf = PdfFormat(wldoc, teacher=True).build()
self.pdf.save("%s.pdf" % self.slug, File(open(pdf.get_filename())))
+ def build_weasy_pdf(self, **kwargs):
+ from .publish import WeasyFormat
+ wldoc = self.wldocument()
+ pdf = WeasyFormat(wldoc, media_root=settings.MEDIA_ROOT, **kwargs).build()
+ self.weasy_pdf.save("%s.pdf" % self.slug, File(open(pdf.get_filename())))
+
def add_to_zip(self, zipf, student=False, prefix=''):
pdf = self.student_pdf if student else self.pdf
if pdf:
return None
def requires_internet(self):
- return 'internet' in self.dc.get('requires', [])
+ return any(requirement in self.dc.get('requires', []) for requirement in ('internet', 'Internet'))
+
+
+def attachment_path(instance, filename):
+ return 'catalogue/attachment/%s/%s' % (instance.lesson.slug, filename)
class Attachment(models.Model):
slug = models.CharField(max_length=255)
ext = models.CharField(max_length=15)
lesson = models.ForeignKey(Lesson)
- file = models.FileField(upload_to="catalogue/attachment", storage=bofh_storage)
+ file = models.FileField(upload_to=attachment_path, storage=bofh_storage, max_length=255)
class Meta:
ordering = ['slug', 'ext']