Fixed importing books from Django admin.

[wolnelektury.git] / apps / catalogue / models.py

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 7be0f82..6ab090d 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -13,6 +13,7 @@ from newtagging import managers
 from catalogue.fields import JSONField
 
 from librarian import html, dcparser
+from mutagen import id3
 
 
 TAG_CATEGORIES = (
@@ -130,6 +131,20 @@ class Book(models.Model):
             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')
@@ -173,7 +188,7 @@ class Book(models.Model):
             book_shelves = list(book.tags.filter(category='set'))
         
         book.title = book_info.title
-        book.extra_info = book_info.to_dict()
+        book.set_extra_info_value(book_info.to_dict())
         book._short_html = ''
         book.save()
         
@@ -218,7 +233,9 @@ class Book(models.Model):
             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):