X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/33af401eb4abe15a37d0147807d06a9b19eaa802..4bacdff72c8044d25066ff95719543a763844e11:/src/catalogue/models/bookmedia.py?ds=inline diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py index c08ed1152..dc02d615d 100644 --- a/src/catalogue/models/bookmedia.py +++ b/src/catalogue/models/bookmedia.py @@ -5,12 +5,11 @@ from collections import OrderedDict import json from collections import namedtuple from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from slugify import slugify import mutagen from mutagen import id3 - -from catalogue.fields import OverwriteStorage +from fnpdjango.storage import BofhFileSystemStorage def _file_upload_to(i, _n): @@ -30,6 +29,7 @@ class BookMedia(models.Model): ('mp3', FileFormat(name='MP3', ext='mp3')), ('ogg', FileFormat(name='Ogg Vorbis', ext='ogg')), ('daisy', FileFormat(name='DAISY', ext='daisy.zip')), + ('audio.epub', FileFormat(name='EPUB+audio', ext='audio.epub')), ]) format_choices = [(k, _('%s file' % t.name)) for k, t in formats.items()] @@ -37,7 +37,7 @@ class BookMedia(models.Model): name = models.CharField(_('name'), 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()) + file = models.FileField(_('file'), max_length=600, upload_to=_file_upload_to, storage=BofhFileSystemStorage()) duration = models.IntegerField(null=True, blank=True) uploaded_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False, db_index=True) project_description = models.CharField(max_length=2048, blank=True)