author/title match ordering in api filter-books + fix lektura/audiobook filters

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

diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index 098501e..15a4e2a 100644 (file)
--- a/src/catalogue/models/collection.py
+++ b/src/catalogue/models/collection.py
@@ -6,6 +6,7 @@ from django.conf import settings
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from ssify import flush_ssi_includes
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from ssify import flush_ssi_includes

+import re

 
 
 class Collection(models.Model):
 
 
 class Collection(models.Model):


@@ -17,7 +18,8 @@ class Collection(models.Model):
     models.SlugField(_('slug'), max_length=120, unique=True, db_index=True)
     book_slugs = models.TextField(_('book slugs'))
 
     models.SlugField(_('slug'), max_length=120, unique=True, db_index=True)
     book_slugs = models.TextField(_('book slugs'))
 

-    kind = models.CharField(_('kind'), max_length=10, blank=False, default='book', db_index=True, choices=((('book'), _('book')), (('picture'), ('picture'))))
+    kind = models.CharField(_('kind'), max_length=10, blank=False, default='book', db_index=True,
+                            choices=(('book', _('book')), ('picture', _('picture'))))

 
     class Meta:
         ordering = ('title',)
 
     class Meta:
         ordering = ('title',)


@@ -28,17 +30,27 @@ class Collection(models.Model):
     def __unicode__(self):
         return self.title
 
     def __unicode__(self):
         return self.title
 

+    def get_initial(self):
+        try:
+            return re.search(r'\w', self.title, re.U).group(0)
+        except AttributeError:
+            return ''
+

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

-        return ("collection", [self.slug])
+        return "collection", [self.slug]

 
     def get_query(self):
         slugs = self.book_slugs.split()
         # allow URIs
 
     def get_query(self):
         slugs = self.book_slugs.split()
         # allow URIs

-        slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug
-                    for slug in slugs]
+        # WTF
+        slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug for slug in slugs]

         return models.Q(slug__in=slugs)
 
         return models.Q(slug__in=slugs)
 

+    def get_books(self):
+        from catalogue.models import Book
+        return Book.objects.filter(self.get_query())
+

     def flush_includes(self, languages=True):
         if not languages:
             return
     def flush_includes(self, languages=True):
         if not languages:
             return