From: yomguy <yomguy@parisson.com>
Date: Mon, 6 Feb 2012 11:29:46 +0000 (+0100)
Subject: * Add media type detection from mime_type
X-Git-Tag: 1.3.9~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=25d44c703c5d27e0b69decec639a6e0bae71969d;p=telemeta.git

* Add media type detection from mime_type
* fix icons
* fix auto item.code when copy
---

diff --git a/example/sandbox_mysql/settings.py b/example/sandbox_mysql/settings.py
index 08975216..7116486e 100644
--- a/example/sandbox_mysql/settings.py
+++ b/example/sandbox_mysql/settings.py
@@ -101,6 +101,7 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'telemeta',
     'jsonrpc',
+    'south',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/telemeta/htdocs/images/fonds.png b/telemeta/htdocs/images/fonds.png
index 89850c61..32313a67 100644
Binary files a/telemeta/htdocs/images/fonds.png and b/telemeta/htdocs/images/fonds.png differ
diff --git a/telemeta/htdocs/images/playlist_title.png b/telemeta/htdocs/images/playlist_title.png
index b0547d69..5e30362d 100644
Binary files a/telemeta/htdocs/images/playlist_title.png and b/telemeta/htdocs/images/playlist_title.png differ
diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 824eb23c..4d7ba39a 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -633,7 +633,6 @@ class MediaCorpus(MediaBaseResource):
 
     element_type = 'corpus'
     children_type = 'collections'
-    icon = 'corpus.png'
 
     children = models.ManyToManyField(MediaCollection, related_name="corpus", verbose_name=_('collections'),  blank=True, null=True)
     recorded_from_year    = IntegerField(_('recording year (from)'))
@@ -654,7 +653,6 @@ class MediaFonds(MediaBaseResource):
 
     element_type = 'fonds'
     children_type = 'corpus'
-    icon = 'fonds.png'
 
     children = models.ManyToManyField(MediaCorpus, related_name="fonds", verbose_name=_('corpus'), blank=True, null=True)
 
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 308751e9..2a625c03 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -296,7 +296,7 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
             <h4><a href="#">{% trans "Technical data" %}</a></h4>
             <div>
                 <dl class="listing">
-                    <dt>{% trans "Media type" %}</dt><dd>{% trans "Audio" %}</dd>
+                <dt>{% trans "Media type" %}</dt><dd>{% trans mime_type|mime_to_media_type %}</dd>
                     {% dl_field item "approx_duration" %}
                 </dl>
             </div>
diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 6aa86846..c096498d 100644
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -379,6 +379,14 @@ def capitalize(value):
 
 @register.filter
 @stringfilter
-def mime_to_ext(mime):
-    return mime.split('/')[1]
+def mime_to_ext(mime_type):
+    return mime_type.split('/')[1]
+
+@register.filter
+@stringfilter
+def mime_to_media_type(mime_type):
+    if 'video' in mime_type:
+        return 'Video'
+    else:
+        return 'Audio'
 
diff --git a/telemeta/views/base.py b/telemeta/views/base.py
index a759034a..823dcf10 100644
--- a/telemeta/views/base.py
+++ b/telemeta/views/base.py
@@ -735,7 +735,11 @@ class ItemView(object):
                 return HttpResponseRedirect('/archives/items/'+code)
         else:
             item = MediaItem.objects.get(public_id=public_id)
+            items = MediaItem.objects.filter(collection=item.collection)
+            item.code = auto_code(items, item.collection.code)
             form = MediaItemForm(instance=item)
+            form.code = item.code
+            form. d
             form.file = None
 
         return render(request, template, {'item': item, "form": form})
@@ -803,7 +807,7 @@ class ItemView(object):
                                                  unit=analyzer.unit(), value=str(value))
                     analysis.save()
 
-                #FIXME: parse tags on first load
+#                FIXME: parse tags on first load
 #                tags = decoder.tags
 
         return mime_type