Dublin Core Expression
+-
+
- ElementRefinement
- Value + {% for element in resource.elements %} +
- {{ element.name }}{{ element.refinement|default:" " }} +
- + {% if element.related|is_item or element.related|is_collection %} + {% if element.related|is_item %} + {{ element.value }} + {% else %} + {{ element.value }} + {% endif %} + {% else %} + {{ element.value }} + {% endif %} + + {% endfor %} + +
-
{% for p in items %}
-
- {{ p.title }} +
- {{ p.title }} {% endfor %} {% if more_items %}
- [...] {% endif %}
Item : {{ item.title }}
- + {% endblock %} {% block content %} @@ -50,8 +50,8 @@ load_player({{ item.get_duration }});
-
- 
+ 
Download: {% for format in export_formats %} - {{ format.name }} + {{ format.name }} {% endfor %}
Dublin Core Expression
--
-
- ElementRefinement
- Value - {% for element in item.to_dublincore.elements %} - {% if element.value %} -
- {{ element.name }}{{ element.refinement|default:" " }}
- {% ifequal element.field "collection" %}{{ element.value }}{% else %}{{ element.value }}{% endifequal %} - {% endif %} - {% endfor %} -
No such item
diff --git a/telemeta/templates/telemeta_default/mediaitem_xspf.xml b/telemeta/templates/telemeta_default/mediaitem_xspf.xml index ece81d37..78ed4cc5 100644 --- a/telemeta/templates/telemeta_default/mediaitem_xspf.xml +++ b/telemeta/templates/telemeta_default/mediaitem_xspf.xml @@ -5,9 +5,9 @@ {% endblock %} diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py index 39c5be2a..622cec0a 100644 --- a/telemeta/templatetags/telemeta_utils.py +++ b/telemeta/templatetags/telemeta_utils.py @@ -1,5 +1,8 @@ from django import template from django.utils.http import urlquote +from telemeta.models import MediaItem, MediaCollection +from django.core.urlresolvers import reverse +import telemeta.models.dublincore as dc register = template.Library() @@ -69,3 +72,24 @@ def build_query_string(vars): return "&".join(args) return '' +@register.filter +def code_or_id(resource): + if resource.code: + return resource.code + else: + return resource.id + +@register.filter +def is_item(resource): + return isinstance(resource, MediaItem) + +@register.filter +def is_collection(resource): + return isinstance(resource, MediaCollection) + +@register.filter +def to_dublincore(resource): + if isinstance(resource, MediaItem): + return dc.express_item(resource) + else: + return dc.express_collection(resource) diff --git a/telemeta/tests/model_tests.py b/telemeta/tests/model_tests.py index db45bae2..ae5e3b49 100644 --- a/telemeta/tests/model_tests.py +++ b/telemeta/tests/model_tests.py @@ -322,9 +322,11 @@ class RelatedDeleteTestCase(unittest.TestCase): self.assertEquals(q[0].publisher, self.publisher2) self.assertEquals(q[0].publisher_collection, None) - def testOnDeleteCascadeMultiple(self): + def testOnDeleteMultiple(self): Publisher.objects.all().delete() self.assertEquals(Publisher.objects.count(), 0) self.assertEquals(PublisherCollection.objects.count(), 0) self.assertEquals(MediaCollection.objects.count(), 2) + + diff --git a/telemeta/urls.py b/telemeta/urls.py index 160163d0..9fded5a4 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -52,8 +52,6 @@ all_items = { 'queryset': MediaItem.objects.all(), } all_collections = { 'queryset': MediaCollection.objects.all(), } # ID's regular expressions -i_ex = MediaItem.id_regex -c_ex = MediaCollection.id_regex export_extensions = "|".join(web_view.list_export_extensions()) htdocs = os.path.dirname(__file__) + '/htdocs' @@ -65,22 +63,22 @@ urlpatterns = patterns('', url(r'^items/$', 'django.views.generic.list_detail.object_list', dict(all_items, paginate_by=20, template_name="telemeta/mediaitem_list.html"), name="telemeta-items"), - url(r'^items/(?P[A-Z0-9_]+)/$', web_view.collection_detail,
+ dict(template="telemeta/collection_detail.html"), name="telemeta-collection-detail"),
+ url(r'^collections/(?P[A-Z0-9_]+)/dc/$', web_view.collection_detail,
+ dict(template="telemeta/collection_detail_dc.html"), name="telemeta-collection-dublincore"),
+ url(r'^collections/(?P[A-Z0-9_]+)/collection_xspf.xml$',
web_view.collection_playlist,
dict(template="telemeta/collection_xspf.xml", mimetype="application/xspf+xml"),
name="telemeta-collection-xspf"),
- url(r'^collections/(?P' + c_ex + ')/collection.m3u$',
+ url(r'^collections/(?P[A-Z0-9_]+)/collection.m3u$',
web_view.collection_playlist,
dict(template="telemeta/collection.m3u", mimetype="audio/mpegurl"),
name="telemeta-collection-m3u"),
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 805a7074..ef7e4fa3 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -54,6 +54,7 @@ from telemeta.analysis import *
from telemeta.analysis.vamp import *
import telemeta.interop.oai as oai
from telemeta.interop.oaidatasource import TelemetaOAIDataSource
+from django.core.exceptions import ObjectDoesNotExist
class WebView(Component):
"""Provide web UI methods"""
@@ -69,9 +70,14 @@ class WebView(Component):
context = Context({})
return HttpResponse(template.render(context))
- def item_detail(self, request, item_id, template='telemeta/mediaitem_detail.html'):
+ def collection_detail(self, request, code, template=''):
+ collection = MediaCollection.objects.get(code=code)
+ return render_to_response(template, {'collection': collection})
+
+
+ def item_detail(self, request, item_key, template='telemeta/mediaitem_detail.html'):
"""Show the details of a given item"""
- item = MediaItem.objects.get(pk=item_id)
+ item = MediaItem.objects.get(code_or_id=item_key)
formats = []
for exporter in self.exporters:
@@ -88,7 +94,11 @@ class WebView(Component):
analyzers = []
for analyzer in self.analyzers:
- value = analyzer.render(item)
+ if item.file:
+ value = analyzer.render(item)
+ else:
+ value = 'N/A'
+
analyzers.append({'name':analyzer.get_name(),
'id':analyzer.get_id(),
'unit':analyzer.get_unit(),
@@ -105,7 +115,7 @@ class WebView(Component):
'visualizers': visualizers, 'visualizer_id': visualizer_id,
'analysers': analyzers, 'vamp_plugins': vamp_plugin_list})
- def item_visualize(self, request, item_id, visualizer_id, width, height):
+ def item_visualize(self, request, item_key, visualizer_id, width, height):
for visualizer in self.visualizers:
if visualizer.get_id() == visualizer_id:
break
@@ -113,7 +123,7 @@ class WebView(Component):
if visualizer.get_id() != visualizer_id:
raise Http404
- item = MediaItem.objects.get(pk=item_id)
+ item = MediaItem.objects.get(code_or_id=item_key)
visualizer.set_colors((255,255,255), 'purple')
stream = visualizer.render(item, width=int(width), height=int(height))
@@ -127,7 +137,7 @@ class WebView(Component):
list.append(exporter.get_file_extension())
return list
- def item_export(self, request, item_id, extension):
+ def item_export(self, request, item_key, extension):
"""Export a given media item in the specified format (OGG, FLAC, ...)"""
for exporter in self.exporters:
if exporter.get_file_extension() == extension:
@@ -140,7 +150,7 @@ class WebView(Component):
exporter.set_cache_dir(settings.TELEMETA_EXPORT_CACHE_DIR)
- item = MediaItem.objects.get(pk=item_id)
+ item = MediaItem.objects.get(code_or_id=item_key)
infile = item.file.path
metadata = item.to_dublincore().flatten()
@@ -306,18 +316,20 @@ class WebView(Component):
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:
+ def collection_playlist(self, request, code, template, mimetype):
+ try:
+ collection = MediaCollection.objects.get(code=code)
+ except ObjectDoesNotExist:
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:
+ def item_playlist(self, request, item_key, template, mimetype):
+ try:
+ item = MediaItem.objects.get(code_or_id=item_key)
+ except ObjectDoesNotExist:
raise Http404
template = loader.get_template(template)