Librarian in regular requirements.

[redakcja.git] / apps / catalogue / models / book.py

diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py
index 25b9304..1fcd05a 100755 (executable)
--- a/apps/catalogue/models/book.py
+++ b/apps/catalogue/models/book.py
@@ -8,12 +8,12 @@ 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 django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings

-from slughifi import slughifi
+from slugify import slugify

 
 
 import apiclient
 from catalogue.helpers import cached_in_field, GalleryMerger
 
 
 import apiclient
 from catalogue.helpers import cached_in_field, GalleryMerger

-from catalogue.models import BookPublishRecord, ChunkPublishRecord
+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
 from catalogue.signals import post_publish
 from catalogue.tasks import refresh_instance, book_content_updated
 from catalogue.xml_tools import compile_text, split_xml


@@ -29,6 +29,7 @@ class Book(models.Model):
     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)
     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)

+    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)


@@ -86,6 +87,12 @@ class Book(models.Model):
             self.get_absolute_url()
         )
 
             self.get_absolute_url()
         )
 

+    def gallery_path(self):
+        return os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, self.gallery)
+
+    def gallery_url(self):
+        return '%s%s%s/' % (settings.MEDIA_URL, settings.IMAGE_DIR, self.gallery)
+

     # Creating & manipulating
     # =======================
 
     # Creating & manipulating
     # =======================
 


@@ -93,7 +100,7 @@ class Book(models.Model):
         return self.public or request.user.is_authenticated()
 
     @classmethod
         return self.public or request.user.is_authenticated()
 
     @classmethod

-    @transaction.commit_on_success
+    @transaction.atomic

     def create(cls, creator, text, *args, **kwargs):
         b = cls.objects.create(*args, **kwargs)
         b.chunk_set.all().update(creator=creator)
     def create(cls, creator, text, *args, **kwargs):
         b = cls.objects.create(*args, **kwargs)
         b.chunk_set.all().update(creator=creator)


@@ -105,7 +112,7 @@ class Book(models.Model):
         return self.chunk_set.reverse()[0].split(*args, **kwargs)
 
     @classmethod
         return self.chunk_set.reverse()[0].split(*args, **kwargs)
 
     @classmethod

-    @transaction.commit_on_success
+    @transaction.atomic

     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."""
     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."""


@@ -126,7 +133,7 @@ class Book(models.Model):
             if not title:
                 title = u'część %d' % (i + 1)
 
             if not title:
                 title = u'część %d' % (i + 1)
 

-            slug = slughifi(title)
+            slug = slugify(title)

 
             if i < book_len:
                 chunk = instance[i]
 
             if i < book_len:
                 chunk = instance[i]


@@ -152,7 +159,7 @@ class Book(models.Model):
             i += 1
         return new_slug
 
             i += 1
         return new_slug
 

-    @transaction.commit_on_success
+    @transaction.atomic

     def append(self, other, slugs=None, titles=None):
         """Add all chunks of another book to self."""
         assert self != other
     def append(self, other, slugs=None, titles=None):
         """Add all chunks of another book to self."""
         assert self != other


@@ -166,7 +173,7 @@ class Book(models.Model):
         if titles is not None:
             assert len(titles) == len_other
             if slugs is None:
         if titles is not None:
             assert len(titles) == len_other
             if slugs is None:

-                slugs = [slughifi(t) for t in titles]
+                slugs = [slugify(t) for t in titles]

 
         for i, chunk in enumerate(other):
             # move chunk to new book
 
         for i, chunk in enumerate(other):
             # move chunk to new book


@@ -205,20 +212,21 @@ class Book(models.Model):
         # and move the gallery starts
         if gm.was_merged:
                 for chunk in self[len(self) - len_other:]:
         # 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
+                        old_start = chunk.gallery_start or 1
+                        chunk.gallery_start = old_start + gm.dest_size - gm.num_deleted

                         chunk.save()
 
         other.delete()
 
 
                         chunk.save()
 
         other.delete()
 
 

-    @transaction.commit_on_success
+    @transaction.atomic

     def prepend_history(self, other):
         """Prepend history from all the other book's chunks to own."""
         assert self != other
 
         for i in range(len(self), len(other)):
             title = u"pusta część %d" % i
     def prepend_history(self, other):
         """Prepend history from all the other book's chunks to own."""
         assert self != other
 
         for i in range(len(self), len(other)):
             title = u"pusta część %d" % i

-            chunk = self.add(slughifi(title), title)
+            chunk = self.add(slugify(title), title)

             chunk.commit('')
 
         for i in range(len(other)):
             chunk.commit('')
 
         for i in range(len(other)):


@@ -270,6 +278,14 @@ class Book(models.Model):
         valid_about = self.correct_about()
         assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about
 
         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('.')
 
     def hidden(self):
         return self.slug.startswith('.')
 


@@ -323,7 +339,7 @@ class Book(models.Model):
             from librarian.dcparser import BookInfo
             from librarian import NoDublinCore, ParseError, ValidationError
             try:
             from librarian.dcparser import BookInfo
             from librarian import NoDublinCore, ParseError, ValidationError
             try:

-                return BookInfo.from_string(book_xml.encode('utf-8'))
+                return BookInfo.from_bytes(book_xml.encode('utf-8'))

             except (self.NoTextError, ParseError, NoDublinCore, ValidationError):
                 return None
 
             except (self.NoTextError, ParseError, NoDublinCore, ValidationError):
                 return None
 


@@ -400,22 +416,37 @@ class Book(models.Model):
         from catalogue.ebook_utils import RedakcjaDocProvider
         from librarian.parser import WLDocument
 
         from catalogue.ebook_utils import RedakcjaDocProvider
         from librarian.parser import WLDocument
 

-        return WLDocument.from_string(
-                self.materialize(publishable=publishable, changes=changes),
+        return WLDocument.from_bytes(
+                self.materialize(publishable=publishable, changes=changes).encode('utf-8'),

                 provider=RedakcjaDocProvider(publishable=publishable),
                 parse_dublincore=parse_dublincore,
                 strict=strict)
 
                 provider=RedakcjaDocProvider(publishable=publishable),
                 parse_dublincore=parse_dublincore,
                 strict=strict)
 

-    def publish(self, user):
+    def publish(self, user, fake=False, host=None, days=0, beta=False):

         """
             Publishes a book on behalf of a (local) user.
         """
         self.assert_publishable()
         changes = self.get_current_changes(publishable=True)
         """
             Publishes a book on behalf of a (local) user.
         """
         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})
-        # 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)
+        if not fake:
+            book_xml = self.materialize(changes=changes)
+            data = {"book_xml": book_xml, "days": days}
+            if host:
+                data['gallery_url'] = host + self.gallery_url()
+            apiclient.api_call(user, "books/", data, beta=beta)
+        if not beta:
+            # record the publish
+            br = BookPublishRecord.objects.create(book=self, user=user)
+            for c in changes:
+                ChunkPublishRecord.objects.create(book_record=br, change=c)
+            if not self.public and days == 0:
+                self.public = True
+                self.save()
+            if self.public and days > 0:
+                self.public = False
+                self.save()
+            post_publish.send(sender=br)
+
+    def latex_dir(self):
+        doc = self.wldocument()
+        return doc.latex_dir(cover=True, ilustr_path=self.gallery_path())