X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/538526fc82b771cbc149743f129d8b1ae7e3cba2..f177dd0cdb753827bd208960a159d1bbbaae9e80:/src/catalogue/models/bookmedia.py?ds=inline diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py index 377dbc43c..ec37849d2 100644 --- a/src/catalogue/models/bookmedia.py +++ b/src/catalogue/models/bookmedia.py @@ -38,7 +38,7 @@ class BookMedia(models.Model): book = models.ForeignKey('Book', 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: @@ -77,7 +77,7 @@ class BookMedia(models.Model): remove_zip("%s_%s" % (self.book.slug, self.type)) extra_info = self.extra_info - if isinstance(extra_info, basestring): + if isinstance(extra_info, str): # Walkaround for weird jsonfield 'no-decode' optimization. extra_info = json.loads(extra_info) extra_info.update(self.read_meta()) @@ -99,10 +99,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 @@ -134,7 +134,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 @@ -146,3 +146,11 @@ class BookMedia(models.Model): return None else: return None + + @property + def director(self): + return self.extra_info.get('director_name', None) + + @property + def artist(self): + return self.extra_info.get('artist_name', None)