X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/00d08f06af25502105e7216c938db74402cc3da1..14b70eccc2fec2c214671ca2aeb169baf40dacf2:/catalogue/models.py?ds=sidebyside
diff --git a/catalogue/models.py b/catalogue/models.py
index 1e54ffe35..0d3df1603 100644
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -1,9 +1,11 @@
# -*- 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
@@ -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)
@@ -81,6 +84,26 @@ class Book(models.Model):
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 = _('description')
@@ -106,7 +129,9 @@ class Book(models.Model):
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()
@@ -135,8 +160,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,14 +195,27 @@ 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')