X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/a4750ca6ad789432fffd60266a38b8586994c3d6..9ce71c396eabe3142c5f587c1d590c2b3352d480:/apps/catalogue/models/book.py diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py index 89c6267c..7e6cbfa2 100755 --- a/apps/catalogue/models/book.py +++ b/apps/catalogue/models/book.py @@ -7,15 +7,19 @@ from django.contrib.sites.models import Site 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.helpers import cached_in_field, GalleryMerger from catalogue.models import BookPublishRecord, ChunkPublishRecord 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 class Book(models.Model): """ A document edited on the wiki """ @@ -191,8 +195,19 @@ class Book(models.Model): chunk.save() number += 1 assert not other.chunk_set.exists() + + gm = GalleryMerger(self.gallery, other.gallery) + self.gallery = gm.merge() + + # and move the gallery starts + if gm.was_merged: + for chunk in self[len(self) - len_other:]: + chunk.gallery_start += gm.dest_size - gm.num_deleted + chunk.save() + other.delete() + @transaction.commit_on_success def prepend_history(self, other): """Prepend history from all the other book's chunks to own.""" @@ -209,6 +224,18 @@ class Book(models.Model): assert not other.chunk_set.exists() other.delete() + 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[0].delete() + chunk.book = book + chunk.number = 1 + chunk.save() + assert not self.chunk_set.exists() + self.delete() # State & cache # ============= @@ -231,13 +258,13 @@ class Book(models.Model): from librarian import NoDublinCore, ParseError, ValidationError try: - bi = BookInfo.from_string(book_xml.encode('utf-8')) + bi = BookInfo.from_string(book_xml.encode('utf-8'), strict=True) except ParseError, e: - raise AssertionError(_('Invalid XML') + ': ' + str(e)) + raise AssertionError(_('Invalid XML') + ': ' + unicode(e)) except NoDublinCore: raise AssertionError(_('No Dublin Core found.')) except ValidationError, e: - raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e)) + raise AssertionError(_('Invalid Dublin Core') + ': ' + unicode(e)) valid_about = self.correct_about() assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about @@ -306,7 +333,7 @@ class Book(models.Model): info = self.book_info() if info is not None: - update['dc_slug'] = info.slug + update['dc_slug'] = info.url.slug Book.objects.filter(pk=self.pk).update(**update) def touch(self): @@ -358,6 +385,15 @@ class Book(models.Model): 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): + from catalogue.ebook_utils import RedakcjaDocProvider + from librarian.parser import WLDocument + + return WLDocument.from_string( + self.materialize(publishable=publishable, changes=changes), + provider=RedakcjaDocProvider(publishable=publishable), + parse_dublincore=parse_dublincore) + def publish(self, user): """ Publishes a book on behalf of a (local) user.