From: Lukasz Anwajler Date: Sun, 14 Nov 2010 16:59:42 +0000 (-0600) Subject: Ticket #532: many media files for books X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/854b0db58a805fd7ec2d262abda0aef02ca6e469?ds=sidebyside;hp=-c Ticket #532: many media files for books --- 854b0db58a805fd7ec2d262abda0aef02ca6e469 diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py index 02750941c..88f549fed 100644 --- a/apps/catalogue/admin.py +++ b/apps/catalogue/admin.py @@ -5,7 +5,7 @@ from django.contrib import admin from newtagging.admin import TaggableModelAdmin -from catalogue.models import Tag, Book, Fragment, BookStub +from catalogue.models import Tag, Book, Fragment, BookStub, BookMedia class TagAdmin(admin.ModelAdmin): @@ -21,7 +21,7 @@ class TagAdmin(admin.ModelAdmin): class BookAdmin(TaggableModelAdmin): tag_model = Tag - list_display = ('title', 'slug', 'has_pdf_file', 'has_epub_file', 'has_odt_file', 'has_html_file', 'has_description',) + list_display = ('title', 'slug', 'has_pdf_file', 'has_epub_file', 'has_html_file', 'has_description',) search_fields = ('title',) ordering = ('title',) @@ -44,9 +44,16 @@ class BookStubAdmin(admin.ModelAdmin): prepopulated_fields = {'slug': ('title',)} +class MediaAdmin(admin.ModelAdmin): + #tag_model = BookMedia + + list_display = ('type', 'name') + ordering = ('type', 'name') + + admin.site.register(BookStub, BookStubAdmin) admin.site.register(Tag, TagAdmin) admin.site.register(Book, BookAdmin) admin.site.register(Fragment, FragmentAdmin) - +admin.site.register(BookMedia, MediaAdmin) diff --git a/apps/catalogue/migrations/0004_many2many_files_for_books.py b/apps/catalogue/migrations/0004_many2many_files_for_books.py new file mode 100644 index 000000000..e44f04a9b --- /dev/null +++ b/apps/catalogue/migrations/0004_many2many_files_for_books.py @@ -0,0 +1,208 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding model 'BookMedia' + db.create_table('catalogue_bookmedia', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('type', self.gf('django.db.models.fields.CharField')(max_length='100')), + ('name', self.gf('django.db.models.fields.CharField')(max_length='100')), + ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100, blank=True)), + ('uploaded_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + )) + db.send_create_signal('catalogue', ['BookMedia']) + + # Deleting field 'Book.txt_file' + db.delete_column('catalogue_book', 'txt_file') + + # Deleting field 'Book.odt_file' + db.delete_column('catalogue_book', 'odt_file') + + # Deleting field 'Book.daisy_file' + db.delete_column('catalogue_book', 'daisy_file') + + # Deleting field 'Book.ogg_file' + db.delete_column('catalogue_book', 'ogg_file') + + # Deleting field 'Book.mp3_file' + db.delete_column('catalogue_book', 'mp3_file') + + # Adding M2M table for field medias on 'Book' + db.create_table('catalogue_book_medias', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('book', models.ForeignKey(orm['catalogue.book'], null=False)), + ('bookmedia', models.ForeignKey(orm['catalogue.bookmedia'], null=False)) + )) + db.create_unique('catalogue_book_medias', ['book_id', 'bookmedia_id']) + + # Changing field 'Tag.main_page' + db.alter_column('catalogue_tag', 'main_page', self.gf('django.db.models.fields.BooleanField')(blank=True)) + + + def backwards(self, orm): + + # Deleting model 'BookMedia' + db.delete_table('catalogue_bookmedia') + + # Adding field 'Book.txt_file' + db.add_column('catalogue_book', 'txt_file', self.gf('django.db.models.fields.files.FileField')(default=None, max_length=100, blank=True), keep_default=False) + + # Adding field 'Book.odt_file' + db.add_column('catalogue_book', 'odt_file', self.gf('django.db.models.fields.files.FileField')(default=None, max_length=100, blank=True), keep_default=False) + + # Adding field 'Book.daisy_file' + db.add_column('catalogue_book', 'daisy_file', self.gf('django.db.models.fields.files.FileField')(default=None, max_length=100, blank=True), keep_default=False) + + # Adding field 'Book.ogg_file' + db.add_column('catalogue_book', 'ogg_file', self.gf('django.db.models.fields.files.FileField')(default=None, max_length=100, blank=True), keep_default=False) + + # Adding field 'Book.mp3_file' + db.add_column('catalogue_book', 'mp3_file', self.gf('django.db.models.fields.files.FileField')(default=None, max_length=100, blank=True), keep_default=False) + + # Removing M2M table for field medias on 'Book' + db.delete_table('catalogue_book_medias') + + # Changing field 'Tag.main_page' + db.alter_column('catalogue_tag', 'main_page', self.gf('django.db.models.fields.BooleanField')()) + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) + }, + 'catalogue.book': { + 'Meta': {'object_name': 'Book'}, + '_short_html': ('django.db.models.fields.TextField', [], {}), + '_short_html_de': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_en': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_es': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_fr': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_lt': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_pl': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_ru': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_uk': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_tag_counter': ('catalogue.fields.JSONField', [], {'null': 'True'}), + '_theme_counter': ('catalogue.fields.JSONField', [], {'null': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'epub_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'extra_info': ('catalogue.fields.JSONField', [], {}), + 'gazeta_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}), + 'html_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'medias': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['catalogue.BookMedia']", 'symmetrical': 'False'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'children'", 'blank': 'True', 'null': 'True', 'to': "orm['catalogue.Book']"}), + 'parent_number': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'pdf_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'unique': 'True', 'db_index': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'wiki_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}), + 'xml_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}) + }, + 'catalogue.bookmedia': { + 'Meta': {'object_name': 'BookMedia'}, + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': "'100'"}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': "'100'"}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'catalogue.bookstub': { + 'Meta': {'object_name': 'BookStub'}, + 'author': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'pd': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'unique': 'True', 'db_index': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'translator': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'translator_death': ('django.db.models.fields.TextField', [], {'blank': 'True'}) + }, + 'catalogue.filerecord': { + 'Meta': {'object_name': 'FileRecord'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}), + 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '20', 'db_index': 'True'}) + }, + 'catalogue.fragment': { + 'Meta': {'object_name': 'Fragment'}, + '_short_html': ('django.db.models.fields.TextField', [], {}), + '_short_html_de': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_en': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_es': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_fr': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_lt': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_pl': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_ru': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + '_short_html_uk': ('django.db.models.fields.TextField', [], {'null': True, 'blank': True}), + 'anchor': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'book': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'fragments'", 'to': "orm['catalogue.Book']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'short_text': ('django.db.models.fields.TextField', [], {}), + 'text': ('django.db.models.fields.TextField', [], {}) + }, + 'catalogue.tag': { + 'Meta': {'unique_together': "(('slug', 'category'),)", 'object_name': 'Tag'}, + 'book_count': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'category': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), + 'death': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'gazeta_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'main_page': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}), + 'sort_key': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'wiki_link': ('django.db.models.fields.CharField', [], {'max_length': '240', 'blank': 'True'}) + }, + 'catalogue.tagrelation': { + 'Meta': {'unique_together': "(('tag', 'content_type', 'object_id'),)", 'object_name': 'TagRelation', 'db_table': "'catalogue_tag_relation'"}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'items'", 'to': "orm['catalogue.Tag']"}) + }, + 'contenttypes.contenttype': { + 'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['catalogue'] diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 28db00d03..1e85cdf01 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -8,6 +8,7 @@ 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.template.defaultfilters import slugify from django.utils.safestring import mark_safe from django.utils.translation import get_language from django.core.urlresolvers import reverse @@ -33,6 +34,12 @@ TAG_CATEGORIES = ( ('book', _('book')), ) +MEDIA_FORMATS = ( + ('odt', _('ODT file')), + ('mp3', _('MP3 file')), + ('ogg', _('OGG file')), + ('daisy', _('DAISY file')), +) class TagSubcategoryManager(models.Manager): def __init__(self, subcategory): @@ -161,40 +168,51 @@ class Tag(TagBase): # TODO: why is this hard-coded ? -def book_upload_path(ext): - def get_dynamic_path(book, filename): - return 'lektura/%s.%s' % (book.slug, ext) +def book_upload_path(ext=None): + def get_dynamic_path(media, filename, ext=ext): + # how to put related book's slug here? + if not ext: + ext = media.type + return 'lektura/%s.%s' % (slugify(filename), ext) return get_dynamic_path -class Book(models.Model): - title = models.CharField(_('title'), max_length=120) - slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True) - description = models.TextField(_('description'), blank=True) - created_at = models.DateTimeField(_('creation date'), auto_now_add=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) - +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) + uploaded_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False) - # Formats - xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True) - html_file = models.FileField(_('HTML file'), upload_to=book_upload_path('html'), blank=True) - pdf_file = models.FileField(_('PDF file'), upload_to=book_upload_path('pdf'), blank=True) - epub_file = models.FileField(_('EPUB file'), upload_to=book_upload_path('epub'), 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) - daisy_file = models.FileField(_('DAISY file'), upload_to=book_upload_path('daisy.zip'), blank=True) + def __unicode__(self): + return "%s (%s)" % (self.name, self.file.name.split("/")[-1]) - parent = models.ForeignKey('self', blank=True, null=True, related_name='children') + class Meta: + ordering = ('type', 'name') + verbose_name = _('book media') + verbose_name_plural = _('book media') - objects = models.Manager() - tagged = managers.ModelTaggedItemManager(Tag) - tags = managers.TagDescriptor(Tag) +class Book(models.Model): + title = models.CharField(_('title'), max_length=120) + slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True) + description = models.TextField(_('description'), blank=True) + created_at = models.DateTimeField(_('creation date'), auto_now_add=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) + # files generated during publication + xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True) + html_file = models.FileField(_('HTML file'), upload_to=book_upload_path('html'), blank=True) + pdf_file = models.FileField(_('PDF file'), upload_to=book_upload_path('pdf'), blank=True) + epub_file = models.FileField(_('EPUB file'), upload_to=book_upload_path('epub'), blank=True) + # other files + medias = models.ManyToManyField(BookMedia) + + parent = models.ForeignKey('self', blank=True, null=True, related_name='children') + objects = models.Manager() + tagged = managers.ModelTaggedItemManager(Tag) + tags = managers.TagDescriptor(Tag) _tag_counter = JSONField(null=True, editable=False) _theme_counter = JSONField(null=True, editable=False) @@ -222,13 +240,13 @@ class Book(models.Model): book = super(Book, self).save(force_insert, force_update) - if refresh_mp3 and self.mp3_file: - print self.mp3_file, self.mp3_file.path + 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 @permalink @@ -251,6 +269,64 @@ class Book(models.Model): book_tag.save() return book_tag + def has_media(self, type): + if type == 'xml': + if self.xml_file: + return True + else: + return False + elif type == 'html': + if self.html_file: + return True + else: + return False + elif type == 'txt': + if self.txt_file: + return True + else: + return False + elif type == 'pdf': + if self.pdf_file: + return True + else: + return False + elif type == 'epub': + if self.epub_file: + return True + else: + return False + else: + if self.medias.filter(book=self, type=type).count() > 0: + return True + else: + return False + + def get_media(self, type): + if self.has_media(type): + if type == "xml": + return self.xml_file + elif type == "html": + return self.html_file + elif type == "epub": + return self.html_file + elif type == "txt": + return self.txt_file + elif type == "pdf": + return self.pdf_file + else: + return self.medias.filter(book=self, type=type) + else: + return None + + def get_mp3(self): + return self.get_media("mp3") + def get_odt(self): + return self.get_media("odt") + def get_ogg(self): + return self.get_media("ogg") + def get_daisy(self): + return self.get_media("daisy") + def short_html(self): key = '_short_html_%s' % get_language() short_html = getattr(self, key) @@ -262,23 +338,21 @@ class Book(models.Model): tags = [mark_safe(u'%s' % (tag.get_absolute_url(), tag.name)) for tag in tags] formats = [] - if self.html_file: + # files generated during publication + if self.has_media("html"): formats.append(u'%s' % (reverse('book_text', kwargs={'slug': self.slug}), _('Read online'))) - if self.pdf_file: - formats.append(u'PDF' % self.pdf_file.url) - if self.root_ancestor.epub_file: - formats.append(u'EPUB' % self.root_ancestor.epub_file.url) - if self.odt_file: - formats.append(u'ODT' % self.odt_file.url) - if self.txt_file: - 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) - if self.daisy_file: - formats.append(u'DAISY' % self.daisy_file.url) - + if self.has_media("pdf"): + 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) + formats = [mark_safe(format) for format in formats] setattr(self, key, unicode(render_to_string('catalogue/book_short.html', @@ -301,7 +375,7 @@ class Book(models.Model): def get_mp3_info(self): """Retrieves artist and director names from audio ID3 tags.""" - audio = id3.ID3(self.mp3_file.path) + 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} @@ -311,6 +385,7 @@ class Book(models.Model): has_description.short_description = _('description') has_description.boolean = True + # ugly ugly ugly def has_pdf_file(self): return bool(self.pdf_file) has_pdf_file.short_description = 'PDF' @@ -321,16 +396,31 @@ class Book(models.Model): has_epub_file.short_description = 'EPUB' has_epub_file.boolean = True - def has_odt_file(self): - return bool(self.odt_file) - has_odt_file.short_description = 'ODT' - has_odt_file.boolean = True - def has_html_file(self): return bool(self.html_file) has_html_file.short_description = 'HTML' has_html_file.boolean = True + def has_odt_file(self): + return bool(self.has_media("odt")) + has_odt_file.short_description = 'ODT' + has_odt_file.boolean = True + + def has_mp3_file(self): + return bool(self.has_media("mp3")) + has_mp3_file.short_description = 'MP3' + has_mp3_file.boolean = True + + def has_ogg_file(self): + return bool(self.has_media("ogg")) + has_ogg_file.short_description = 'OGG' + has_ogg_file.boolean = True + + def has_daisy_file(self): + return bool(self.has_media("daisy")) + has_daisy_file.short_description = 'DAISY' + has_daisy_file.boolean = True + def build_epub(self, remove_descendants=True): """ (Re)builds the epub file. If book has a parent, does nothing. @@ -566,8 +656,6 @@ class Book(models.Model): return self.refresh_theme_counter() return dict((int(k), v) for k, v in self.get__theme_counter_value().iteritems()) - - class Fragment(models.Model): text = models.TextField() short_text = models.TextField(editable=False) diff --git a/wolnelektury/static/css/master.css b/wolnelektury/static/css/master.css index e40d1d283..73a2cdadc 100644 --- a/wolnelektury/static/css/master.css +++ b/wolnelektury/static/css/master.css @@ -293,7 +293,7 @@ p .ac_input { margin-right: 0.5em; } -#formats .wrap a { +#formats .wrap p { display: block; width: 100%; height: 1.5em; @@ -320,7 +320,9 @@ p .ac_input { padding-top: 1em; padding-bottom: 0em; } - +li.mp3Player { + list-style-type: none; +} #formats #czytamysluchajac-logo { background: white; text-align: left; @@ -330,6 +332,7 @@ p .ac_input { -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; + margin: 0px 20px 10px 10px; } #tagged-object-list #themes-list, #book-detail #themes-list { diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html index f4e77f81f..676cc0bb6 100644 --- a/wolnelektury/templates/catalogue/book_detail.html +++ b/wolnelektury/templates/catalogue/book_detail.html @@ -40,40 +40,58 @@

{% trans "Put a book" %} {% trans "on the shelf!" %}

- {% if book.html_file %} + {% if book.has_html_file %} {% trans "Read online" %} {% endif %} - {% if book.pdf_file %} + {% if book.has_pdf_file %} {% trans "Download PDF" %} {% endif %} {% if book.root_ancestor.epub_file %} {% trans "Download EPUB" %} {% endif %} - {% if book.odt_file %} - {% trans "Download ODT" %} + {% if book.has_odt_file %} +

ODT

+ {% endif %} - {% if book.txt_file %} + {% if book.has_txt_file %} {% trans "Download TXT" %} {% endif %} - {% if book.mp3_file %} -
- -

{% trans "Artist" %}: {{ book.get_extra_info_value.artist_name }}

- {% if book.get_extra_info_value.director_name %} -

{% trans "Director" %}: {{ book.get_extra_info_value.director_name }}

- {% endif %} -
- {% endif %} - {% if book.mp3_file %}{% trans "Download MP3" %}{% endif %} - {% if book.ogg_file %}{% trans "Download Ogg Vorbis" %}{% endif %} - {% if book.daisy_file %}{% trans "Download DAISY" %}{% endif %} - {% if book.mp3_file %} - - - - - - {% endif %} + {% if book.has_ogg_file %} +

OGG

+ + {% endif %} + {% if book.has_daisy_file %} +

DAISY

+ + {% endif %} + {% if book.has_mp3_file %} +

MP3

+ + + {% endif %}
@@ -151,4 +169,4 @@

* {% trans "Loading" %}

-{% endblock %} \ No newline at end of file +{% endblock %}