Removed unneeded dispatcher import from catalogue.fields module.

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

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 30131bd..2022f1c 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -10,6 +10,7 @@ from django.core.urlresolvers import reverse
 
 from newtagging.models import TagBase
 from newtagging import managers
+from catalogue.fields import JSONField
 
 from librarian import html, dcparser
 
@@ -41,8 +42,9 @@ class Tag(TagBase):
         db_index=True, choices=TAG_CATEGORIES)
     description = models.TextField(_('description'), blank=True)
     main_page = models.BooleanField(_('main page'), default=False, db_index=True, help_text=_('Show tag on main page'))
-        
+    
     user = models.ForeignKey(User, blank=True, null=True)
+    book_count = models.IntegerField(_('book count'), default=0, blank=False, null=False)
     
     def has_description(self):
         return len(self.description) > 0
@@ -83,6 +85,7 @@ class Book(models.Model):
     created_at = models.DateTimeField(_('creation date'), auto_now=True)
     _short_html = models.TextField(_('short HTML'), editable=False)
     parent_number = models.IntegerField(_('parent number'), default=0)
+    extra_info = JSONField(_('extra information'))
     
     # Formats
     xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True)
@@ -96,6 +99,11 @@ class Book(models.Model):
     objects = models.Manager()
     tagged = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
+
+    
+    @property
+    def name(self):
+        return self.title
     
     def short_html(self):
         if len(self._short_html):
@@ -111,8 +119,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)
-            if self.odt_file:
-                formats.
+            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}))
@@ -152,8 +160,14 @@ class Book(models.Model):
         book_info = dcparser.parse(xml_file)
         book_base, book_slug = book_info.url.rsplit('/', 1)
         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)
+        
+        if created:
+            book_shelves = []
+        else:
+            if not overwrite:
+                raise Book.AlreadyExists('Book %s already exists' % book_slug)
+            # Save shelves for this book
+            book_shelves = list(book.tags.filter(category='set'))
         
         book.title = book_info.title
         book._short_html = ''
@@ -198,7 +212,8 @@ class Book(models.Model):
                 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)
+                new_fragment, created = Fragment.objects.get_or_create(anchor=fragment.id, book=book, 
+                    defaults={'text': text, 'short_text': short_text})
                 
                 try:
                     theme_names = [s.strip() for s in fragment.themes.split(',')]
@@ -218,7 +233,7 @@ class Book(models.Model):
                 book_themes += themes
             
             book_themes = set(book_themes)
-            book.tags = list(book.tags) + list(book_themes)
+            book.tags = list(book.tags) + list(book_themes) + book_shelves
         
         book.save()
         return book