better ordering of fundings

[wolnelektury.git] / src / catalogue / models / bookmedia.py

diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py
index 2cc1a87..6b65080 100644 (file)
--- a/src/catalogue/models/bookmedia.py
+++ b/src/catalogue/models/bookmedia.py
@@ -11,7 +11,7 @@ import jsonfield
 from fnpdjango.utils.text.slughifi import slughifi
 from mutagen import MutagenError
 
 from fnpdjango.utils.text.slughifi import slughifi
 from mutagen import MutagenError
 

-from catalogue.fields import OverwritingFileField
+from catalogue.fields import OverwriteStorage

 
 
 def _file_upload_to(i, _n):
 
 
 def _file_upload_to(i, _n):


@@ -30,9 +30,9 @@ class BookMedia(models.Model):
 
     type = models.CharField(_('type'), db_index=True, choices=format_choices, max_length=20)
     name = models.CharField(_('name'), max_length=512)
 
     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)
     index = models.IntegerField(_('index'), default=0)

-    file = OverwritingFileField(_('file'), max_length=600, upload_to=_file_upload_to)
+    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)
     extra_info = jsonfield.JSONField(_('extra information'), default={}, editable=False)
     book = models.ForeignKey('Book', related_name='media')
     uploaded_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False, db_index=True)
     extra_info = jsonfield.JSONField(_('extra information'), default={}, editable=False)
     book = models.ForeignKey('Book', related_name='media')


@@ -47,10 +47,11 @@ class BookMedia(models.Model):
         verbose_name_plural = _('book media')
         app_label = 'catalogue'
 
         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
 
         from catalogue.utils import ExistingFile, remove_zip
 

-        parts_count = BookMedia.objects.filter(book=self.book, type=self.type).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:
         if parts_count == 1:
             self.name = self.book.pretty_title()
         else:


@@ -66,7 +67,7 @@ class BookMedia(models.Model):
         else:
             # if name changed, change the file name, too
             if slughifi(self.name) != slughifi(old.name):
         else:
             # if name changed, change the file name, too
             if slughifi(self.name) != slughifi(old.name):

-                self.file.save(None, ExistingFile(self.file.path), save=False, leave=True)
+                self.file.save(None, ExistingFile(self.file.path), save=False)

 
         super(BookMedia, self).save(*args, **kwargs)
 
 
         super(BookMedia, self).save(*args, **kwargs)