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
-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
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)
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
# =======================
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)
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."""
if not title:
title = u'część %d' % (i + 1)
- slug = slughifi(title)
+ slug = slugify(title)
if i < book_len:
chunk = instance[i]
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
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
# 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()
- @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
- chunk = self.add(slughifi(title), title)
+ chunk = self.add(slugify(title), title)
chunk.commit('')
for i in range(len(other)):
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:
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('.')
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):
+ def publish(self, user, fake=False, host=None):
"""
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})
+ if not fake:
+ data = {"book_xml": book_xml}
+ if host:
+ data['gallery_url'] = host + self.gallery_url()
+ apiclient.api_call(user, "books/", data)
# record the publish
br = BookPublishRecord.objects.create(book=self, user=user)
for c in changes:
fnp / redakcja.git / blobdiff