From: Radek Czajka Date: Tue, 14 Apr 2020 14:38:36 +0000 (+0200) Subject: License icon in audiobooks. X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/5aa7e3bcddd7bac5e9f553e7f6d22e20799293d7?ds=inline License icon in audiobooks. --- diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py index d1f2bf04d..de493d747 100644 --- a/src/catalogue/models/bookmedia.py +++ b/src/catalogue/models/bookmedia.py @@ -96,6 +96,7 @@ class BookMedia(models.Model): 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.decode('utf-8') for t in audio.getall('PRIV') if t.owner == 'wolnelektury.pl?project']) @@ -109,6 +110,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): @@ -116,7 +118,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 diff --git a/src/catalogue/templates/catalogue/snippets/jplayer.html b/src/catalogue/templates/catalogue/snippets/jplayer.html index 8847f99a0..50e024206 100644 --- a/src/catalogue/templates/catalogue/snippets/jplayer.html +++ b/src/catalogue/templates/catalogue/snippets/jplayer.html @@ -35,6 +35,7 @@ {% with extra_info=i.mp3.get_extra_info_json %} {% trans "Artist:" %} {{ extra_info.artist_name }}, {% trans "director:" %} {{ extra_info.director_name }} + {% if extra_info.license %}{% license_icon extra_info.license %}{% endif %}

{% with fb=extra_info.funded_by %} {% if fb %}Dofinansowano ze środków: {{ fb }}.{% endif %}