from django.db import models, transaction
from django.template.loader import render_to_string
from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
from slughifi import slughifi
-
import apiclient
-from catalogue.helpers import cached_in_field
-from catalogue.models import BookPublishRecord, ChunkPublishRecord
+from catalogue.helpers import cached_in_field, GalleryMerger
+from catalogue.models import BookPublishRecord, ChunkPublishRecord, Project
from catalogue.signals import post_publish
from catalogue.tasks import refresh_instance, book_content_updated
-from catalogue.xml_tools import compile_text, split_xml
-import os
-import shutil
-import re
+from catalogue.xml_tools import compile_text, split_xml, wl2_to_wl1
+from cover.models import Image
+
class Book(models.Model):
""" A document edited on the wiki """
title = models.CharField(_('title'), max_length=255, db_index=True)
slug = models.SlugField(_('slug'), max_length=128, unique=True, db_index=True)
public = models.BooleanField(_('public'), default=True, db_index=True)
- gallery = models.CharField(_('scan gallery name'), max_length=255, blank=True)
+ gallery = models.CharField(u'materiały', max_length=255, blank=True)
+ project = models.ForeignKey(Project, null=True, blank=True)
- #wl_slug = models.CharField(_('title'), max_length=255, null=True, db_index=True, editable=False)
- parent = models.ForeignKey('self', null=True, blank=True, verbose_name=_('parent'), related_name="children", editable=False)
+ # wl_slug = models.CharField(_('title'), max_length=255, null=True, db_index=True, editable=False)
+ parent = models.ForeignKey(
+ 'self', null=True, blank=True, verbose_name=_('parent'), related_name="children", editable=False)
parent_number = models.IntegerField(_('parent number'), null=True, blank=True, db_index=True, editable=False)
+ for_cybernauts = models.BooleanField(_('for Cybernauts'), default=False)
+
# Cache
_short_html = models.TextField(null=True, blank=True, editable=False)
_single = models.NullBooleanField(editable=False, db_index=True)
_new_publishable = models.NullBooleanField(editable=False)
_published = models.NullBooleanField(editable=False)
_on_track = models.IntegerField(null=True, blank=True, db_index=True, editable=False)
- dc_slug = models.CharField(max_length=128, null=True, blank=True,
- editable=False, db_index=True)
+ dc_cover_image = models.ForeignKey(
+ Image, blank=True, null=True, db_index=True, on_delete=models.SET_NULL, editable=False)
+ dc_slug = models.CharField(max_length=128, null=True, blank=True, editable=False, db_index=True)
class NoTextError(BaseException):
pass
class Meta:
app_label = 'catalogue'
ordering = ['title', 'slug']
- verbose_name = _('book')
- verbose_name_plural = _('books')
-
+ verbose_name = u'moduł'
+ verbose_name_plural = u'moduły'
# Representing
# ============
@models.permalink
def get_absolute_url(self):
- return ("catalogue_book", [self.slug])
+ return "catalogue_book", [self.slug]
def correct_about(self):
return "http://%s%s" % (
@classmethod
@transaction.commit_on_success
- def create(cls, creator, text, *args, **kwargs):
- b = cls.objects.create(*args, **kwargs)
+ def create(cls, creator, text, commit_args=None, **kwargs):
+ b = cls.objects.create(**kwargs)
b.chunk_set.all().update(creator=creator)
- b[0].commit(text, author=creator)
+ b[0].commit(text, author=creator, **(commit_args or {}))
return b
def add(self, *args, **kwargs):
@classmethod
@transaction.commit_on_success
- def import_xml_text(cls, text=u'', previous_book=None,
- commit_args=None, **kwargs):
+ def import_xml_text(cls, text=u'', previous_book=None, commit_args=None, **kwargs):
"""Imports a book from XML, splitting it into chunks as necessary."""
texts = split_xml(text)
if previous_book:
for i in range(book_len - len(texts)):
texts.append((u'pusta część %d' % (i + 1), u''))
- i = 0
for i, (title, text) in enumerate(texts):
if not title:
title = u'część %d' % (i + 1)
return instance
def make_chunk_slug(self, proposed):
- """
+ """
Finds a chunk slug not yet used in the book.
"""
slugs = set(c.slug for c in self)
number += 1
assert not other.chunk_set.exists()
- self.append_gallery(other, len_other)
-
- other.delete()
-
-
- def append_gallery(self, other, len_other):
- if self.gallery is None:
- self.gallery = other.gallery
- return
- if other.gallery is None:
- return
-
- def get_prefix(name):
- m = re.match(r"^([0-9])-", name)
- if m:
- return int(m.groups()[0])
- return None
-
- def set_prefix(name, prefix, always=False):
- m = not always and re.match(r"^([0-9])-", name)
- return "%1d-%s" % (prefix, m and name[2:] or name)
-
- files = os.listdir(os.path.join(settings.MEDIA_ROOT,
- settings.IMAGE_DIR, self.gallery))
- files_other = os.listdir(os.path.join(settings.MEDIA_ROOT,
- settings.IMAGE_DIR, other.gallery))
-
- prefixes = {}
- renamed_files = {}
- renamed_files_other = {}
- last_pfx = -1
-
- # check if all elements of my files have a prefix
- files_prefixed = True
- for f in files:
- p = get_prefix(f)
- if p:
- if p > last_pfx: last_pfx = p
- else:
- files_prefixed = False
- break
-
- # if not, add a 0 prefix to them
- if not files_prefixed:
- prefixes[0] = 0
- for f in files:
- renamed_files[f] = set_prefix(f, 0, True)
-
- # two cases here - either all are prefixed or not.
- files_other_prefixed = True
- for f in files_other:
- pfx = get_prefix(f)
- if pfx is not None:
- if not pfx in prefixes:
- last_pfx += 1
- prefixes[pfx] = last_pfx
- renamed_files_other[f] = set_prefix(f, prefixes[pfx])
- else:
- # ops, not all files here were prefixed.
- files_other_prefixed = False
- break
-
- # just set a 1- prefix to all of them
- if not files_other_prefixed:
- for f in files_other:
- renamed_files_other[f] = set_prefix(f, 1, True)
-
- # finally, move / rename files.
- for frm, to in renamed_files.items():
- shutil.move(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, self.gallery, frm),
- os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, self.gallery, to))
- for frm, to in renamed_files_other.items():
- shutil.move(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, other.gallery, frm),
- os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, self.gallery, to))
+ gm = GalleryMerger(self.gallery, other.gallery)
+ self.gallery = gm.merge()
# and move the gallery starts
- num_files = len(files)
- for chunk in self[len(self) - len_other:]:
- chunk.gallery_start += num_files
- chunk.save()
-
+ if gm.was_merged:
+ for chunk in self[len(self) - len_other:]:
+ old_start = chunk.gallery_start or 1
+ chunk.gallery_start = old_start + gm.dest_size - gm.num_deleted
+ chunk.save()
+ other.delete()
@transaction.commit_on_success
def prepend_history(self, other):
def split(self):
"""Splits all the chunks into separate books."""
- self.title
for chunk in self:
- book = Book.objects.create(title=chunk.title, slug=chunk.slug,
- public=self.public, gallery=self.gallery)
+ book = Book.objects.create(title=chunk.title, slug=chunk.slug, public=self.public, gallery=self.gallery)
book[0].delete()
chunk.book = book
chunk.number = 1
def assert_publishable(self):
assert self.chunk_set.exists(), _('No chunks in the book.')
try:
- changes = self.get_current_changes(publishable=True)
+ changes = self.get_current_changes()
except self.NoTextError:
raise AssertionError(_('Not all chunks have publishable revisions.'))
- book_xml = self.materialize(changes=changes)
- from librarian.dcparser import BookInfo
from librarian import NoDublinCore, ParseError, ValidationError
try:
- bi = BookInfo.from_string(book_xml.encode('utf-8'), strict=True)
+ bi = self.wldocument(changes=changes, strict=True).book_info
+ if not bi.audience:
+ raise ValidationError('No audience specified')
+ if not bi.type:
+ raise ValidationError('No type specified')
except ParseError, e:
raise AssertionError(_('Invalid XML') + ': ' + unicode(e))
except NoDublinCore:
valid_about = self.correct_about()
assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about
+ def publishable_error(self):
+ try:
+ return self.assert_publishable()
+ except AssertionError, e:
+ return e
+
def hidden(self):
return self.slug.startswith('.')
def get_on_track(self):
if self.published:
return -1
- stages = [ch.stage.ordering if ch.stage is not None else 0
- for ch in self]
+ stages = [ch.stage.ordering if ch.stage is not None else 0 for ch in self]
if not len(stages):
return 0
return min(stages)
def book_info(self, publishable=True):
try:
- book_xml = self.materialize(publishable=publishable)
+ book_xml = self.wl1_xml(publishable=publishable)
except self.NoTextError:
pass
else:
from librarian.dcparser import BookInfo
from librarian import NoDublinCore, ParseError, ValidationError
try:
- return BookInfo.from_string(book_xml.encode('utf-8'))
+ return BookInfo.from_string(book_xml)
except (self.NoTextError, ParseError, NoDublinCore, ValidationError):
return None
def refresh_dc_cache(self):
update = {
'dc_slug': None,
+ 'dc_cover_image': None,
}
info = self.book_info()
if info is not None:
update['dc_slug'] = info.url.slug
+ if info.cover_source:
+ try:
+ image = Image.objects.get(pk=int(info.cover_source.rstrip('/').rsplit('/', 1)[-1]))
+ except Image.DoesNotExist:
+ pass
+ else:
+ if info.cover_source == image.get_full_url():
+ update['dc_cover_image'] = image
Book.objects.filter(pk=self.pk).update(**update)
def touch(self):
return changes
def materialize(self, publishable=False, changes=None):
- """
+ """
Get full text of the document compiled from chunks.
Takes the current versions of all texts
or versions most recently tagged for publishing,
changes = self.get_current_changes(publishable)
return compile_text(change.materialize() for change in changes)
- def wldocument(self, publishable=True, changes=None, parse_dublincore=True):
+ def wldocument(self, publishable=True, changes=None, parse_dublincore=True, strict=False):
from catalogue.ebook_utils import RedakcjaDocProvider
from librarian.parser import WLDocument
return WLDocument.from_string(
- self.materialize(publishable=publishable, changes=changes),
+ self.wl1_xml(publishable=publishable, changes=changes),
provider=RedakcjaDocProvider(publishable=publishable),
- parse_dublincore=parse_dublincore)
+ parse_dublincore=parse_dublincore,
+ strict=strict)
- def publish(self, user):
+ def publish(self, user, host=None):
"""
Publishes a book on behalf of a (local) user.
"""
+ import json
+ import os
+ from django.conf import settings
self.assert_publishable()
- changes = self.get_current_changes(publishable=True)
- book_xml = self.materialize(changes=changes)
- apiclient.api_call(user, "books/", {"book_xml": book_xml})
+ changes = self.get_current_changes()
+ data = {"lesson_xml": self.wl1_xml(changes=changes)}
+ if host:
+ gallery_url = u'%s%s%s%s/' % (host, settings.MEDIA_URL, settings.IMAGE_DIR, self.gallery)
+ gallery_dir = os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, self.gallery)
+ if os.path.isdir(gallery_dir):
+ data['gallery_url'] = gallery_url
+ attachments = os.listdir(gallery_dir)
+ else:
+ attachments = []
+ data['attachments'] = json.dumps(attachments)
+ apiclient.api_call(user, "lessons/", data)
# record the publish
br = BookPublishRecord.objects.create(book=self, user=user)
for c in changes:
ChunkPublishRecord.objects.create(book_record=br, change=c)
post_publish.send(sender=br)
+
+ def wl1_xml(self, publishable=True, changes=None):
+ return wl2_to_wl1(self.materialize(publishable=publishable, changes=changes), self.slug)
fnp / redakcja.git / blobdiff