X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/413a1d782784e0ae9637349a576c4fc03789d384..52a0445217d261027b003f6f300c1e0d6a3553eb:/catalogue/models.py?ds=sidebyside diff --git a/catalogue/models.py b/catalogue/models.py index 1b5a32ff9..114b34bdd 100644 --- a/catalogue/models.py +++ b/catalogue/models.py @@ -1,14 +1,16 @@ # -*- coding: utf-8 -*- from django.db import models -from django.db.models import permalink +from django.db.models import permalink, Q from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User from django.core.files import File +from django.template.loader import render_to_string +from django.utils.safestring import mark_safe from newtagging.models import TagBase from newtagging import managers -from librarian import html +from librarian import html, dcparser TAG_CATEGORIES = ( @@ -42,12 +44,12 @@ class Tag(TagBase): def has_description(self): return len(self.description) > 0 - has_description.short_description = _('Has description') + has_description.short_description = _('description') has_description.boolean = True @permalink def get_absolute_url(self): - return ('catalogue.views.tagged_book_list', [self.slug]) + return ('catalogue.views.tagged_object_list', [self.slug]) class Meta: ordering = ('sort_key',) @@ -71,6 +73,7 @@ class Book(models.Model): slug = models.SlugField(_('slug'), unique=True, db_index=True) description = models.TextField(_('description'), blank=True) created_at = models.DateTimeField(_('creation date'), auto_now=True) + _short_html = models.TextField(_('short HTML'), editable=False) # Formats xml_file = models.FileField(_('XML file'), upload_to='books/xml', blank=True) @@ -78,12 +81,34 @@ class Book(models.Model): odt_file = models.FileField(_('ODT file'), upload_to='books/odt', blank=True) html_file = models.FileField(_('HTML file'), upload_to='books/html', blank=True) + parent = models.ForeignKey('self', blank=True, null=True) + objects = managers.ModelTaggedItemManager(Tag) tags = managers.TagDescriptor(Tag) + def short_html(self): + if len(self._short_html): + return mark_safe(self._short_html) + else: + tags = self.tags.filter(~Q(category__in=('set', 'theme'))) + tags = [u'%s' % (tag.get_absolute_url(), tag.name) for tag in tags] + + formats = [] + if self.html_file: + formats.append(u'Czytaj online' % self.html_file.url) + if self.pdf_file: + formats.append(u'Plik PDF' % self.pdf_file.url) + if self.odt_file: + formats.append(u'Plik ODT' % self.odt_file.url) + + self._short_html = render_to_string('catalogue/book_short.html', + {'book': self, 'tags': tags, 'formats': formats}) + self.save() + return mark_safe(self._short_html) + def has_description(self): return len(self.description) > 0 - has_description.short_description = _('Has description') + has_description.short_description = _('description') has_description.boolean = True def has_pdf_file(self): @@ -105,8 +130,9 @@ class Book(models.Model): def from_xml_file(xml_file): from tempfile import NamedTemporaryFile from slughifi import slughifi - import dcparser + from markupstring import MarkupString + # Read book metadata book_info = dcparser.parse(xml_file) book = Book(title=book_info.title, slug=slughifi(book_info.title)) book.save() @@ -124,6 +150,13 @@ class Book(models.Model): book_tags.append(tag) book.tags = book_tags + if hasattr(book_info, 'parts'): + for part_url in book_info.parts: + base, slug = part_url.rsplit('/', 1) + child_book = Book.objects.get(slug=slug) + child_book.parent = book + child_book.save() + # Save XML and HTML files book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False) @@ -135,8 +168,11 @@ class Book(models.Model): closed_fragments, open_fragments = html.extract_fragments(book.html_file.path) book_themes = [] for fragment in closed_fragments.values(): - new_fragment = Fragment(html=fragment.to_string(), short_html=fragment.to_string(), - anchor=fragment.id, book=book) + text = fragment.to_string() + short_text = '' + if (len(MarkupString(text)) > 240): + short_text = MarkupString(text)[:160] + new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book) theme_names = [s.strip() for s in fragment.themes.split(',')] themes = [] @@ -167,16 +203,29 @@ class Book(models.Model): class Fragment(models.Model): - html = models.TextField() - short_html = models.TextField() + text = models.TextField() + short_text = models.TextField(editable=False) + _short_html = models.TextField(editable=False) anchor = models.IntegerField() book = models.ForeignKey(Book, related_name='fragments') - + objects = managers.ModelTaggedItemManager(Tag) tags = managers.TagDescriptor(Tag) + def short_html(self): + if len(self._short_html): + return mark_safe(self._short_html) + else: + book_authors = [u'%s' % (tag.get_absolute_url(), tag.name) + for tag in self.book.tags if tag.category == 'author'] + + self._short_html = render_to_string('catalogue/fragment_short.html', + {'fragment': self, 'book': self.book, 'book_authors': book_authors}) + self.save() + return mark_safe(self._short_html) + class Meta: ordering = ('book', 'anchor',) verbose_name = _('fragment') - verbose_name_plural = _('fragment') + verbose_name_plural = _('fragments')