X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/eb2eb95bfbfe8c777c4192ea434a0e999edf3a51..e2a460b0a960df9482701ab10ec135a5cc3c69ac:/src/catalogue/models/book.py

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index 1be9a9f3c..ee8595588 100644
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -751,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)
@@ -896,19 +905,30 @@ 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)]
+            if fragments_count > number:
+                offset = randint(0, fragments_count - number)
+            else:
+                offset = 0
+            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: