X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/45cd3b5d049c214e83c74470fe1877513d4b2ca5..0fe31ea9418a81ad0418d0cf91c988a959502e4f:/src/catalogue/models/bookmedia.py diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py index 2cc1a874e..d1f2bf04d 100644 --- a/src/catalogue/models/bookmedia.py +++ b/src/catalogue/models/bookmedia.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # @@ -7,15 +6,14 @@ import json 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 OverwritingFileField +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,15 +28,15 @@ 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 = 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') + extra_info = models.TextField(_('extra information'), default='{}', editable=False) + book = models.ForeignKey('Book', models.CASCADE, related_name='media') source_sha1 = models.CharField(null=True, blank=True, max_length=40, editable=False) - def __unicode__(self): + def __str__(self): return "%s (%s)" % (self.name, self.file.name.split("/")[-1]) class Meta: @@ -47,10 +45,14 @@ class BookMedia(models.Model): verbose_name_plural = _('book media') app_label = 'catalogue' - def save(self, *args, **kwargs): + def get_extra_info_json(self): + return json.loads(self.extra_info or '{}') + + def save(self, parts_count=None, *args, **kwargs): 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: @@ -65,8 +67,8 @@ class BookMedia(models.Model): old = None 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) + if slugify(self.name) != slugify(old.name): + self.file.save(None, ExistingFile(self.file.path), save=False) super(BookMedia, self).save(*args, **kwargs) @@ -75,12 +77,9 @@ class BookMedia(models.Model): remove_zip("%s_%s" % (old.book.slug, old.type)) remove_zip("%s_%s" % (self.book.slug, self.type)) - extra_info = self.extra_info - if isinstance(extra_info, basestring): - # Walkaround for weird jsonfield 'no-decode' optimization. - extra_info = json.loads(extra_info) + extra_info = self.get_extra_info_json() extra_info.update(self.read_meta()) - self.extra_info = extra_info + self.extra_info = json.dumps(extra_info) self.source_sha1 = self.read_source_sha1(self.file.path, self.type) return super(BookMedia, self).save(*args, **kwargs) @@ -98,10 +97,10 @@ class BookMedia(models.Model): artist_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE1')) director_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE3')) project = ", ".join([ - t.data for t in audio.getall('PRIV') + t.data.decode('utf-8') for t in audio.getall('PRIV') if t.owner == 'wolnelektury.pl?project']) funded_by = ", ".join([ - t.data for t in audio.getall('PRIV') + t.data.decode('utf-8') for t in audio.getall('PRIV') if t.owner == 'wolnelektury.pl?funded_by']) except MutagenError: pass @@ -133,7 +132,7 @@ class BookMedia(models.Model): if filetype == 'mp3': try: audio = id3.ID3(filepath) - return [t.data for t in audio.getall('PRIV') + return [t.data.decode('utf-8') for t in audio.getall('PRIV') if t.owner == 'wolnelektury.pl?flac_sha1'][0] except (MutagenError, IndexError): return None @@ -145,3 +144,14 @@ class BookMedia(models.Model): return None else: return None + + @property + def director(self): + return self.get_extra_info_json().get('director_name', None) + + @property + def artist(self): + return self.get_extra_info_json().get('artist_name', None) + + def file_url(self): + return self.file.url