X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/14f2e79b2ca9b5359ef95988a4a3a5e510df244e..99fae6026dce1818039c09e3ea0123831e1753e0:/apps/catalogue/models.py
diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index b5970e9f1..0e0e98ff6 100644
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -10,6 +10,7 @@ from django.core.urlresolvers import reverse
from newtagging.models import TagBase
from newtagging import managers
+from catalogue.fields import JSONField
from librarian import html, dcparser
@@ -21,6 +22,7 @@ TAG_CATEGORIES = (
('genre', _('genre')),
('theme', _('theme')),
('set', _('set')),
+ ('book', _('book')),
)
@@ -41,8 +43,9 @@ class Tag(TagBase):
db_index=True, choices=TAG_CATEGORIES)
description = models.TextField(_('description'), blank=True)
main_page = models.BooleanField(_('main page'), default=False, db_index=True, help_text=_('Show tag on main page'))
-
+
user = models.ForeignKey(User, blank=True, null=True)
+ book_count = models.IntegerField(_('book count'), default=0, blank=False, null=False)
def has_description(self):
return len(self.description) > 0
@@ -83,6 +86,7 @@ class Book(models.Model):
created_at = models.DateTimeField(_('creation date'), auto_now=True)
_short_html = models.TextField(_('short HTML'), editable=False)
parent_number = models.IntegerField(_('parent number'), default=0)
+ extra_info = JSONField(_('extra information'))
# Formats
xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True)
@@ -90,18 +94,25 @@ class Book(models.Model):
pdf_file = models.FileField(_('PDF file'), upload_to=book_upload_path('pdf'), blank=True)
odt_file = models.FileField(_('ODT file'), upload_to=book_upload_path('odt'), blank=True)
txt_file = models.FileField(_('TXT file'), upload_to=book_upload_path('txt'), blank=True)
+ mp3_file = models.FileField(_('MP3 file'), upload_to=book_upload_path('mp3'), blank=True)
+ ogg_file = models.FileField(_('OGG file'), upload_to=book_upload_path('ogg'), blank=True)
parent = models.ForeignKey('self', blank=True, null=True, related_name='children')
objects = models.Manager()
tagged = managers.ModelTaggedItemManager(Tag)
tags = managers.TagDescriptor(Tag)
+
+
+ @property
+ def name(self):
+ return self.title
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 = self.tags.filter(~Q(category__in=('set', 'theme', 'book')))
tags = [u'%s' % (tag.get_absolute_url(), tag.name) for tag in tags]
formats = []
@@ -111,6 +122,8 @@ class Book(models.Model):
formats.append(u'Plik PDF' % self.pdf_file.url)
if self.odt_file:
formats.append(u'Plik ODT' % self.odt_file.url)
+ if self.txt_file:
+ formats.append(u'Plik TXT' % self.txt_file.url)
self._short_html = unicode(render_to_string('catalogue/book_short.html',
{'book': self, 'tags': tags, 'formats': formats}))
@@ -137,8 +150,11 @@ class Book(models.Model):
has_html_file.short_description = 'HTML'
has_html_file.boolean = True
+ class AlreadyExists(Exception):
+ pass
+
@staticmethod
- def from_xml_file(xml_file):
+ def from_xml_file(xml_file, overwrite=False):
from tempfile import NamedTemporaryFile
from slughifi import slughifi
from markupstring import MarkupString
@@ -146,7 +162,19 @@ class Book(models.Model):
# Read book metadata
book_info = dcparser.parse(xml_file)
book_base, book_slug = book_info.url.rsplit('/', 1)
- book = Book(title=book_info.title, slug=book_slug)
+ book, created = Book.objects.get_or_create(slug=book_slug)
+
+ if created:
+ book_shelves = []
+ else:
+ if not overwrite:
+ raise Book.AlreadyExists('Book %s already exists' % book_slug)
+ # Save shelves for this book
+ book_shelves = list(book.tags.filter(category='set'))
+
+ book.title = book_info.title
+ book.set_extra_info_value(book_info.to_dict())
+ book._short_html = ''
book.save()
book_tags = []
@@ -163,6 +191,15 @@ class Book(models.Model):
tag.category = category
tag.save()
book_tags.append(tag)
+
+ book_tag, created = Tag.objects.get_or_create(slug=('l-' + book.slug)[:120])
+ if created:
+ book_tag.name = book.title[:50]
+ book_tag.sort_key = ('l-' + book.slug)[:120]
+ book_tag.category = 'book'
+ book_tag.save()
+ book_tags.append(book_tag)
+
book.tags = book_tags
if hasattr(book_info, 'parts'):
@@ -172,7 +209,14 @@ class Book(models.Model):
child_book.parent = book
child_book.parent_number = n
child_book.save()
-
+
+ book_descendants = list(book.children.all())
+ while len(book_descendants) > 0:
+ child_book = book_descendants.pop(0)
+ for fragment in child_book.fragments.all():
+ fragment.tags = set(list(fragment.tags) + [book_tag])
+ book_descendants += list(child_book.children.all())
+
# Save XML and HTML files
book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False)
@@ -188,7 +232,8 @@ class Book(models.Model):
short_text = ''
if (len(MarkupString(text)) > 240):
short_text = unicode(MarkupString(text)[:160])
- new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book)
+ new_fragment, created = Fragment.objects.get_or_create(anchor=fragment.id, book=book,
+ defaults={'text': text, 'short_text': short_text})
try:
theme_names = [s.strip() for s in fragment.themes.split(',')]
@@ -204,13 +249,14 @@ class Book(models.Model):
tag.save()
themes.append(tag)
new_fragment.save()
- new_fragment.tags = list(book.tags) + themes
+ new_fragment.tags = set(list(book.tags) + themes + [book_tag])
book_themes += themes
book_themes = set(book_themes)
- book.tags = list(book.tags) + list(book_themes)
+ book.tags = list(book.tags) + list(book_themes) + book_shelves
- return book.save()
+ book.save()
+ return book
@permalink
def get_absolute_url(self):