Dodanie API pozwalającego na listowanie i wgrywanie książek.

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

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 0cd19cc..2f4e7fe 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -47,6 +47,8 @@ class Tag(TagBase):
     
     user = models.ForeignKey(User, blank=True, null=True)
     book_count = models.IntegerField(_('book count'), default=0, blank=False, null=False)
     
     user = models.ForeignKey(User, blank=True, null=True)
     book_count = models.IntegerField(_('book count'), default=0, blank=False, null=False)

+    gazeta_link = models.CharField(blank=True,  max_length=240)
+    wiki_link = models.CharField(blank=True,  max_length=240)

     
     def has_description(self):
         return len(self.description) > 0
     
     def has_description(self):
         return len(self.description) > 0


@@ -88,6 +90,9 @@ class Book(models.Model):
     _short_html = models.TextField(_('short HTML'), editable=False)
     parent_number = models.IntegerField(_('parent number'), default=0)
     extra_info = JSONField(_('extra information'))
     _short_html = models.TextField(_('short HTML'), editable=False)
     parent_number = models.IntegerField(_('parent number'), default=0)
     extra_info = JSONField(_('extra information'))

+    gazeta_link = models.CharField(blank=True,  max_length=240)
+    wiki_link = models.CharField(blank=True,  max_length=240)
+

     
     # Formats
     xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True)
     
     # Formats
     xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True)


@@ -114,7 +119,7 @@ class Book(models.Model):
             return mark_safe(self._short_html)
         else:
             tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book')))
             return mark_safe(self._short_html)
         else:
             tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book')))

-            tags = [u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name) for tag in tags]
+            tags = [mark_safe(u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name)) for tag in tags]

 
             formats = []
             if self.html_file:
 
             formats = []
             if self.html_file:


@@ -130,17 +135,28 @@ class Book(models.Model):
             if self.ogg_file:
                 formats.append(u'<a href="%s">OGG</a>' % self.ogg_file.url)
             
             if self.ogg_file:
                 formats.append(u'<a href="%s">OGG</a>' % self.ogg_file.url)
             

+            formats = [mark_safe(format) for format in formats]
+            

             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}))

-            self.save()
+            self.save(reset_short_html=False)

             return mark_safe(self._short_html)
     
             return mark_safe(self._short_html)
     

-    def save(self, force_insert=False, force_update=False):
+    def save(self, force_insert=False, force_update=False, reset_short_html=True):
+        if reset_short_html:
+            # Reset _short_html during save
+            self._short_html = ''
+        
+        book = super(Book, self).save(force_insert, force_update)
+        

         if self.mp3_file:
         if self.mp3_file:

+            print self.mp3_file, self.mp3_file.path

             extra_info = self.get_extra_info_value()
             extra_info.update(self.get_mp3_info())
             self.set_extra_info_value(extra_info)
             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)
+            book = super(Book, self).save(force_insert, force_update)
+        
+        return book

     
     def get_mp3_info(self):
         """Retrieves artist and director names from audio ID3 tags."""
     
     def get_mp3_info(self):
         """Retrieves artist and director names from audio ID3 tags."""


@@ -224,11 +240,14 @@ class Book(models.Model):
         if hasattr(book_info, 'parts'):
             for n, part_url in enumerate(book_info.parts):
                 base, slug = part_url.rsplit('/', 1)
         if hasattr(book_info, 'parts'):
             for n, part_url in enumerate(book_info.parts):
                 base, slug = part_url.rsplit('/', 1)

-                child_book = Book.objects.get(slug=slug)
-                child_book.parent = book
-                child_book.parent_number = n
-                child_book.save()
-
+                try:
+                    child_book = Book.objects.get(slug=slug)
+                    child_book.parent = book
+                    child_book.parent_number = n
+                    child_book.save()
+                except Book.DoesNotExist, e:
+                    raise Book.DoesNotExist(u'Book with slug = "%s" does not exist.' % slug)
+        

         book_descendants = list(book.children.all())
         while len(book_descendants) > 0:
             child_book = book_descendants.pop(0)
         book_descendants = list(book.children.all())
         while len(book_descendants) > 0:
             child_book = book_descendants.pop(0)


@@ -307,7 +326,7 @@ class Fragment(models.Model):
         if len(self._short_html):
             return mark_safe(self._short_html)
         else:
         if len(self._short_html):
             return mark_safe(self._short_html)
         else:

-            book_authors = [u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name) 
+            book_authors = [mark_safe(u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name)) 

                 for tag in self.book.tags if tag.category == 'author']
             
             self._short_html = unicode(render_to_string('catalogue/fragment_short.html',
                 for tag in self.book.tags if tag.category == 'author']
             
             self._short_html = unicode(render_to_string('catalogue/fragment_short.html',