From dd48571cf22a0c124b382a1c26f25204aefd05f3 Mon Sep 17 00:00:00 2001 From: Lukasz Anwajler Date: Mon, 15 Nov 2010 09:11:11 -0600 Subject: [PATCH] Many files to book - improvements --- .../0004_many2many_files_for_books.py | 28 ++- .../0005_many2many_files_for_books.py | 220 ++++++++++++++++++ apps/catalogue/models.py | 3 +- apps/catalogue/views.py | 36 +-- .../templates/catalogue/main_page.html | 8 +- 5 files changed, 269 insertions(+), 26 deletions(-) rename apps/catalogue/{migrations => }/0004_many2many_files_for_books.py (92%) create mode 100644 apps/catalogue/migrations/0005_many2many_files_for_books.py diff --git a/apps/catalogue/migrations/0004_many2many_files_for_books.py b/apps/catalogue/0004_many2many_files_for_books.py similarity index 92% rename from apps/catalogue/migrations/0004_many2many_files_for_books.py rename to apps/catalogue/0004_many2many_files_for_books.py index e44f04a9b..bbe9e7058 100644 --- a/apps/catalogue/migrations/0004_many2many_files_for_books.py +++ b/apps/catalogue/0004_many2many_files_for_books.py @@ -7,7 +7,6 @@ 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)), @@ -17,9 +16,15 @@ class Migration(SchemaMigration): ('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') + + # Saving data which would be 'Lost In Migration' + if not db.dry_run: + medias = [] + for book in orm.Book.objects.all(): + medias.append({"url": book.odt_file, "book": book, "type": "odt" }) + medias.append({"url": book.daisy_file, "book": book, "type": "daisy"}) + medias.append({"url": book.ogg_file, "book": book, "type": "ogg" }) + medias.append({"url": book.mp3_file, "book": book, "type": "mp3" }) # Deleting field 'Book.odt_file' db.delete_column('catalogue_book', 'odt_file') @@ -44,15 +49,21 @@ class Migration(SchemaMigration): # Changing field 'Tag.main_page' db.alter_column('catalogue_tag', 'main_page', self.gf('django.db.models.fields.BooleanField')(blank=True)) - + # Moving data from previous state to the new one + if not db.dry_run: + for media in medias: + try: + name = media['url'].split("/")[-1].split(".")[1] + except: + name = media['url'].split("/")[-1] + bookMedia = orm.BookMedia.objects.create(file=media['url'], type=media['type'], name=name) + media['book'].medias.add(bookMedia) + 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) @@ -128,6 +139,7 @@ class Migration(SchemaMigration): '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'}), + 'txt_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), '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'}) }, diff --git a/apps/catalogue/migrations/0005_many2many_files_for_books.py b/apps/catalogue/migrations/0005_many2many_files_for_books.py new file mode 100644 index 000000000..bbe9e7058 --- /dev/null +++ b/apps/catalogue/migrations/0005_many2many_files_for_books.py @@ -0,0 +1,220 @@ +# 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']) + + # Saving data which would be 'Lost In Migration' + if not db.dry_run: + medias = [] + for book in orm.Book.objects.all(): + medias.append({"url": book.odt_file, "book": book, "type": "odt" }) + medias.append({"url": book.daisy_file, "book": book, "type": "daisy"}) + medias.append({"url": book.ogg_file, "book": book, "type": "ogg" }) + medias.append({"url": book.mp3_file, "book": book, "type": "mp3" }) + + # 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)) + + # Moving data from previous state to the new one + if not db.dry_run: + for media in medias: + try: + name = media['url'].split("/")[-1].split(".")[1] + except: + name = media['url'].split("/")[-1] + bookMedia = orm.BookMedia.objects.create(file=media['url'], type=media['type'], name=name) + media['book'].medias.add(bookMedia) + + def backwards(self, orm): + + # Deleting model 'BookMedia' + db.delete_table('catalogue_bookmedia') + + # 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'}), + 'txt_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'blank': 'True'}), + '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 1e85cdf01..f811461be 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -173,7 +173,7 @@ 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(filename), ext) + return 'lektura/%s.%s' % (slugify(media.name), ext) return get_dynamic_path @@ -206,6 +206,7 @@ class Book(models.Model): 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) + txt_file = models.FileField(_('TXT file'), upload_to=book_upload_path('txt'), blank=True) # other files medias = models.ManyToManyField(BookMedia) diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index de522e2c9..227f40235 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -31,7 +31,7 @@ from django.utils.http import urlquote_plus from django.views.decorators import cache from django.utils.translation import ugettext as _ from django.views.generic.list_detail import object_list - +from django.template.defaultfilters import slugify from catalogue import models from catalogue import forms from catalogue.utils import split_tags @@ -83,7 +83,7 @@ def book_list(request, filter=None, template_name='catalogue/book_list.html'): books_by_parent = {} books = models.Book.objects.all().order_by('parent_number', 'title').only('title', 'parent', 'slug') if filter: - books = books.filter(filter) + books = books.filter(filter).distinct() book_ids = set((book.pk for book in books)) for book in books: parent = book.parent_id @@ -117,12 +117,12 @@ def book_list(request, filter=None, template_name='catalogue/book_list.html'): def audiobook_list(request): - return book_list(request, ~Q(mp3_file='') | ~Q(ogg_file=''), + return book_list(request, Q(medias__type='mp3') | Q(medias__type='ogg'), template_name='catalogue/audiobook_list.html') def daisy_list(request): - return book_list(request, ~Q(daisy_file=''), + return book_list(request, Q(medias__type='daisy'), template_name='catalogue/daisy_list.html') @@ -574,21 +574,25 @@ def download_shelf(request, slug): filename = book.root_ancestor.epub_file.path archive.write(filename, str('%s.epub' % book.root_ancestor.slug)) already.add(book.root_ancestor) - if 'odt' in formats and book.odt_file: - filename = book.odt_file.path - archive.write(filename, str('%s.odt' % book.slug)) + if 'odt' in formats and book.has_media("odt"): + for file in book.get_media("odt"): + filename = file.file.path + archive.write(filename, str('%s.odt' % slugify(file.name))) if 'txt' in formats and book.txt_file: filename = book.txt_file.path archive.write(filename, str('%s.txt' % book.slug)) - if 'mp3' in formats and book.mp3_file: - filename = book.mp3_file.path - archive.write(filename, str('%s.mp3' % book.slug)) - if 'ogg' in formats and book.ogg_file: - filename = book.ogg_file.path - archive.write(filename, str('%s.ogg' % book.slug)) - if 'daisy' in formats and book.daisy_file: - filename = book.daisy_file.path - archive.write(filename, str('%s.daisy.zip' % book.slug)) + if 'mp3' in formats and book.has_media("mp3"): + for file in book.get_media("mp3"): + filename = file.file.path + archive.write(filename, str('%s.mp3' % slugify(file.name))) + if 'ogg' in formats and book.has_media("ogg"): + for file in book.get_media("ogg"): + filename = file.file.path + archive.write(filename, str('%s.ogg' % slugify(file.name))) + if 'daisy' in formats and book.has_media("daisy"): + for file in book.get_media("daisy"): + filename = file.file.path + archive.write(filename, str('%s.daisy' % slugify(file.name))) archive.close() response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed') diff --git a/wolnelektury/templates/catalogue/main_page.html b/wolnelektury/templates/catalogue/main_page.html index 3a36ba7a6..bda0bc143 100644 --- a/wolnelektury/templates/catalogue/main_page.html +++ b/wolnelektury/templates/catalogue/main_page.html @@ -23,7 +23,13 @@

↓ {% trans "Browse books by categories" %} ↓

epub: lektury w kieszeni

- +

{% trans "Books for every school level" %}

+ +

Leśmianator — poeta automagiczny

Poezja z Wolnych Lektur przepuszczona przez mikser. Stwórz własny wiersz klikając w link.

{% trans "Twórzże się!" %} ⇒

-- 2.20.1