]> git.parisson.com Git - telemeta.git/commitdiff
- added collection playlists in m3u and xspf formats
authorolivier <>
Fri, 18 May 2007 19:17:37 +0000 (19:17 +0000)
committerolivier <>
Fri, 18 May 2007 19:17:37 +0000 (19:17 +0000)
- embedded flash mp3 player in both collection and item displays.
Remark: there are two players available, you can switch them in the templates
- other fixes

16 files changed:
telemeta/htdocs/css/telemeta.css
telemeta/htdocs/js/swfobject.js [new file with mode: 0755]
telemeta/htdocs/swf/mp3player.swf [new file with mode: 0755]
telemeta/htdocs/swf/xspf_player.swf [new file with mode: 0644]
telemeta/htdocs/swf/xspf_player_slim.swf [new file with mode: 0644]
telemeta/models.py
telemeta/templates/base.html
telemeta/templates/base_xspf.xml [new file with mode: 0644]
telemeta/templates/collection.m3u [new file with mode: 0644]
telemeta/templates/collection_detail.html
telemeta/templates/collection_xspf.xml [new file with mode: 0644]
telemeta/templates/mediaitem_detail.html
telemeta/templates/mediaitem_xspf.xml [new file with mode: 0644]
telemeta/templatetags/telemeta_utils.py
telemeta/urls.py
telemeta/views/web.py

index b21658f79a7f8b1efdf2fabf0f85cf990567fa58..caaaad4e3c504c215a9120f6e1edd4a4a72301b1 100644 (file)
@@ -36,16 +36,16 @@ a img { border: none; }
 
 #quick_search_pattern { }
 
-.item_visualization {
+.item_visualization, #collection_player {
   clear: right;
   float: right;
   padding: 1ex;
   margin-top: 1em;
+  margin-left: 1em;
 }
 .item_visualization select { width: 200px; }
 .item_visualization img { width: 300px; border: solid 1px black; }
 
-
 /* Styles for tabular listings (stolen from trac) */
 table.listing {
  clear: both;
diff --git a/telemeta/htdocs/js/swfobject.js b/telemeta/htdocs/js/swfobject.js
new file mode 100755 (executable)
index 0000000..e7edd42
--- /dev/null
@@ -0,0 +1,8 @@
+/**
+ * SWFObject v1.5: Flash Player detection and embed - http://blog.deconcept.com/swfobject/
+ *
+ * SWFObject is (c) 2007 Geoff Stearns and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+if(typeof deconcept=="undefined"){var deconcept=new Object();}if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){if(!document.getElementById){return;}this.DETECT_KEY=_a?_a:"detectflash";this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);this.params=new Object();this.variables=new Object();this.attributes=new Array();if(_1){this.setAttribute("swf",_1);}if(id){this.setAttribute("id",id);}if(w){this.setAttribute("width",w);}if(h){this.setAttribute("height",h);}if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion();if(!window.opera&&document.all&&this.installedVer.major>7){deconcept.SWFObject.doPrepUnload=true;}if(c){this.addParam("bgcolor",c);}var q=_7?_7:"high";this.addParam("quality",q);this.setAttribute("useExpressInstall",false);this.setAttribute("doExpressInstall",false);var _c=(_8)?_8:window.location;this.setAttribute("xiRedirectUrl",_c);this.setAttribute("redirectUrl","");if(_9){this.setAttribute("redirectUrl",_9);}};deconcept.SWFObject.prototype={useExpressInstall:function(_d){this.xiSWFPath=!_d?"expressinstall.swf":_d;this.setAttribute("useExpressInstall",true);},setAttribute:function(_e,_f){this.attributes[_e]=_f;},getAttribute:function(_10){return this.attributes[_10];},addParam:function(_11,_12){this.params[_11]=_12;},getParams:function(){return this.params;},addVariable:function(_13,_14){this.variables[_13]=_14;},getVariable:function(_15){return this.variables[_15];},getVariables:function(){return this.variables;},getVariablePairs:function(){var _16=new Array();var key;var _18=this.getVariables();for(key in _18){_16[_16.length]=key+"="+_18[key];}return _16;},getSWFHTML:function(){var _19="";if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");this.setAttribute("swf",this.xiSWFPath);}_19="<embed type=\"application/x-shockwave-flash\" src=\""+this.getAttribute("swf")+"\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\"";_19+=" id=\""+this.getAttribute("id")+"\" name=\""+this.getAttribute("id")+"\" ";var _1a=this.getParams();for(var key in _1a){_19+=[key]+"=\""+_1a[key]+"\" ";}var _1c=this.getVariablePairs().join("&");if(_1c.length>0){_19+="flashvars=\""+_1c+"\"";}_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");this.setAttribute("swf",this.xiSWFPath);}_19="<object id=\""+this.getAttribute("id")+"\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\">";_19+="<param name=\"movie\" value=\""+this.getAttribute("swf")+"\" />";var _1d=this.getParams();for(var key in _1d){_19+="<param name=\""+key+"\" value=\""+_1d[key]+"\" />";}var _1f=this.getVariablePairs().join("&");if(_1f.length>0){_19+="<param name=\"flashvars\" value=\""+_1f+"\" />";}_19+="</object>";}return _19;},write:function(_20){if(this.getAttribute("useExpressInstall")){var _21=new deconcept.PlayerVersion([6,0,65]);if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){this.setAttribute("doExpressInstall",true);this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));document.title=document.title.slice(0,47)+" - Flash Player Installation";this.addVariable("MMdoctitle",document.title);}}if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){var n=(typeof _20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML();return true;}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return false;}};deconcept.SWFObjectUtil.getPlayerVersion=function(){var _23=new deconcept.PlayerVersion([0,0,0]);if(navigator.plugins&&navigator.mimeTypes.length){var x=navigator.plugins["Shockwave Flash"];if(x&&x.description){_23=new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}}else{if(navigator.userAgent&&navigator.userAgent.indexOf("Windows CE")>=0){var axo=1;var _26=3;while(axo){try{_26++;axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26);_23=new deconcept.PlayerVersion([_26,0,0]);}catch(e){axo=null;}}}else{try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");_23=new deconcept.PlayerVersion([6,0,21]);axo.AllowScriptAccess="always";}catch(e){if(_23.major==6){return _23;}}try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(e){}}if(axo!=null){_23=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}}}return _23;};deconcept.PlayerVersion=function(_29){this.major=_29[0]!=null?parseInt(_29[0]):0;this.minor=_29[1]!=null?parseInt(_29[1]):0;this.rev=_29[2]!=null?parseInt(_29[2]):0;};deconcept.PlayerVersion.prototype.versionIsValid=function(fv){if(this.major<fv.major){return false;}if(this.major>fv.major){return true;}if(this.minor<fv.minor){return false;}if(this.minor>fv.minor){return true;}if(this.rev<fv.rev){return false;}return true;};deconcept.util={getRequestParameter:function(_2b){var q=document.location.search||document.location.hash;if(_2b==null){return q;}if(q){var _2d=q.substring(1).split("&");for(var i=0;i<_2d.length;i++){if(_2d[i].substring(0,_2d[i].indexOf("="))==_2b){return _2d[i].substring((_2d[i].indexOf("=")+1));}}}return "";}};deconcept.SWFObjectUtil.cleanupSWFs=function(){var _2f=document.getElementsByTagName("OBJECT");for(var i=_2f.length-1;i>=0;i--){_2f[i].style.display="none";for(var x in _2f[i]){if(typeof _2f[i][x]=="function"){_2f[i][x]=function(){};}}}};if(deconcept.SWFObject.doPrepUnload){if(!deconcept.unloadSet){deconcept.SWFObjectUtil.prepUnload=function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs);};window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload);deconcept.unloadSet=true;}}if(!document.getElementById&&document.all){document.getElementById=function(id){return document.all[id];};}var getQueryParamValue=deconcept.util.getRequestParameter;var FlashObject=deconcept.SWFObject;var SWFObject=deconcept.SWFObject;
\ No newline at end of file
diff --git a/telemeta/htdocs/swf/mp3player.swf b/telemeta/htdocs/swf/mp3player.swf
new file mode 100755 (executable)
index 0000000..70fca8c
Binary files /dev/null and b/telemeta/htdocs/swf/mp3player.swf differ
diff --git a/telemeta/htdocs/swf/xspf_player.swf b/telemeta/htdocs/swf/xspf_player.swf
new file mode 100644 (file)
index 0000000..f03790a
Binary files /dev/null and b/telemeta/htdocs/swf/xspf_player.swf differ
diff --git a/telemeta/htdocs/swf/xspf_player_slim.swf b/telemeta/htdocs/swf/xspf_player_slim.swf
new file mode 100644 (file)
index 0000000..24b36c9
Binary files /dev/null and b/telemeta/htdocs/swf/xspf_player_slim.swf differ
index f2d47579f24f06594d90bfafb6e3fd494311fc63..689dde5bcd09051439749a75dde662160a99ae44 100644 (file)
@@ -11,6 +11,7 @@ from django.db import models
 from django.db.models import Q
 from django.core.exceptions import ObjectDoesNotExist
 from django.core import validators
+from django.conf import settings
 
 import telemeta
 from telemeta.core import *
@@ -127,6 +128,14 @@ class MediaCollection(models.Model, MediaCore):
         )
         return resource
 
+    def has_mediafile(self):
+        "Tell wether this collection has any media files attached to its items"
+        items = self.items.all()
+        for item in items:
+            if item.file:
+                return True
+        return False
+
     def __str__(self):
         #return self.title
         return self.id
@@ -215,6 +224,17 @@ class MediaItem(models.Model, MediaCore):
         )
         return resource
 
+    def get_duration(self):
+        if self.file:
+            import wave
+            media = wave.open(settings.MEDIA_ROOT + "/" + self.file, "rb")
+            duration = media.getnframes() / media.getframerate()
+            media.close()
+        else:
+            duration = 0
+
+        return duration
+
     def __str__(self):
         return self.title
 
index 7ed55b94a3e31604b26055a3e96a605d34cca560..0fb1e10e04fadbffcadfc40fec1bdcfe26defb80 100644 (file)
@@ -4,6 +4,7 @@
 <title>Telemeta</title>
 <link rel="stylesheet" type="text/css" href="/css/telemeta.css" />
 {% block extra_style %}{% endblock %}
+{% block extra_javascript %}{% endblock %}
 </head>
 {% load i18n %}
 <body>
diff --git a/telemeta/templates/base_xspf.xml b/telemeta/templates/base_xspf.xml
new file mode 100644 (file)
index 0000000..af4166b
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<playlist version="1" xmlns="http://xspf.org/ns/0/">
+{% block listinfo %}{% endblock %}
+  <trackList>
+  {% block tracklist %}{% endblock %}
+  </trackList>
+</playlist>
+
+
diff --git a/telemeta/templates/collection.m3u b/telemeta/templates/collection.m3u
new file mode 100644 (file)
index 0000000..e648141
--- /dev/null
@@ -0,0 +1,3 @@
+#EXTM3U{% load telemeta_utils %}{% for item in collection.items.all %}
+#EXTINF:{{ item.get_duration }},{{ item.title }}
+http://{{ host }}{% url telemeta-item-export item.id|urlencode,"MP3" %} {% endfor %}
index f552688338eb53c18f86236d0ff39d4a88916c8f..eb4e2eac89a3bdefa843400155c2a06ba6cd1654 100644 (file)
@@ -1,6 +1,10 @@
 {% extends "base.html" %}
 {% load telemeta_utils %}
 
+{% block extra_javascript %}
+<script src="/js/swfobject.js" type="text/javascript"></script>
+{% endblock %}
+
 {% block submenu %}
     <a href="{% url telemeta-collection-dublincore object.id|urlencode %}">
         Dublin Core</a>
@@ -8,6 +12,36 @@
 
 {% block content %}
 {% if object %}
+    {% if object.has_mediafile %}
+    <div id="collection_player">
+      <p><b>Listen to this collection</b>
+      (<a href="{% url telemeta-collection-m3u object.id|urlencode %}">M3U</a>,
+      <a href="{% url telemeta-collection-xspf object.id|urlencode %}">XSPF</a>)</p>
+      {% if 0 %} {# Use 1/0 for alternate player #}
+        <!-- This is the XSPF Web Music Player, under the BSD license, 
+          from: http://musicplayer.sourceforge.net/-->
+        <object type="application/x-shockwave-flash" width="300" height="200"
+          data="/swf/xspf_player.swf?playlist_url={% url telemeta-collection-xspf object.id|urlencode %}">
+          <param name="movie" 
+            value="/swf/xspf_player.swf?playlist_url={% url telemeta-collection-xspf object.id|urlencode %}" />
+        </object>
+      {% else %}
+        <!-- This is Jeroen Wijering's Flash MP3 Player, 
+          under CC Attribution-NonCommercial-ShareAlike 2.0 license
+          from: http://www.jeroenwijering.com/?item=Flash_MP3_Player-->
+        <p id="collection_player_c">
+          <a href="http://www.macromedia.com/go/getflashplayer">Get Flash</a> to see this player.
+        </p>
+        <script type="text/javascript">
+          var so = new SWFObject('/swf/mp3player.swf','playlist','300','200','7');
+          so.addVariable("file","{% url telemeta-collection-xspf object.id|urlencode %}");
+          so.addVariable("displayheight","0");
+          so.write('collection_player_c');
+        </script> 
+      {% endif %}
+    </div>      
+    {% endif %}
+
     <h3>Collection: {{ object.title }}</h3>
     <ul>
     {% for field in object.to_dict|tolist %}
         {% endifnotequal %}
     {% endfor %}
     </ul>
+
     <hr>
     <h4>Items</h4>
-    <ul>
-    {% for item in object.items.all %}
-        <li><b>{{ item.creator }}</b> - {{ item.title }}
-            <a href="{% url telemeta-item-detail item.id|urlencode %}">View</a>
-            <a href="#">Edit</a>
-            </li>
-    {% endfor %}
-    </ul>
+    {% with object.items.all as items %}
+    {% if items %}
+      <ul>
+      {% for item in items %}
+          <li><b>{{ item.creator }}</b> - {{ item.title }}
+              <a href="{% url telemeta-item-detail item.id|urlencode %}">View</a>
+              <a href="#">Edit</a>
+              </li>
+      {% endfor %}
+      </ul>
+    {% else %}
+      <p>No items</p>
+    {% endif %}
+    {% endwith %}
 {% else %}
     <p>No such collection</p>
 {% endif %}
diff --git a/telemeta/templates/collection_xspf.xml b/telemeta/templates/collection_xspf.xml
new file mode 100644 (file)
index 0000000..da067d4
--- /dev/null
@@ -0,0 +1,23 @@
+{% extends "base_xspf.xml" %}
+{% load telemeta_utils %}
+
+{% block listinfo %} 
+{% with collection.to_dublincore.flatten as dc %}
+  <creator>{{ dc.creator }}</creator>
+  <title>{{ dc.title }}</title>
+  <info>http://{{ host }}{% url telemeta-collection-detail collection.id|urlencode %}</info>
+{% endwith %}
+{% endblock %}
+
+{% block tracklist %}
+{% for item in collection.items.all %}
+    <track>
+      <title>{{ item.title }}</title>
+      <meta rel="type">mp3</meta>
+      <location>http://{{ host }}{% url telemeta-item-export item.id|urlencode,"MP3" %}</location>
+      <duration>{{ item.get_duration|mul:1000 }}</duration>
+      <info>http://{{ host }}{% url telemeta-item-detail item.id|urlencode %}</info>
+    </track>
+{% endfor %}
+{% endblock %}
+
index c483853a0f18dd895520f5fc827edfd123a5d3c1..aeabc6354dfd247026c81b8980f9d49df72edbc4 100644 (file)
@@ -1,6 +1,10 @@
 {% extends "base.html" %}
 {% load telemeta_utils %}
 
+{% block extra_javascript %}
+<script src="/js/swfobject.js" type="text/javascript"></script>
+{% endblock %}
+
 {% block submenu %}
     <a href="{% url telemeta-item-dublincore item.id|urlencode %}">
         Dublin Core</a>
@@ -8,7 +12,31 @@
 
 {% block content %}
 {% if item %}
+  {% if item.file %}  
     <div class="item_visualization">
+      {% if 0 %} {# Use 1/0 for alternate player #}
+        <!-- This is the XSPF Web Music Player, under the BSD license, 
+          from: http://musicplayer.sourceforge.net/-->
+        <object type="application/x-shockwave-flash" width="300" height="20"
+          data="/swf/xspf_player_slim.swf?playlist_url={% url telemeta-item-xspf item.id|urlencode %}">
+          <param name="movie" 
+            value="/swf/xspf_player_slim.swf?playlist_url={% url telemeta-item-xspf item.id|urlencode %}" />
+        </object><br/>
+      {% else %}      
+        <!-- This is Jeroen Wijering's Flash MP3 Player, 
+          under CC Attribution-NonCommercial-ShareAlike 2.0 license
+          from: http://www.jeroenwijering.com/?item=Flash_MP3_Player-->
+        <p id="item_player_c">
+          <a href="http://www.macromedia.com/go/getflashplayer">Get Flash</a> to see this player.
+        </p>
+        <script type="text/javascript">
+          var so = new SWFObject('/swf/mp3player.swf','line','300','20','7');
+          so.addVariable("file","{% url telemeta-item-export item.id|urlencode,"MP3" %}");
+          so.addVariable("type","mp3");
+          so.write('item_player_c');
+        </script>
+      {% endif %}
+
       <img src="{% url telemeta-item-visualize item.id|urlencode,visualizer_id %}">
       <form method="GET">
         <select name="visualizer_id" onchange="this.form.submit()">
         <input type="submit" value="OK">
       </form>
     </div>
-    <h3>Item: {{ item.title }}</h3>
-    <ul>
-    {% for field in item.to_dict|tolist %}
-        {% ifnotequal field.name "id" %}
-        {% ifnotequal field.name "title" %}
-        {% ifnotequal field.name "file" %}
-
-        <li><b>{{ field.name }}</b> : 
-            {% ifequal field.name "collection" %}
-            <a href="{% url telemeta-collection-detail field.value.id|urlencode %}">
-                {{ field.value }}</a>
-            {% else %}
-            {{ field.value }}
-            {% endifequal %}
-            </li>
-
-        {% endifnotequal %}
-        {% endifnotequal %}
-        {% endifnotequal %}
-    {% endfor %}
-    </ul>
-    Download:
-    {% for format in export_formats %}
-        <a href="{% url telemeta-item-export item.id|urlencode,format %}">{{ format }}</a>
-    {% endfor %}
+  {% endif %}    
+
+  <h3>Item: {{ item.title }}</h3>
+  <ul>
+  {% for field in item.to_dict|tolist %}
+      {% ifnotequal field.name "id" %}
+      {% ifnotequal field.name "title" %}
+      {% ifnotequal field.name "file" %}
+
+      <li><b>{{ field.name }}</b> : 
+          {% ifequal field.name "collection" %}
+          <a href="{% url telemeta-collection-detail field.value.id|urlencode %}">
+              {{ field.value }}</a>
+          {% else %}
+          {{ field.value }}
+          {% endifequal %}
+          </li>
+
+      {% endifnotequal %}
+      {% endifnotequal %}
+      {% endifnotequal %}
+  {% endfor %}
+  </ul>
+  Download:
+  {% for format in export_formats %}
+      <a href="{% url telemeta-item-export item.id|urlencode,format %}">{{ format }}</a>
+  {% endfor %}
 {% else %}
     <p>No such item</p>
 {% endif %}
diff --git a/telemeta/templates/mediaitem_xspf.xml b/telemeta/templates/mediaitem_xspf.xml
new file mode 100644 (file)
index 0000000..38293f5
--- /dev/null
@@ -0,0 +1,13 @@
+{% extends "base_xspf.xml" %}
+{% load telemeta_utils %}
+
+{% block tracklist %}
+    <track>
+      <title>{{ item.title }}</title>
+      <meta rel="type">mp3</meta>
+      <location>http://{{ host }}{% url telemeta-item-export item.id|urlencode,"MP3" %}</location>
+      <duration>{{ item.get_duration|mul:1000 }}</duration>
+      <info>http://{{ host }}{% url telemeta-item-detail item.id|urlencode %}</info>
+    </track>
+{% endblock %}
+
index e52bb21363f6fa4ae1caafd7e9ba0eb7590909a4..d2dcfa374560da1346eb5d49e98be91260fb13f3 100644 (file)
@@ -16,4 +16,9 @@ def tolist(dict):
         list.append({'name': k, 'value': v})
     return list        
 
+@register.filter
+def mul(value, arg):
+    "Multiply a numeric value"
+    return value * arg        
+
 
index ed316240316047df07541b78ebc0d6aad8300431..c22bf1facb89266a87f57ca81d3aaa901b9bd7c6 100644 (file)
@@ -39,12 +39,16 @@ urlpatterns = patterns('',
     url(r'^items/(?P<item_id>' + i_ex + ')/dc/xml/$', web_view.item_detail, 
         {'format': 'dublin_core_xml'},
         name="telemeta-item-dublincore-xml"),
-    url(r'^items/(?P<item_id>' + i_ex + ')/download/(?P<format>[0-9A-Z]+)/$', 
+    url(r'^items/(?P<item_id>' + i_ex + ')/download.(?P<format>[0-9A-Z]+)$', 
         web_view.item_export,
         name="telemeta-item-export"),
     url(r'^items/(?P<item_id>' + i_ex + ')/visualize/(?P<visualizer_id>[0-9a-z]+)/$', 
         web_view.item_visualize,
         name="telemeta-item-visualize"),
+    url(r'^items/(?P<item_id>' + i_ex + ')/item_xspf.xml$', 
+        web_view.item_playlist, 
+        dict(template="mediaitem_xspf.xml", mimetype="application/xspf+xml"),
+        name="telemeta-item-xspf"),
 
     # collections
     url(r'^collections/$', 'django.views.generic.list_detail.object_list',
@@ -62,6 +66,14 @@ urlpatterns = patterns('',
         'django.views.generic.list_detail.object_detail',
         dict(all_collections, template_name="collection_detail_dc.html"),
         name="telemeta-collection-dublincore"),
+    url(r'^collections/(?P<collection_id>' + c_ex + ')/collection_xspf.xml$', 
+        web_view.collection_playlist, 
+        dict(template="collection_xspf.xml", mimetype="application/xspf+xml"),
+        name="telemeta-collection-xspf"),
+    url(r'^collections/(?P<collection_id>' + c_ex + ')/collection.m3u$',
+        web_view.collection_playlist, 
+        dict(template="collection.m3u", mimetype="audio/mpegurl"),
+        name="telemeta-collection-m3u"),
 
     # search
     url(r'^search/$', web_view.quick_search, name="telemeta-quicksearch"),
@@ -93,4 +105,8 @@ urlpatterns = patterns('',
         {'document_root': './telemeta/htdocs/css'}),
     (r'^images/(?P<path>.*)$', 'django.views.static.serve', 
         {'document_root': './telemeta/htdocs/images'}),
+    (r'^js/(?P<path>.*)$', 'django.views.static.serve', 
+        {'document_root': './telemeta/htdocs/js'}),
+    (r'^swf/(?P<path>.*)$', 'django.views.static.serve', 
+        {'document_root': './telemeta/htdocs/swf'}),
 )
index 2b938999071d82d748d59494dbd61b0c1cb3e4c8..a59cf9128be560e02bc461b8b41fed575a93a754 100644 (file)
@@ -190,6 +190,24 @@ class WebView(Component):
             record.save()
 
         return self.edit_enumeration(request, enumeration_id)
+  
+    def collection_playlist(self, request, collection_id, template, mimetype):
+        collection = MediaCollection.objects.get(id__exact=collection_id)
+        if not collection:
+            raise Http404
+
+        template = loader.get_template(template)
+        context = Context({'collection': collection, 'host': request.META['HTTP_HOST']})
+        return HttpResponse(template.render(context), mimetype=mimetype)
+
+    def item_playlist(self, request, item_id, template, mimetype):
+        item = MediaItem.objects.get(id__exact=item_id)
+        if not item:
+            raise Http404
+
+        template = loader.get_template(template)
+        context = Context({'item': item, 'host': request.META['HTTP_HOST']})
+        return HttpResponse(template.render(context), mimetype=mimetype)