License icon in audiobooks.

diff --git a/src/catalogue/models/bookmedia.py b/src/catalogue/models/bookmedia.py
index d1f2bf0..de493d7 100644 (file)
--- 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'))
                 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'])
                 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', []))
                 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):
                 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,
         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
 
     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 8847f99..50e0242 100644 (file)
--- 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:" %}&nbsp;<span class='artist'>{{ extra_info.artist_name }}</span>,
                     {% trans "director:" %}&nbsp;<span class='director'>{{ extra_info.director_name }}</span>
                   {% with extra_info=i.mp3.get_extra_info_json %}
                     {% trans "Artist:" %}&nbsp;<span class='artist'>{{ extra_info.artist_name }}</span>,
                     {% trans "director:" %}&nbsp;<span class='director'>{{ extra_info.director_name }}</span>

+                    {% if extra_info.license %}{% license_icon extra_info.license %}{% endif %}

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