* 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 08975216f90a284fcfb9e5132460037b83f6388e..7116486e70cccad184132975cd3e4e8bbdd4e092 100644 (file)
--- 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 89850c61c6184ed072b54782c333beddeed3e83d..32313a67e9fde16ee558ba883f5e793cc511c1a1 100644 (file)
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 b0547d69b53436ee5005faea71c29cc625b6e2f4..5e30362d4adcb558383e031773c574afef445340 100644 (file)
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 824eb23cc211e925a2752238f59f8a184f8a83ac..4d7ba39a852dc0cf3cb2c4a8c9d35eae1590bb72 100644 (file)
--- 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 308751e913af9a7cc6a1d2f9567f5bfb9335870c..2a625c036949de0e9786e7f4821bdfcb6fb81b43 100644 (file)
--- 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 6aa86846d4584b90c5ec889cdd51b927c3cf72ac..c096498de41fe1586e01eb469251faf88064e653 100644 (file)
--- 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 a759034acf781d103348b57a7beced899b47e956..823dcf105b674e92f3bd4de7978119ddd5757af2 100644 (file)
--- 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