Merge branch 'master' of git@github.com:fnp/wolnelektury

[wolnelektury.git] / apps / catalogue / migrations / 0005_many2many_files_for_books.py

diff --git a/apps/catalogue/migrations/0005_many2many_files_for_books.py b/apps/catalogue/migrations/0005_many2many_files_for_books.py
index bbe9e70..cf72b2c 100644 (file)
--- a/apps/catalogue/migrations/0005_many2many_files_for_books.py
+++ b/apps/catalogue/migrations/0005_many2many_files_for_books.py
@@ -7,24 +7,36 @@ from django.db import models
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
+        # Saving data which would be 'Lost In Migration'
+        if not db.dry_run:        
+            medias = []
+            for book in orm.Book.objects.all():
+                try:
+                    medias.append({"url": book.odt_file.url,   "book": book, "type": "odt"  })
+                except:
+                    pass
+                try:
+                    medias.append({"url": book.daisy_file.url, "book": book, "type": "daisy"})
+                except:
+                    pass
+                try:
+                    medias.append({"url": book.ogg_file.url,   "book": book, "type": "ogg"  })
+                except:
+                    pass
+                try:
+                    medias.append({"url": book.mp3_file.url,   "book": book, "type": "mp3"  })            
+                except:
+                    pass
+
         # 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')),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length='100', blank=True)),
             ('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')
@@ -197,7 +209,7 @@ class Migration(SchemaMigration):
             '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'}),
+            'sort_key': ('django.db.models.fields.CharField', [], {'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'})
         },