X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/6d48dc65380f540f4471e5c890fcf27b2a240374..c86747032e5ea441ee41040559766151e1b3873d:/apps/catalogue/models/book.py

diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py
index ade9a429..4d1b12e4 100755
--- a/apps/catalogue/models/book.py
+++ b/apps/catalogue/models/book.py
@@ -7,15 +7,20 @@ 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
-
+from cover.models import Image
+import os
+import shutil
+import re
 
 class Book(models.Model):
     """ A document edited on the wiki """
@@ -35,6 +40,8 @@ class Book(models.Model):
     _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_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)
 
@@ -191,8 +198,20 @@ 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:]:
+                        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):
         """Prepend history from all the other book's chunks to own."""
@@ -237,13 +256,11 @@ class Book(models.Model):
             changes = self.get_current_changes(publishable=True)
         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
         except ParseError, e:
             raise AssertionError(_('Invalid XML') + ': ' + unicode(e))
         except NoDublinCore:
@@ -254,6 +271,14 @@ class Book(models.Model):
         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
+        else:
+            return None
+
     def hidden(self):
         return self.slug.startswith('.')
 
@@ -314,11 +339,20 @@ class Book(models.Model):
     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:
+                    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):
@@ -370,14 +404,16 @@ 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):
+    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),
                 provider=RedakcjaDocProvider(publishable=publishable),
-                parse_dublincore=parse_dublincore)
+                parse_dublincore=parse_dublincore,
+                strict=strict)
 
     def publish(self, user):
         """