You forgot XML.

[wolnelektury.git] / src / catalogue / models / book.py

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index b71926e..6e6c50f 100644 (file)
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -115,8 +115,6 @@ class Book(models.Model):
     html_built = django.dispatch.Signal()
     published = django.dispatch.Signal()
 
-    short_html_url_name = 'catalogue_book_short'
-
     class AlreadyExists(Exception):
         pass
 
@@ -231,11 +229,9 @@ class Book(models.Model):
             return '%d:%02d:%02d' % (hours, minutes, seconds)
 
     def get_audio_length(self):
-        from mutagen.mp3 import MP3
         total = 0
         for media in self.get_mp3() or ():
-            audio = MP3(media.file.path)
-            total += audio.info.length
+            total += app_settings.GET_MP3_LENGTH(media.file.path)
         return int(total)
 
     def has_media(self, type_):
@@ -754,7 +750,10 @@ class Book(models.Model):
     def fragment_data(self):
         fragment = self.choose_fragment()
         if fragment:
-            return {'title': fragment.book.pretty_title(), 'html': fragment.get_short_text()}
+            return {
+                'title': fragment.book.pretty_title(),
+                'html': re.sub('</?blockquote[^>]*>', '', fragment.get_short_text()),
+            }
         else:
             return None