X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/a2e0b275015cd104c63296a174e2c219251d1e21..cfbd4683aa50fb51882aa0ab825492b2dd49b142:/src/catalogue/models/bookmedia.py?ds=inline diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py index 67d02790c..377dbc43c 100644 --- a/src/catalogue/models/bookmedia.py +++ b/src/catalogue/models/bookmedia.py @@ -8,14 +8,14 @@ from collections import namedtuple from django.db import models from django.utils.translation import ugettext_lazy as _ import jsonfield -from fnpdjango.utils.text.slughifi import slughifi +from slugify import slugify from mutagen import MutagenError from catalogue.fields import OverwriteStorage def _file_upload_to(i, _n): - return 'book/%(ext)s/%(name)s.%(ext)s' % {'ext': i.ext(), 'name': slughifi(i.name)} + return 'book/%(ext)s/%(name)s.%(ext)s' % {'ext': i.ext(), 'name': slugify(i.name)} class BookMedia(models.Model): @@ -30,7 +30,7 @@ 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) + part_name = models.CharField(_('part name'), default='', blank=True, max_length=512) index = models.IntegerField(_('index'), default=0) file = models.FileField(_('file'), max_length=600, upload_to=_file_upload_to, storage=OverwriteStorage()) uploaded_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False, db_index=True) @@ -47,10 +47,11 @@ class BookMedia(models.Model): verbose_name_plural = _('book media') app_label = 'catalogue' - def save(self, *args, **kwargs): + def save(self, parts_count=None, *args, **kwargs): from catalogue.utils import ExistingFile, remove_zip - parts_count = 1 + BookMedia.objects.filter(book=self.book, type=self.type).exclude(pk=self.pk).count() + if not parts_count: + parts_count = 1 + BookMedia.objects.filter(book=self.book, type=self.type).exclude(pk=self.pk).count() if parts_count == 1: self.name = self.book.pretty_title() else: @@ -65,7 +66,7 @@ class BookMedia(models.Model): old = None else: # if name changed, change the file name, too - if slughifi(self.name) != slughifi(old.name): + if slugify(self.name) != slugify(old.name): self.file.save(None, ExistingFile(self.file.path), save=False) super(BookMedia, self).save(*args, **kwargs)