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 ec3c32e..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 newtagging.models import TagBase
 from newtagging import managers

+from catalogue.fields import JSONField

 
 from librarian import html, dcparser
 
 
 from librarian import html, dcparser
 


@@ -41,9 +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'))
         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)
     user = models.ForeignKey(User, blank=True, null=True)

-    book_count = models.IntegerField(_('book count'))
+    book_count = models.IntegerField(_('book count'), default=0, blank=False, null=False)

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


@@ -84,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)
     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)
     
     # Formats
     xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True)


@@ -97,6 +99,7 @@ class Book(models.Model):
     objects = models.Manager()
     tagged = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
     objects = models.Manager()
     tagged = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)

+

     
     @property
     def name(self):
     
     @property
     def name(self):


@@ -157,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)
         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 = ''
         
         book.title = book_info.title
         book._short_html = ''


@@ -224,7 +233,7 @@ class Book(models.Model):
                 book_themes += themes
             
             book_themes = set(book_themes)
                 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
         
         book.save()
         return book