X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bd743f7ae0f46d0d2a68f80e3c3cf14313d61aa3..1b718c10066557540770bb0960a773dce0ad4462:/apps/catalogue/models/book.py?ds=sidebyside diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py index 1b043a47..f4e025ed 100755 --- a/apps/catalogue/models/book.py +++ b/apps/catalogue/models/book.py @@ -3,10 +3,15 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from django.contrib.sites.models import Site from django.db import models from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ from slughifi import slughifi +from librarian import NoDublinCore, ParseError, ValidationError +from librarian.dcparser import BookInfo + +import apiclient from catalogue.helpers import cached_in_field from catalogue.models import BookPublishRecord, ChunkPublishRecord from catalogue.signals import post_publish @@ -42,7 +47,6 @@ class Book(models.Model): ordering = ['parent_number', 'title'] verbose_name = _('book') verbose_name_plural = _('books') - permissions = [('can_pubmark', 'Can mark for publishing')] # Representing @@ -99,7 +103,7 @@ class Book(models.Model): # if there are more parts, set the rest to empty strings book_len = len(instance) for i in range(book_len - len(texts)): - texts.append(u'pusta część %d' % (i + 1), u'') + texts.append((u'pusta część %d' % (i + 1), u'')) i = 0 for i, (title, text) in enumerate(texts): @@ -110,11 +114,11 @@ class Book(models.Model): if i < book_len: chunk = instance[i] - chunk.slug = slug - chunk.title = title + chunk.slug = slug[:50] + chunk.title = title[:255] chunk.save() else: - chunk = instance.add(slug, title, adjust_slug=True) + chunk = instance.add(slug, title) chunk.commit(text, **commit_args) @@ -187,13 +191,25 @@ class Book(models.Model): except IndexError: return None - def publishable(self): - if not self.chunk_set.exists(): - return False - for chunk in self: - if not chunk.publishable(): - return False - return True + def assert_publishable(self): + assert self.chunk_set.exists(), _('No chunks in the book.') + try: + changes = self.get_current_changes(publishable=True) + except self.NoTextError: + raise AssertionError(_('Not all chunks have publishable revisions.')) + book_xml = self.materialize(changes=changes) + + try: + bi = BookInfo.from_string(book_xml.encode('utf-8')) + except ParseError, e: + raise AssertionError(_('Invalid XML') + ': ' + str(e)) + except NoDublinCore: + raise AssertionError(_('No Dublin Core found.')) + except ValidationError, e: + raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e)) + + valid_about = "http://%s%s" % (Site.objects.get_current().domain, self.get_absolute_url()) + assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about def hidden(self): return self.slug.startswith('.') @@ -278,13 +294,10 @@ class Book(models.Model): """ Publishes a book on behalf of a (local) user. """ - raise NotImplementedError("Publishing not possible yet.") - - from apiclient import api_call - + self.assert_publishable() changes = self.get_current_changes(publishable=True) book_xml = self.materialize(changes=changes) - #api_call(user, "books", {"book_xml": book_xml}) + apiclient.api_call(user, "books/", {"book_xml": book_xml}) # record the publish br = BookPublishRecord.objects.create(book=self, user=user) for c in changes: