Fixed bug in table of contents rendering in book reader.

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

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 2a93873..9640e7f 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -111,6 +111,8 @@ class Book(models.Model):
                 formats.append(u'<a href="%s">Plik PDF</a>' % self.pdf_file.url)
             if self.odt_file:
                 formats.append(u'<a href="%s">Plik ODT</a>' % self.odt_file.url)
                 formats.append(u'<a href="%s">Plik PDF</a>' % self.pdf_file.url)
             if self.odt_file:
                 formats.append(u'<a href="%s">Plik ODT</a>' % self.odt_file.url)

+            if self.txt_file:
+                formats.append(u'<a href="%s">Plik TXT</a>' % self.txt_file.url)

             
             self._short_html = unicode(render_to_string('catalogue/book_short.html',
                 {'book': self, 'tags': tags, 'formats': formats}))
             
             self._short_html = unicode(render_to_string('catalogue/book_short.html',
                 {'book': self, 'tags': tags, 'formats': formats}))


@@ -137,8 +139,11 @@ class Book(models.Model):
     has_html_file.short_description = 'HTML'
     has_html_file.boolean = True
 
     has_html_file.short_description = 'HTML'
     has_html_file.boolean = True
 

+    class AlreadyExists(Exception):
+        pass
+    

     @staticmethod
     @staticmethod

-    def from_xml_file(xml_file):
+    def from_xml_file(xml_file, overwrite=False):

         from tempfile import NamedTemporaryFile
         from slughifi import slughifi
         from markupstring import MarkupString
         from tempfile import NamedTemporaryFile
         from slughifi import slughifi
         from markupstring import MarkupString


@@ -146,7 +151,12 @@ class Book(models.Model):
         # Read book metadata
         book_info = dcparser.parse(xml_file)
         book_base, book_slug = book_info.url.rsplit('/', 1)
         # Read book metadata
         book_info = dcparser.parse(xml_file)
         book_base, book_slug = book_info.url.rsplit('/', 1)

-        book = Book(title=book_info.title, slug=book_slug)
+        book, created = Book.objects.get_or_create(slug=book_slug)
+        if not created and not overwrite:
+            raise Book.AlreadyExists('Book %s already exists' % book_slug)
+        
+        book.title = book_info.title
+        book._short_html = ''

         book.save()
         
         book_tags = []
         book.save()
         
         book_tags = []


@@ -177,39 +187,41 @@ class Book(models.Model):
         book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False)
         
         html_file = NamedTemporaryFile()
         book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False)
         
         html_file = NamedTemporaryFile()

-        html.transform(book.xml_file.path, html_file)
-        book.html_file.save('%s.html' % book.slug, File(html_file), save=False)
-        
-        # Extract fragments
-        closed_fragments, open_fragments = html.extract_fragments(book.html_file.path)
-        book_themes = []
-        for fragment in closed_fragments.values():
-            text = fragment.to_string()
-            short_text = ''
-            if (len(MarkupString(text)) > 240):
-                short_text = unicode(MarkupString(text)[:160])
-            new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book)
+        if html.transform(book.xml_file.path, html_file):
+            book.html_file.save('%s.html' % book.slug, File(html_file), save=False)

             
             

-            try:
-                theme_names = [s.strip() for s in fragment.themes.split(',')]
-            except AttributeError:
-                continue
-            themes = []
-            for theme_name in theme_names:
-                tag, created = Tag.objects.get_or_create(slug=slughifi(theme_name))
-                if created:
-                    tag.name = theme_name
-                    tag.sort_key = slughifi(theme_name)
-                    tag.category = 'theme'
-                    tag.save()
-                themes.append(tag)
-            new_fragment.save()
-            new_fragment.tags = list(book.tags) + themes
-            book_themes += themes
+            # Extract fragments
+            closed_fragments, open_fragments = html.extract_fragments(book.html_file.path)
+            book_themes = []
+            for fragment in closed_fragments.values():
+                text = fragment.to_string()
+                short_text = ''
+                if (len(MarkupString(text)) > 240):
+                    short_text = unicode(MarkupString(text)[:160])
+                new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book)
+                
+                try:
+                    theme_names = [s.strip() for s in fragment.themes.split(',')]
+                except AttributeError:
+                    continue
+                themes = []
+                for theme_name in theme_names:
+                    tag, created = Tag.objects.get_or_create(slug=slughifi(theme_name))
+                    if created:
+                        tag.name = theme_name
+                        tag.sort_key = slughifi(theme_name)
+                        tag.category = 'theme'
+                        tag.save()
+                    themes.append(tag)
+                new_fragment.save()
+                new_fragment.tags = list(book.tags) + themes
+                book_themes += themes
+            
+            book_themes = set(book_themes)
+            book.tags = list(book.tags) + list(book_themes)

         
         

-        book_themes = set(book_themes)
-        book.tags = list(book.tags) + list(book_themes)
-        return book.save()
+        book.save()
+        return book

     
     @permalink
     def get_absolute_url(self):
     
     @permalink
     def get_absolute_url(self):


@@ -248,7 +260,7 @@ class Fragment(models.Model):
             return mark_safe(self._short_html)
     
     def get_absolute_url(self):
             return mark_safe(self._short_html)
     
     def get_absolute_url(self):

-        return '%s#m%s' % (self.book.html_file.url, self.anchor)
+        return '%s#m%s' % (reverse('book_text', kwargs={'slug': self.book.slug}), self.anchor)

     
     class Meta:
         ordering = ('book', 'anchor',)
     
     class Meta:
         ordering = ('book', 'anchor',)