fix apparent item title (track number now always appear because of duplicate titles)

diff --git a/telemeta/models/crem.py b/telemeta/models/crem.py
index a1c206d6b1fc03cd34b5691ee8186e1629c06e74..cd9a4447a02fa45cafb56aa175f7407493827f3a 100755 (executable)
--- a/telemeta/models/crem.py
+++ b/telemeta/models/crem.py
@@ -199,6 +199,9 @@ class MediaCollection(MediaResource):
     objects               = query.MediaCollectionManager()
 
     def __unicode__(self):
+        if self.title:
+            return self.title
+
         return self.code
 
     @property
@@ -365,9 +368,15 @@ class MediaItem(MediaResource):
     computed_duration.verbose_name = _('computed duration')        
 
     def __unicode__(self):
-        if self.code:
-            return self.code
-        return self.old_code
+        if self.title and not re.match('^ *N *$', self.title):
+            title = self.title
+        else:
+            title = unicode(self.collection)
+
+        if self.track:
+            title += ' ' + self.track
+
+        return title
 
 class MediaPart(MediaResource):
     "Describe an item part"

diff --git a/telemeta/templates/telemeta_default/collection.m3u b/telemeta/templates/telemeta_default/collection.m3u
index 6412a8f4adf79c8d945545f1d27e609c62c4521e..2f00ed170e8a2ba9020f7294c7d235eea34bb717 100644 (file)
--- a/telemeta/templates/telemeta_default/collection.m3u
+++ b/telemeta/templates/telemeta_default/collection.m3u
@@ -1,3 +1,3 @@
 #EXTM3U{% load telemeta_utils %}{% for item in collection.items.all %}
-#EXTINF:{{ item.get_duration }},{{ item.title }}
+#EXTINF:{{ item.get_duration }},{{ item }}
 http://{{ host }}{% url telemeta-item-export item.public_id,"mp3" %}{% endfor %}

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index 14324b871a07eb0a9ed90157be4698c12fe36493..8e18a3e6ed560a967a6a7cbc58a061ca68a6b395 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -14,7 +14,7 @@
 {% endblock %}\r
 \r
 {% block content %}\r
-    <h3>Collection: {{ collection.title }}</h3>\r
+    <h3>Collection: {{ collection }}</h3>\r
     <div class="{% if collection.has_mediafile %}with-rightcol{% endif %}">\r
         {% if collection.has_mediafile %}\r
         <div id="rightcol">\r

diff --git a/telemeta/templates/telemeta_default/collection_detail_dc.html b/telemeta/templates/telemeta_default/collection_detail_dc.html
index 17cafa5c0a9e5646766b8fd4b7de8c2fd4735382..af2fc7074f7fba9b01b03c89ca13f4a9a31edc3e 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail_dc.html
+++ b/telemeta/templates/telemeta_default/collection_detail_dc.html
@@ -3,7 +3,7 @@
 
 {% if collection %}
 {% block submenu %}
-    <h3>Collection: {{ collection.title }}</h3>
+    <h3>Collection: {{ collection }}</h3>
     <div><a href="{% url telemeta-collection-detail collection.public_id %}">Normal View</a></div>
 {% endblock %}
 

diff --git a/telemeta/templates/telemeta_default/collection_xspf.xml b/telemeta/templates/telemeta_default/collection_xspf.xml
index 7efe305e75ef79b315652eba02e91b4ad3fdfdb0..09ad58672bf107b6b390ddaa4c7e50a8d5acaf37 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_xspf.xml
+++ b/telemeta/templates/telemeta_default/collection_xspf.xml
@@ -12,7 +12,7 @@
 {% block tracklist %}
 {% for item in collection.ordered_items %}
     <track>
-      <title>{{ item.title }}</title>
+      <title>{{ item }}</title>
       <meta rel="type">mp3</meta>
       <location>http://{{ host }}{% url telemeta-item-export item.public_id,"mp3" %}</location>
       <duration>{{ item.get_duration|mul:1000 }}</duration>

diff --git a/telemeta/templates/telemeta_default/inc/collection_list.html b/telemeta/templates/telemeta_default/inc/collection_list.html
index ab0841e585c5f69a5a8ceacdf3173ea634c50f86..294036bd4ba68dcef3dcaebec1836ebd64c33f97 100644 (file)
--- a/telemeta/templates/telemeta_default/inc/collection_list.html
+++ b/telemeta/templates/telemeta_default/inc/collection_list.html
@@ -9,7 +9,7 @@
     {% endif %}
     <ul>
     {% for p in collections %}
-        <li><a href="{% url telemeta-collection-detail p.public_id %}">{{ p.title }}</a>
+        <li><a href="{% url telemeta-collection-detail p.public_id %}">{{ p }}</a>
             </li>
     {% endfor %}
     {% if more_collections %} <li>[...]</li> {% endif %}

diff --git a/telemeta/templates/telemeta_default/inc/mediaitem_list.html b/telemeta/templates/telemeta_default/inc/mediaitem_list.html
index 493a6f5401549d87f3d6e5aa552613462f078a01..a7ab7d71cb032546c3611b32a4d9918b75696ce8 100644 (file)
--- a/telemeta/templates/telemeta_default/inc/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/inc/mediaitem_list.html
@@ -9,7 +9,7 @@
     {% endif %}
     <ul>
     {% for p in items %}
-        <li><a href="{% url telemeta-item-detail p.public_id %}">{{ p.title }}</a></li>
+        <li><a href="{% url telemeta-item-detail p.public_id %}">{{ p }}</a></li>
     {% endfor %}
     {% if more_items %} <li>[...]</li> {% endif %}
     </ul>

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 4f60ccb411ef59ab29484ca2e4a74b0f05ab213a..8cc58a9380028686e4bd795ea3a6b49423b4ec62 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -34,7 +34,7 @@ load_player({{ item.get_duration }});
 \r
 {% block content %}\r
 \r
-<h3>Item : {{ item.title }}</h3>\r
+<h3>Item : {{ item }}</h3>\r
 <div class="{% if item.file %}with-rightcol{% endif %}">\r
 \r
 {% if item.file %}\r
@@ -131,10 +131,7 @@ load_player({{ item.get_duration }});
             {% dl_field item "title" %}\r
             {% dl_field item "alt_title" %}\r
             {% dl_field item "collector" %}\r
-            {% if item.collection.title %}\r
-                <dt>{% trans "Collection title" %}</dt>\r
-                <dd>{{ item.collection.title }}</dd>\r
-            {% endif %}\r
+            {% dl_field item "collection" %}\r
             {% if item.recorded_from_date %}\r
                 <dt>{% trans "Recording date" %}</dt>\r
                 <dd>{{ item.recorded_from_date }} {{ item.recorded_to_date|prepend:" - "  }}</dd>\r

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
index 013d672101a8c9b0826bd98daac971376940507d..e30769fc883b49852c0e10a0b431709d6a19bb00 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
@@ -3,7 +3,7 @@
 \r
 {% if item %}\r
 {% block submenu %}\r
-    <h3>Item: {{ item.title }}</h3>\r
+    <h3>Item: {{ item }}</h3>\r
     <div><a href="{% url telemeta-item-detail item.id|urlencode %}">Normal View</a></div>\r
 {% endblock %}\r
 \r

diff --git a/telemeta/templates/telemeta_default/mediaitem_xspf.xml b/telemeta/templates/telemeta_default/mediaitem_xspf.xml
index aa7a5d19acd079fcf856e0fb8b3be51d4602effe..f899cbecd980e999acb8c35eee5f02695f8d4f14 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_xspf.xml
+++ b/telemeta/templates/telemeta_default/mediaitem_xspf.xml
@@ -3,7 +3,7 @@
 
 {% block tracklist %}
     <track>
-      <title>{{ item.title }}</title>
+      <title>{{ item }}</title>
       <meta rel="type">mp3</meta>
       <location>http://{{ host }}{% url telemeta-item-export item.public_id,"mp3" %}</location>
       <duration>{{ item.get_duration|mul:1000 }}</duration>