From: Radek Czajka <rczajka@rczajka.pl>
Date: Wed, 23 Dec 2020 09:23:16 +0000 (+0100)
Subject: Fixes #4145: duplicate audio parts.
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/e7ffe0d783233c99ba1ec73f594f444933bb3aca?ds=inline

Fixes #4145: duplicate audio parts.
---

diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py
index 7aa2bddf7..010512ad2 100644
--- a/src/catalogue/models/bookmedia.py
+++ b/src/catalogue/models/bookmedia.py
@@ -13,7 +13,13 @@ from catalogue.fields import OverwriteStorage
 
 
 def _file_upload_to(i, _n):
-    return 'book/%(ext)s/%(name)s.%(ext)s' % {'ext': i.ext(), 'name': slugify(i.name)}
+    name = i.book.slug
+    if i.index:
+        name += f'_{i.index:03d}'
+    if i.part_name:
+        name += f'_' + slugify(i.part_name)
+    ext = i.ext()
+    return f'book/{ext}/{name}.{ext}'
 
 
 class BookMedia(models.Model):
@@ -37,10 +43,10 @@ class BookMedia(models.Model):
     source_sha1 = models.CharField(null=True, blank=True, max_length=40, editable=False)
 
     def __str__(self):
-        return "%s (%s)" % (self.name, self.file.name.split("/")[-1])
+        return self.file.name.split("/")[-1]
 
     class Meta:
-        ordering = ('type', 'name')
+        ordering = ('type', 'index')
         verbose_name = _('book media')
         verbose_name_plural = _('book media')
         app_label = 'catalogue'