X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/1cb8ffe0e48893c57524d964292a9d3a86f8f8b4..6ad215c7fe18f795e9f5e1670e17a61b7ebf78ca:/catalogue/models.py?ds=sidebyside diff --git a/catalogue/models.py b/catalogue/models.py index bae04ed..6d1b97a 100644 --- a/catalogue/models.py +++ b/catalogue/models.py @@ -4,6 +4,7 @@ from django.core.urlresolvers import reverse from django.db import models from jsonfield import JSONField from fnpdjango.storage import BofhFileSystemStorage + from curriculum.models import Level, Curriculum, CurriculumCourse import logging @@ -120,7 +121,7 @@ class Lesson(models.Model): 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) @@ -149,8 +150,23 @@ class Lesson(models.Model): 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(): + 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, repackage_level=repackage_level) + def populate_dc(self): from librarian.parser import WLDocument wldoc = WLDocument.from_file(self.xml_file.path) @@ -273,7 +289,7 @@ class Lesson(models.Model): 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')) class Attachment(models.Model):