X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5aa13410812d3fc4b35c039bdc3f0a2edc5185a1..5ac6f14db010bbfbcf39190d0b639a47ab1c89d3:/src/catalogue/models/bookmedia.py diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py index 407c41969..010512ad2 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,7 +6,6 @@ import json from collections import namedtuple from django.db import models from django.utils.translation import ugettext_lazy as _ -import jsonfield from slugify import slugify from mutagen import MutagenError @@ -15,7 +13,13 @@ from catalogue.fields import OverwriteStorage def _file_upload_to(i, _n): - return 'book/%(ext)s/%(name)s.%(ext)s' % {'ext': i.ext(), 'name': slugify(i.name)} + name = i.book.slug + if i.index: + name += f'_{i.index:03d}' + if i.part_name: + name += f'_' + slugify(i.part_name) + ext = i.ext() + return f'book/{ext}/{name}.{ext}' class BookMedia(models.Model): @@ -34,19 +38,22 @@ class BookMedia(models.Model): 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) - 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): - return "%s (%s)" % (self.name, self.file.name.split("/")[-1]) + def __str__(self): + return self.file.name.split("/")[-1] class Meta: - ordering = ('type', 'name') + ordering = ('type', 'index') verbose_name = _('book media') verbose_name_plural = _('book media') app_label = 'catalogue' + 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 @@ -76,12 +83,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) @@ -92,17 +96,18 @@ class BookMedia(models.Model): import mutagen from mutagen import id3 - artist_name = director_name = project = funded_by = '' + artist_name = director_name = project = funded_by = license = '' if self.type == 'mp3': try: audio = id3.ID3(self.file.path) artist_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE1')) director_name = ', '.join(', '.join(tag.text) for tag in audio.getall('TPE3')) + license = ', '.join(tag.url for tag in audio.getall('WCOP')) 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 @@ -111,6 +116,7 @@ class BookMedia(models.Model): audio = mutagen.File(self.file.path) artist_name = ', '.join(audio.get('artist', [])) director_name = ', '.join(audio.get('conductor', [])) + license = ', '.join(audio.get('license', [])) project = ", ".join(audio.get('project', [])) funded_by = ", ".join(audio.get('funded_by', [])) except (MutagenError, AttributeError): @@ -118,7 +124,7 @@ class BookMedia(models.Model): else: return {} return {'artist_name': artist_name, 'director_name': director_name, - 'project': project, 'funded_by': funded_by} + 'project': project, 'funded_by': funded_by, 'license': license} def ext(self): return self.formats[self.type].ext @@ -134,7 +140,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 @@ -149,8 +155,11 @@ class BookMedia(models.Model): @property def director(self): - return self.extra_info.get('director_name', None) + return self.get_extra_info_json().get('director_name', None) @property def artist(self): - return self.extra_info.get('artist_name', None) + return self.get_extra_info_json().get('artist_name', None) + + def file_url(self): + return self.file.url