X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92..66b7d6b916e07ee0bb89537e29ff7b4b1bae86d9:/src/catalogue/models/bookmedia.py diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py index 1f984a044..2cc1a874e 100644 --- a/src/catalogue/models/bookmedia.py +++ b/src/catalogue/models/bookmedia.py @@ -30,6 +30,8 @@ class BookMedia(models.Model): type = models.CharField(_('type'), db_index=True, choices=format_choices, max_length=20) name = models.CharField(_('name'), max_length=512) + part_name = models.CharField(_('part name'), default='', max_length=512) + index = models.IntegerField(_('index'), default=0) file = OverwritingFileField(_('file'), max_length=600, upload_to=_file_upload_to) uploaded_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False, db_index=True) extra_info = jsonfield.JSONField(_('extra information'), default={}, editable=False) @@ -48,6 +50,15 @@ class BookMedia(models.Model): def save(self, *args, **kwargs): from catalogue.utils import ExistingFile, remove_zip + parts_count = BookMedia.objects.filter(book=self.book, type=self.type).count() + if parts_count == 1: + self.name = self.book.pretty_title() + else: + no = ('%02d' if parts_count < 100 else '%03d') % self.index + self.name = '%s. %s' % (no, self.book.pretty_title()) + if self.part_name: + self.name += ', ' + self.part_name + try: old = BookMedia.objects.get(pk=self.pk) except BookMedia.DoesNotExist: @@ -124,13 +135,13 @@ class BookMedia(models.Model): audio = id3.ID3(filepath) return [t.data for t in audio.getall('PRIV') if t.owner == 'wolnelektury.pl?flac_sha1'][0] - except MutagenError: + except (MutagenError, IndexError): return None elif filetype == 'ogg': try: audio = mutagen.File(filepath) return audio.get('flac_sha1', [None])[0] - except (MutagenError, AttributeError): + except (MutagenError, AttributeError, IndexError): return None else: return None