X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c4e9b9e65d8950259e37be9aa87d6be0304263b6..eb2eb95bfbfe8c777c4192ea434a0e999edf3a51:/src/catalogue/models/book.py diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py index 9f0576c5d..1be9a9f3c 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 @@ -479,7 +490,7 @@ class Book(models.Model): def zip_audiobooks(self, format_): bm = BookMedia.objects.filter(book=self, type=format_) - paths = map(lambda bm: (None, bm.file.path), bm) + paths = map(lambda bm: (bm.get_nice_filename(), bm.file.path), bm) licenses = set() for m in bm: license = constants.LICENSES.get(