X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1799a9fde9bb34e2c54e94eb0d15472dd53ca4e6..90b19d6345ba7e64c666aca728ca6fc351c37995:/src/catalogue/models/book.py?ds=inline diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py index b1684f930..ab7a59106 100644 --- a/src/catalogue/models/book.py +++ b/src/catalogue/models/book.py @@ -268,9 +268,17 @@ class Book(models.Model): sibling = self.parent.children.filter(parent_number__lt=self.parent_number).order_by('-parent_number').first() if sibling is not None: return sibling.get_last_text() + + if self.parent.html_file: + return self.parent + return self.parent.get_prev_text() def get_next_text(self): + child = self.children.order_by('parent_number').first() + if child is not None: + return child.get_first_text() + if not self.parent: return None sibling = self.parent.children.filter(parent_number__gt=self.parent_number).order_by('parent_number').first() @@ -283,6 +291,9 @@ class Book(models.Model): return [] return self.parent.children.all().order_by('parent_number') + def get_children(self): + return self.children.all().order_by('parent_number') + @property def name(self): return self.title @@ -740,6 +751,15 @@ class Book(models.Model): b.ancestor.add(parent) parent = parent.parent + @property + def ancestors(self): + if self.parent: + for anc in self.parent.ancestors: + yield anc + yield self.parent + else: + return [] + def clear_cache(self): clear_cached_renders(self.mini_box) clear_cached_renders(self.mini_box_nolink) @@ -885,19 +905,27 @@ class Book(models.Model): else: return None, None - def choose_fragment(self): + def choose_fragments(self, number): fragments = self.fragments.order_by() fragments_count = fragments.count() if not fragments_count and self.children.exists(): fragments = Fragment.objects.filter(book__ancestor=self).order_by() fragments_count = fragments.count() if fragments_count: - return fragments[randint(0, fragments_count - 1)] + offset = randint(0, fragments_count - number) + return fragments[offset : offset + number] elif self.parent: - return self.parent.choose_fragment() + return self.parent.choose_fragments(number) else: - return None + return [] + def choose_fragment(self): + fragments = self.choose_fragments(1) + if fragments: + return fragments[0] + else: + return None + def fragment_data(self): fragment = self.choose_fragment() if fragment: