X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/84aecebd96f2bc8a27396ecf10c409a8b91e1bcc..a1ea2966e73e96e9ea5a192320353e8863687b41:/apps/catalogue/models.py diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 98e37c1af..baf00a122 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -12,7 +12,6 @@ from django.template.defaultfilters import slugify from django.utils.safestring import mark_safe from django.utils.translation import get_language from django.core.urlresolvers import reverse -from datetime import datetime from django.conf import settings @@ -61,7 +60,6 @@ class Tag(TagBase): user = models.ForeignKey(User, blank=True, null=True) book_count = models.IntegerField(_('book count'), blank=False, null=True) - death = models.IntegerField(_(u'year of death'), blank=True, null=True) gazeta_link = models.CharField(blank=True, max_length=240) wiki_link = models.CharField(blank=True, max_length=240) @@ -96,17 +94,6 @@ class Tag(TagBase): has_description.short_description = _('description') has_description.boolean = True - def alive(self): - return self.death is None - - def in_pd(self): - """ tests whether an author is in public domain """ - return self.death is not None and self.goes_to_pd() <= datetime.now().year - - def goes_to_pd(self): - """ calculates the year of public domain entry for an author """ - return self.death + 71 if self.death is not None else None - def get_count(self): """ returns global book count for book tags, fragment count for themes """ @@ -173,15 +160,20 @@ def book_upload_path(ext=None): # how to put related book's slug here? if not ext: ext = media.type - return 'lektura/%s.%s' % (slugify(media.name), ext) + if not media.name: + name = slugify(filename.split(".")[0]) + else: + name = slugify(media.name) + return 'lektura/%s.%s' % (name, ext) return get_dynamic_path class BookMedia(models.Model): type = models.CharField(_('type'), choices=MEDIA_FORMATS, max_length="100") - name = models.CharField(_('name'), max_length="100") - file = models.FileField(_('file'), upload_to=book_upload_path(), blank=True) + name = models.CharField(_('name'), max_length="100", blank=True) + file = models.FileField(_('file'), upload_to=book_upload_path(), blank=True) uploaded_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False) + extra_info = JSONField(_('extra information'), default='{}') def __unicode__(self): return "%s (%s)" % (self.name, self.file.name.split("/")[-1]) @@ -191,6 +183,27 @@ class BookMedia(models.Model): verbose_name = _('book media') verbose_name_plural = _('book media') + def save(self, force_insert=False, force_update=False): + media = super(BookMedia, self).save(force_insert, force_update) + if self.type == 'mp3': + file = self.file + extra_info = self.get_extra_info_value() + extra_info.update(self.get_mp3_info()) + self.set_extra_info_value(extra_info) + media = super(BookMedia, self).save(force_insert, force_update) + return media + + def get_mp3_info(self): + """Retrieves artist and director names from audio ID3 tags.""" + try: + audio = id3.ID3(self.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')) + except: + artist_name = director_name = '' + return {'artist_name': artist_name, 'director_name': director_name} + + class Book(models.Model): title = models.CharField(_('title'), max_length=120) slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True) @@ -229,7 +242,7 @@ class Book(models.Model): def __unicode__(self): return self.title - def save(self, force_insert=False, force_update=False, reset_short_html=True, refresh_mp3=True, **kwargs): + def save(self, force_insert=False, force_update=False, reset_short_html=True, **kwargs): if reset_short_html: # Reset _short_html during save update = {} @@ -239,16 +252,7 @@ class Book(models.Model): # Fragment.short_html relies on book's tags, so reset it here too self.fragments.all().update(**update) - book = super(Book, self).save(force_insert, force_update) - - if refresh_mp3 and self.has_media('mp3'): - file = self.get_media('mp3')[0] - #print file, file.path - extra_info = self.get_extra_info_value() - extra_info.update(self.get_mp3_info()) - self.set_extra_info_value(extra_info) - book = super(Book, self).save(force_insert, force_update) - return book + return super(Book, self).save(force_insert, force_update) @permalink def get_absolute_url(self): @@ -346,14 +350,12 @@ class Book(models.Model): formats.append(u'PDF' % self.get_media('pdf').url) if self.root_ancestor.has_media("epub"): formats.append(u'EPUB' % self.root_ancestor.get_media('epub').url) - if self.has_media("odt"): - formats.append(u'ODT' % self.get_media('odt').url) if self.has_media("txt"): formats.append(u'TXT' % self.get_media('txt').url) # other files - for m in self.media.order_by('type'): - formats.append(u'%s' % m.type, m.file.url) - + for m in self.medias.order_by('type'): + formats.append(u'%s' % (m.file.url, m.type.upper())) + formats = [mark_safe(format) for format in formats] setattr(self, key, unicode(render_to_string('catalogue/book_short.html', @@ -374,13 +376,6 @@ class Book(models.Model): return self._root_ancestor - def get_mp3_info(self): - """Retrieves artist and director names from audio ID3 tags.""" - audio = id3.ID3(self.get_media('mp3')[0].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') @@ -397,6 +392,11 @@ class Book(models.Model): has_epub_file.short_description = 'EPUB' has_epub_file.boolean = True + def has_txt_file(self): + return bool(self.txt_file) + has_txt_file.short_description = 'HTML' + has_txt_file.boolean = True + def has_html_file(self): return bool(self.html_file) has_html_file.short_description = 'HTML' @@ -451,9 +451,9 @@ class Book(models.Model): epub_file = StringIO() try: - epub.transform(BookImportDocProvider(self), self.slug, epub_file) + epub.transform(BookImportDocProvider(self), self.slug, output_file=epub_file) self.epub_file.save('%s.epub' % self.slug, ContentFile(epub_file.getvalue()), save=False) - self.save(refresh_mp3=False) + self.save() FileRecord(slug=self.slug, type='epub', sha1=sha1(epub_file.getvalue()).hexdigest()).save() except NoDublinCore: pass @@ -464,12 +464,12 @@ class Book(models.Model): if remove_descendants and child_book.has_epub_file(): child_book.epub_file.delete() # save anyway, to refresh short_html - child_book.save(refresh_mp3=False) + child_book.save() book_descendants += list(child_book.children.all()) @classmethod - def from_xml_file(cls, xml_file, overwrite=False): + def from_xml_file(cls, xml_file, overwrite=False, build_epub=True): # use librarian to parse meta-data book_info = dcparser.parse(xml_file) @@ -477,12 +477,12 @@ class Book(models.Model): xml_file = File(open(xml_file)) try: - return cls.from_text_and_meta(xml_file, book_info, overwrite) + return cls.from_text_and_meta(xml_file, book_info, overwrite, build_epub=build_epub) finally: xml_file.close() @classmethod - def from_text_and_meta(cls, raw_file, book_info, overwrite=False): + def from_text_and_meta(cls, raw_file, book_info, overwrite=False, build_epub=True): from tempfile import NamedTemporaryFile from slughifi import slughifi from markupstring import MarkupString @@ -591,8 +591,8 @@ class Book(models.Model): new_fragment.save() new_fragment.tags = set(book_tags + themes + [book_tag] + ancestor_tags) - if not settings.NO_BUILD_EPUB: - book.root_ancestor().build_epub() + if not settings.NO_BUILD_EPUB and build_epub: + book.root_ancestor.build_epub() book_descendants = list(book.children.all()) # add l-tag to descendants and their fragments @@ -621,12 +621,12 @@ class Book(models.Model): for tag in self.tags.exclude(category__in=('book', 'theme', 'set')).order_by(): tags[tag.pk] = 1 self.set__tag_counter_value(tags) - self.save(reset_short_html=False, refresh_mp3=False) + self.save(reset_short_html=False) return tags def reset_tag_counter(self): self._tag_counter = None - self.save(reset_short_html=False, refresh_mp3=False) + self.save(reset_short_html=False) if self.parent: self.parent.reset_tag_counter() @@ -642,12 +642,12 @@ class Book(models.Model): for tag in fragment.tags.filter(category='theme').order_by(): tags[tag.pk] = tags.get(tag.pk, 0) + 1 self.set__theme_counter_value(tags) - self.save(reset_short_html=False, refresh_mp3=False) + self.save(reset_short_html=False) return tags def reset_theme_counter(self): self._theme_counter = None - self.save(reset_short_html=False, refresh_mp3=False) + self.save(reset_short_html=False) if self.parent: self.parent.reset_theme_counter() @@ -657,6 +657,24 @@ class Book(models.Model): return self.refresh_theme_counter() return dict((int(k), v) for k, v in self.get__theme_counter_value().iteritems()) + def pretty_title(self, html_links=False): + book = self + names = list(book.tags.filter(category='author')) + + books = [] + while book: + books.append(book) + book = book.parent + names.extend(reversed(books)) + + if html_links: + names = ['%s' % (tag.get_absolute_url(), tag.name) for tag in names] + else: + names = [tag.name for tag in names] + + return ', '.join(names) + + class Fragment(models.Model): text = models.TextField() short_text = models.TextField(editable=False) @@ -688,34 +706,6 @@ class Fragment(models.Model): return mark_safe(getattr(self, key)) -class BookStub(models.Model): - title = models.CharField(_('title'), max_length=120) - author = models.CharField(_('author'), max_length=120) - pd = models.IntegerField(_('goes to public domain'), null=True, blank=True) - slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True) - translator = models.TextField(_('translator'), blank=True) - translator_death = models.TextField(_('year of translator\'s death'), blank=True) - - class Meta: - ordering = ('title',) - verbose_name = _('book stub') - verbose_name_plural = _('book stubs') - - def __unicode__(self): - return self.title - - @permalink - def get_absolute_url(self): - return ('catalogue.views.book_detail', [self.slug]) - - def in_pd(self): - return self.pd is not None and self.pd <= datetime.now().year - - @property - def name(self): - return self.title - - class FileRecord(models.Model): slug = models.SlugField(_('slug'), max_length=120, db_index=True) type = models.CharField(_('type'), max_length=20, db_index=True)