# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1432723549 -7200
# Node ID d5b652d4348531879c6de984442bd8d7ef031529
# Parent  356eefa0b8af9a7de9b772782c178c55e873ad8c
url correction for videos

diff -r 356eefa0b8af -r d5b652d43485 src/metadatacomposer/__init__.py
--- a/src/metadatacomposer/__init__.py	Tue May 12 14:36:28 2015 +0200
+++ b/src/metadatacomposer/__init__.py	Wed May 27 12:45:49 2015 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 1, 20, "final", 0)
+VERSION = (0, 1, 21, "final", 0)
 
 
 def get_version():
diff -r 356eefa0b8af -r d5b652d43485 src/metadatacomposer/static/metadatacomposer/js/edition.js
--- a/src/metadatacomposer/static/metadatacomposer/js/edition.js	Tue May 12 14:36:28 2015 +0200
+++ b/src/metadatacomposer/static/metadatacomposer/js/edition.js	Wed May 27 12:45:49 2015 +0200
@@ -97,6 +97,11 @@
                 controls: true,
                 autostart: true,
                 url_transform: function(src) {
+                    //TODO: pass video urls as options
+                    var pat = /^(https?|rtmp):\/\//i
+                    if(!pat.test(src)) {
+                        src = "http://media.iri.centrepompidou.fr/" + src.replace(/^\//,'');
+                    }
                     return [{
                         type: "video/mp4",
                         src: src.replace(/\.[\d\w]+$/,'.mp4').replace('rtmp://media.iri.centrepompidou.fr/ddc_player', 'http://media.iri.centrepompidou.fr')
diff -r 356eefa0b8af -r d5b652d43485 src/metadatacomposer/static/metadatacomposer/js/ldt-serializer.js
--- a/src/metadatacomposer/static/metadatacomposer/js/ldt-serializer.js	Tue May 12 14:36:28 2015 +0200
+++ b/src/metadatacomposer/static/metadatacomposer/js/ldt-serializer.js	Wed May 27 12:45:49 2015 +0200
@@ -166,7 +166,7 @@
                 return _res;
             },
             serializer : function(_data, _source, _dest) {
-                var _color = parseInt(_data.color.replace(/^#/,''),16).toString();
+                var _color = _data.color?parseInt(_data.color.replace(/^#/,''),16).toString():"0";
                 var _res = {
                     id : _data.id,
                     begin : _data.begin.milliseconds,
diff -r 356eefa0b8af -r d5b652d43485 src/metadatacomposer/static/metadatacomposer/js/player.js
--- a/src/metadatacomposer/static/metadatacomposer/js/player.js	Tue May 12 14:36:28 2015 +0200
+++ b/src/metadatacomposer/static/metadatacomposer/js/player.js	Wed May 27 12:45:49 2015 +0200
@@ -18,6 +18,11 @@
         {
             autostart: true,
             url_transform: function(src) {
+                //TODO: pass video urls as options
+                var pat = /^(https?|rtmp):\/\//i
+                if(!pat.test(src)) {
+                    src = "http://media.iri.centrepompidou.fr/" + src.replace(/^\//,'');
+                }
                 return [{
                     type: "video/mp4",
                     src: src.replace(/\.[\d\w]+$/,'.mp4').replace('rtmp://media.iri.centrepompidou.fr/ddc_player', 'http://media.iri.centrepompidou.fr')