From c4ffd8f8583203273a1e77af68a86f038fdd652f Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Fri, 3 Feb 2012 18:42:15 +0100
Subject: [PATCH] * add video.js for video player tool * fix duration (get
 decoder's one) * fix webm in mapping

---
 telemeta/htdocs/images/webm.png               | Bin 0 -> 1384 bytes
 telemeta/models/media.py                      |   2 +-
 telemeta/templates/telemeta/base.html         |  14 ---------
 .../templates/telemeta/mediaitem_detail.html  |  19 +++++++++++-
 telemeta/views/base.py                        |  28 ++++++------------
 5 files changed, 28 insertions(+), 35 deletions(-)
 create mode 100644 telemeta/htdocs/images/webm.png

diff --git a/telemeta/htdocs/images/webm.png b/telemeta/htdocs/images/webm.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9be86f53cdece0f4d3bf6fe400b159a6d28d212
GIT binary patch
literal 1384
zcmV-u1(*7XP)<h;3K|Lk000e1NJLTq001)p000#T1^@s6>r~bO00001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyV!
z5h)gID`|%S00ihsL_t(o!_}92P}Efv$3MG^I3O<vV<BM`%qHa_Sem+vjgK@R!=xmZ
znbYJ*j2V;kV03JT|9Uu1jRcA2Oj8W0<v4?>i6GdRni`clff+0j>aMJ_zXg|lvA^3N
zKlaBiq*K#BaAwZz?|#oc=XbvMoO^$FH9`mh@YA8M`F_t{+Rpxf?DsR$MXS>>#bjiD
zQ6Y~PtN}nHgb+tcx6xc(!xMRVBtDXcMynn1WP~hZ`J<i7wYAJ#zm8QOyobi#byJj0
zeT+E^7l15~%x1h!CnyCQu@W8?MO<nsXf<3o-ALJuR&+}zrIvLyonef}NAIoM^m{xY
zMtouLd%g5^+wk3U;_B-oGEq;M*X5!gaQ8XUqG2?NkY!xGy~se1#X=Y;g^-0nGrG7a
z6%qn5&`Qcq7s?h1XjnufdHeUV>GB0${rNJhYrZ5ZF$p1H#iteI*Hklg#d3ANX<I4z
zHPxh;j4Jj|^Zu=F?do7_R|iXW?Hp!XvTLVmSMk6Jr*IL-K`OK`PM<(jVj__bO<-I?
z0*uiqHUx%TBMDg<$Oyt?W0<wM2t%$BL#`1SL9`)-M^`S#kZZ)=*%=Z$SW9kpP;#?l
z7#@&m`KyRdNmlV_LkiRKSE+V2-%v6jga}gb`+S2={(fY?A0Y(RD^~%SWHKRyz+f_}
z^8%PYGXns(!-3`3D??%rs@nVa!JXYUo-E#?;&Y0(;Ow@A`UTobB_jlKkopG_4|bA;
zvaec>ehYv;D-&4=47nx%q(3{+XJrx|6GK8)CIGERkA=h?s_J6h2ftLcm-IFHL`|GX
zbaFE3Yx23cr)rpANM&3e4_3*6)h=PROWf|Z;SH*c&+Ef-ryHwX;`%RFxNGhJAT}q5
z6yrSZnmahVZ$AJJFIq_Qytx3}xbP!ZyM!(|nRUl%d8@OX4fQ7pGZ?ViB{hEO?Z0^A
zMhgkKxgmJn?h4$!y<`^^l3i4Y%i-Wud8KN%+9mGT9o%!d2g&ryG9I57x6jL>ZSPQY
z;wVWO>8ewFS}L!6a{%|ioR<0q05YD<BR+L9E%gmtt2+fi(u^#UbFu-rT33hL=jHj&
zsz{lc!^ex4l9WE3f~rc~KCc?TeA!CIMn&;V*^Usr$05;JUcu}Q>zVb^i!_#3(Bl{+
z8_35m`-4uiAZe*@Ko=H9L~N{zMa0Dst=FsL&gNzSW<IxCX{UzMbT&6*Yd2%sv=IPX
zyBS-%Ss|D{9e_8_oCaXxKpO_+_r@jwCQO+!?C5RU{Ruvg2cO47Q+dUM?`uPW_H*a?
zV&f((t=9)vpr?nLqRr~KwLwWLa{Ty^ao~68^R27b0QhLZVm9l>vSmy}$UCP#HD6hP
zwzgpj_DK>YvGJ6|#?vQB|BVcQrKObvuf2}T;Q-)B>2`iQS*O}<?Pj$)oz2bk+3gP`
z^ZACCX*+kG;<^)5`aM+oJt6NaK6xCE(@E{SW&i5~s`>8y55?i_JJ8;b*+{<u05Y($
z^lc@78SpVW#W(Qr)P;wmP05~t03-zNQAWfKI1qq_w7GMXKWF=2SkK{u2eBcDMZ?%p
z&~mN;A`{S%zjiGfzp7Sl&GU;20XTK&5OyJOj)JO$18Ev9PZt!Z`D;Ybz2(~R6Leg>
qM32Qf;>pA$>X|%y78%Qzso38qQ{{wB6J~V)0000<MNUMnLSTYaet`-A

literal 0
HcmV?d00001

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 65cd01c7..824eb23c 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -566,7 +566,7 @@ class DublinCoreToFormatMetadata(object):
     in various audio metadata format (MP3, OGG, etc...)"""
 
     #FIXME: should be given by timeside
-    unavailable_extensions = ['wav', 'aiff', 'aif', 'flac']
+    unavailable_extensions = ['wav', 'aiff', 'aif', 'flac', 'webm']
 
     metadata_mapping = {
                     'mp3' : {
diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index e1d278d4..39227d0b 100644
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -79,20 +79,6 @@
 
 {# spaces between li and a elements breaks layout #}
 
-<!--<ul id="nav">
- <a href="{% url telemeta-home %}" class="darkblue">{% trans "Home" %}</a>
- <a href="{% url telemeta-collections %}" class="blue">{% trans "Collections" %}</a>
- <a href="{% url telemeta-items %}" class="green">{% trans "Items" %}</a></li>
- <a href="{% url telemeta-geo-continents %}" class="yellow">{% trans "Geo Navigator" %}</a>
- <a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a>
- {% if user.is_authenticated %}
- <a href="{% url telemeta-users %}" class="red">{% trans "Users" %}</a>
- {% endif %}
- {% if user.is_staff %}
- <a href="{% url telemeta-admin %}" class="violet">{% trans "Admin" %}</a>
-{% endif %}
-</ul>-->
-
 <ul id="nav">
  {% if user.is_authenticated %}
   <li><a href="#desk#" class="blue">{% trans "Desk" %}</a></span>
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 9cd33f67..308751e9 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -75,6 +75,12 @@
             });
     {% endif %}
 </script>
+
+{% if "video" in mime_type %}
+<link href="http://vjs.zencdn.net/c/video-js.css" rel="stylesheet">
+<script src="http://vjs.zencdn.net/c/video.js"></script>
+{% endif %}
+
 {% endif %}
 {% endblock %}
 
@@ -122,10 +128,21 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
 
     {% if "video" in mime_type %}
     <div>
-        <video width="362" controls="controls" preload="auto">
+    <video id="my_video_1" class="video-js vjs-default-skin" width="362" height="240" controls preload="auto" data-setup="{}">
+        <!-- Hello Chrome and Firefox (and Opera?) -->
         <source src="{% url telemeta-item-export item.public_id mime_type|mime_to_ext %}" type="{{ mime_type }}" />
         </video>
+        <div id="videotime"></div>
     </div>
+    <script>
+    (function(){
+        var v = document.getElementsByTagName('video')[0]
+        var t = document.getElementById('videotime');
+        v.addEventListener('timeupdate',function(event){
+            t.innerHTML = v.currentTime;
+            },false);
+            })();
+    </script>
     {% endif %}
 
         <!-- </div> -->
diff --git a/telemeta/views/base.py b/telemeta/views/base.py
index 5d8cc67e..2243bb58 100644
--- a/telemeta/views/base.py
+++ b/telemeta/views/base.py
@@ -590,7 +590,6 @@ class ItemView(object):
 
         previous, next = self.item_previous_next(item)
         mime_type = self.item_analyze(item)
-        print mime_type
         playlists = get_playlists(request)
         public_access = get_public_access(item.public_access, str(item.recorded_from_date).split('-')[0],
                                                 str(item.recorded_to_date).split('-')[0])
@@ -759,7 +758,7 @@ class ItemView(object):
                     time = value.split(':')
                     time[2] = time[2].split('.')[0]
                     time = ':'.join(time)
-                    item.approx_duration = str(time)
+                    item.approx_duration = time
                     item.save()
                 if analysis.analyzer_id == 'mime_type':
                     mime_type = analysis.value
@@ -791,23 +790,21 @@ class ItemView(object):
                                              analyzer_id='resolution', unit='bits',
                                              value=unicode(decoder.audiowidth))
                 analysis.save()
+                analysis = MediaItemAnalysis(item=item, name='Duration',
+                                             analyzer_id='duration', unit='s',
+                                             value=unicode(datetime.timedelta(0,decoder.duration)))
+                analysis.save()
 
                 for analyzer in analyzers_sub:
                     value = analyzer.result()
-                    if analyzer.id() == 'duration':
-                        approx_value = int(round(value))
-                        item.approx_duration = approx_value
-                        try:
-                            item.save()
-                        except:
-                            pass
-                        value = datetime.timedelta(0,value)
-
                     analysis = MediaItemAnalysis(item=item, name=analyzer.name(),
                                                  analyzer_id=analyzer.id(),
                                                  unit=analyzer.unit(), value=str(value))
                     analysis.save()
 
+                #FIXME: parse tags on first load
+#                tags = decoder.tags
+
         return mime_type
 
     def item_analyze_xml(self, request, public_id):
@@ -893,14 +890,7 @@ class ItemView(object):
         else:
             flag = flag[0]
 
-        mime_type = self.item_analyze(item)
-        if mime_type:
-            format = mime_type
-
-        else:
-            decoder = timeside.decoder.FileDecoder(audio)
-            format = decoder.format()
-
+        format = self.item_analyze(item)
         dc_metadata = dublincore.express_item(item).to_list()
         mapping = DublinCoreToFormatMetadata(extension)
         metadata = mapping.get_metadata(dc_metadata)
-- 
2.39.5