X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/db833ba4517084f61a64907c6d15606e7c881edd..8789367b2d99e5adaa8e8f8be6b8b78fb1af5ed2:/apps/catalogue/models.py
diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 9d072b44f..58025fabd 100644
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -10,9 +10,10 @@ from django.core.urlresolvers import reverse
from newtagging.models import TagBase
from newtagging import managers
-import djangosphinx
+from catalogue.fields import JSONField
from librarian import html, dcparser
+from mutagen import id3
TAG_CATEGORIES = (
@@ -22,6 +23,7 @@ TAG_CATEGORIES = (
('genre', _('genre')),
('theme', _('theme')),
('set', _('set')),
+ ('book', _('book')),
)
@@ -42,11 +44,11 @@ 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)
-
- search = djangosphinx.SphinxSearch()
+ gazeta_link = models.CharField(blank=True, max_length=240)
+ wiki_link = models.CharField(blank=True, max_length=240)
def has_description(self):
return len(self.description) > 0
@@ -87,6 +89,10 @@ 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'))
+ gazeta_link = models.CharField(blank=True, max_length=240)
+ wiki_link = models.CharField(blank=True, max_length=240)
+
# Formats
xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True)
@@ -94,6 +100,8 @@ 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')
@@ -101,7 +109,6 @@ class Book(models.Model):
tagged = managers.ModelTaggedItemManager(Tag)
tags = managers.TagDescriptor(Tag)
- search = djangosphinx.SphinxSearch()
@property
def name(self):
@@ -111,24 +118,44 @@ class Book(models.Model):
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]
+ tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book')))
+ tags = [mark_safe(u'%s' % (tag.get_absolute_url(), tag.name)) for tag in tags]
formats = []
if self.html_file:
formats.append(u'Czytaj online' % reverse('book_text', kwargs={'slug': self.slug}))
if self.pdf_file:
- formats.append(u'Plik PDF' % self.pdf_file.url)
+ formats.append(u'PDF' % self.pdf_file.url)
if self.odt_file:
- formats.append(u'Plik ODT' % self.odt_file.url)
+ formats.append(u'ODT' % self.odt_file.url)
if self.txt_file:
- formats.append(u'Plik TXT' % self.txt_file.url)
+ formats.append(u'TXT' % self.txt_file.url)
+ if self.mp3_file:
+ formats.append(u'MP3' % self.mp3_file.url)
+ if self.ogg_file:
+ formats.append(u'OGG' % self.ogg_file.url)
+
+ formats = [mark_safe(format) for format in formats]
self._short_html = unicode(render_to_string('catalogue/book_short.html',
{'book': self, 'tags': tags, 'formats': formats}))
self.save()
return mark_safe(self._short_html)
+ def save(self, force_insert=False, force_update=False):
+ if self.mp3_file:
+ extra_info = self.get_extra_info_value()
+ extra_info.update(self.get_mp3_info())
+ self.set_extra_info_value(extra_info)
+ return super(Book, self).save(force_insert, force_update)
+
+ def get_mp3_info(self):
+ """Retrieves artist and director names from audio ID3 tags."""
+ audio = id3.ID3(self.mp3_file.path)
+ artist_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE1'))
+ director_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE3'))
+ return {'artist_name': artist_name, 'director_name': director_name}
+
def has_description(self):
return len(self.description) > 0
has_description.short_description = _('description')
@@ -172,6 +199,7 @@ class Book(models.Model):
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()
@@ -189,6 +217,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'):
@@ -198,9 +235,18 @@ 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)
+ if not isinstance(xml_file, File):
+ xml_file = File(file(xml_file))
+ book.xml_file.save('%s.xml' % book.slug, xml_file, save=False)
html_file = NamedTemporaryFile()
if html.transform(book.xml_file.path, html_file):
@@ -231,7 +277,7 @@ 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)
@@ -264,13 +310,11 @@ class Fragment(models.Model):
tagged = managers.ModelTaggedItemManager(Tag)
tags = managers.TagDescriptor(Tag)
- search = djangosphinx.SphinxSearch()
-
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)
+ book_authors = [mark_safe(u'%s' % (tag.get_absolute_url(), tag.name))
for tag in self.book.tags if tag.category == 'author']
self._short_html = unicode(render_to_string('catalogue/fragment_short.html',