From 792cd0ddf0292e1044c3ecdf27335c548f5d4ac0 Mon Sep 17 00:00:00 2001
From: olivier <>
Date: Mon, 8 Feb 2010 16:51:02 +0000
Subject: [PATCH] fix apparent item title (track number now always appear
 because of duplicate titles)

---
 telemeta/models/crem.py                           | 15 ++++++++++++---
 .../templates/telemeta_default/collection.m3u     |  2 +-
 .../telemeta_default/collection_detail.html       |  2 +-
 .../telemeta_default/collection_detail_dc.html    |  2 +-
 .../telemeta_default/collection_xspf.xml          |  2 +-
 .../telemeta_default/inc/collection_list.html     |  2 +-
 .../telemeta_default/inc/mediaitem_list.html      |  2 +-
 .../telemeta_default/mediaitem_detail.html        |  7 ++-----
 .../telemeta_default/mediaitem_detail_dc.html     |  2 +-
 .../templates/telemeta_default/mediaitem_xspf.xml |  2 +-
 10 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/telemeta/models/crem.py b/telemeta/models/crem.py
index a1c206d6..cd9a4447 100755
--- 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 6412a8f4..2f00ed17 100644
--- 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 14324b87..8e18a3e6 100644
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block content %}
-    <h3>Collection: {{ collection.title }}</h3>
+    <h3>Collection: {{ collection }}</h3>
     <div class="{% if collection.has_mediafile %}with-rightcol{% endif %}">
         {% if collection.has_mediafile %}
         <div id="rightcol">
diff --git a/telemeta/templates/telemeta_default/collection_detail_dc.html b/telemeta/templates/telemeta_default/collection_detail_dc.html
index 17cafa5c..af2fc707 100644
--- 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 7efe305e..09ad5867 100644
--- 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 ab0841e5..294036bd 100644
--- 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 493a6f54..a7ab7d71 100644
--- 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 4f60ccb4..8cc58a93 100644
--- 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 }});
 
 {% block content %}
 
-<h3>Item : {{ item.title }}</h3>
+<h3>Item : {{ item }}</h3>
 <div class="{% if item.file %}with-rightcol{% endif %}">
 
 {% if item.file %}
@@ -131,10 +131,7 @@ load_player({{ item.get_duration }});
             {% dl_field item "title" %}
             {% dl_field item "alt_title" %}
             {% dl_field item "collector" %}
-            {% if item.collection.title %}
-                <dt>{% trans "Collection title" %}</dt>
-                <dd>{{ item.collection.title }}</dd>
-            {% endif %}
+            {% dl_field item "collection" %}
             {% if item.recorded_from_date %}
                 <dt>{% trans "Recording date" %}</dt>
                 <dd>{{ item.recorded_from_date }} {{ item.recorded_to_date|prepend:" - "  }}</dd>
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
index 013d6721..e30769fc 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
@@ -3,7 +3,7 @@
 
 {% if item %}
 {% block submenu %}
-    <h3>Item: {{ item.title }}</h3>
+    <h3>Item: {{ item }}</h3>
     <div><a href="{% url telemeta-item-detail item.id|urlencode %}">Normal View</a></div>
 {% endblock %}
 
diff --git a/telemeta/templates/telemeta_default/mediaitem_xspf.xml b/telemeta/templates/telemeta_default/mediaitem_xspf.xml
index aa7a5d19..f899cbec 100644
--- 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>
-- 
2.39.5