From: Jan Szejko <janek37@gmail.com>
Date: Thu, 14 Dec 2017 08:43:33 +0000 (+0100)
Subject: Merge branch 'api'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/63f861861578b33416a0b2d801252b27443fabde?hp=-c

Merge branch 'api'
---

63f861861578b33416a0b2d801252b27443fabde
diff --combined src/catalogue/models/book.py
index 02278de67,00921b899..140ba50f9
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@@ -21,7 -21,7 +21,7 @@@ from newtagging import manager
  from catalogue import constants
  from catalogue.fields import EbookField
  from catalogue.models import Tag, Fragment, BookMedia
 -from catalogue.utils import create_zip, gallery_url, gallery_path
 +from catalogue.utils import create_zip, gallery_url, gallery_path, split_tags
  from catalogue.models.tag import prefetched_relations
  from catalogue import app_settings
  from catalogue import tasks
@@@ -55,7 -55,7 +55,7 @@@ class Book(models.Model)
      language = models.CharField(_('language code'), max_length=3, db_index=True, default=app_settings.DEFAULT_LANGUAGE)
      description = models.TextField(_('description'), blank=True)
      created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
 -    changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
 +    changed_at = models.DateTimeField(_('change date'), auto_now=True, db_index=True)
      parent_number = models.IntegerField(_('parent number'), default=0)
      extra_info = jsonfield.JSONField(_('extra information'), default={})
      gazeta_link = models.CharField(blank=True, max_length=240)
@@@ -81,6 -81,9 +81,9 @@@
      parent = models.ForeignKey('self', blank=True, null=True, related_name='children')
      ancestor = models.ManyToManyField('self', blank=True, editable=False, related_name='descendant', symmetrical=False)
  
+     cached_author = models.CharField(blank=True, max_length=240, db_index=True)
+     has_audience = models.BooleanField(default=False)
+ 
      objects = models.Manager()
      tagged = managers.ModelTaggedItemManager(Tag)
      tags = managers.TagDescriptor(Tag)
@@@ -119,11 -122,8 +122,11 @@@
          else:
              return ', '.join(self.tags.filter(category=category).values_list('name', flat=True))
  
 +    def tags_by_category(self):
 +        return split_tags(self.tags.exclude(category__in=('set', 'theme')))
 +
      def author_unicode(self):
-         return self.tag_unicode('author')
+         return self.cached_author
  
      def translator(self):
          translators = self.extra_info.get('translators')
@@@ -136,6 -136,9 +139,9 @@@
              others = ''
          return ', '.join(u'\xa0'.join(reversed(translator.split(', ', 1))) for translator in translators) + others
  
+     def cover_source(self):
+         return self.extra_info.get('cover_source', self.parent.cover_source() if self.parent else '')
+ 
      def save(self, force_insert=False, force_update=False, **kwargs):
          from sortify import sortify
  
@@@ -148,6 -151,9 +154,9 @@@
              author = u''
          self.sort_key_author = author
  
+         self.cached_author = self.tag_unicode('author')
+         self.has_audience = 'audience' in self.extra_info
+ 
          ret = super(Book, self).save(force_insert, force_update, **kwargs)
  
          return ret
@@@ -228,33 -234,6 +237,33 @@@
      has_daisy_file.short_description = 'DAISY'
      has_daisy_file.boolean = True
  
 +    def get_audiobooks(self):
 +        ogg_files = {}
 +        for m in self.media.filter(type='ogg').order_by().iterator():
 +            ogg_files[m.name] = m
 +
 +        audiobooks = []
 +        projects = set()
 +        for mp3 in self.media.filter(type='mp3').iterator():
 +            # ogg files are always from the same project
 +            meta = mp3.extra_info
 +            project = meta.get('project')
 +            if not project:
 +                # temporary fallback
 +                project = u'CzytamySłuchając'
 +
 +            projects.add((project, meta.get('funded_by', '')))
 +
 +            media = {'mp3': mp3}
 +
 +            ogg = ogg_files.get(mp3.name)
 +            if ogg:
 +                media['ogg'] = ogg
 +            audiobooks.append(media)
 +
 +        projects = sorted(projects)
 +        return audiobooks, projects
 +
      def wldocument(self, parse_dublincore=True, inherit=True):
          from catalogue.import_utils import ORMDocProvider
          from librarian.parser import WLDocument
@@@ -636,6 -615,13 +645,13 @@@
          else:
              return None
  
+     def fragment_data(self):
+         fragment = self.choose_fragment()
+         if fragment:
+             return {'title': fragment.book.pretty_title(), 'html': fragment.get_short_text()}
+         else:
+             return None
+ 
      def update_popularity(self):
          count = self.tags.filter(category='set').values('user').order_by('user').distinct().count()
          try: