bug fix (bad prints), add item_analyze method to get all analyzer results

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 41dc1309e842c4d3a376d20eba686d8bf8685cda..f4a648df2cd3fc496b42ccb1213fd0317f283ec7 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -36,7 +36,6 @@
 
 from django.conf.urls.defaults import *
 from telemeta.models import MediaItem, MediaCollection
-#from telemeta.core import ComponentManager
 from telemeta.web.base import WebView
 import os.path
 import telemeta.config
@@ -44,7 +43,6 @@ import telemeta.config
 telemeta.config.check()
 
 # initialization
-#comp_mgr = ComponentManager()
 web_view = WebView()
 
 # query sets for Django generic views
@@ -78,6 +76,9 @@ urlpatterns = patterns('',
     url(r'^items/(?P<public_id>[A-Z0-9_]+)/visualize/(?P<visualizer_id>[0-9a-z_]+)/(?P<width>[0-9A-Z]+)x(?P<height>[0-9A-Z]+)/$', 
         web_view.item_visualize,
         name="telemeta-item-visualize"),
+    url(r'^items/(?P<public_id>[A-Z0-9_]+)/analyze/(?P<analyzer_id>[0-9a-z_]+)/$', 
+        web_view.item_analyze,
+        name="telemeta-item-analyze"),
     url(r'^items/(?P<public_id>[A-Z0-9_]+)/item_xspf.xml$', 
         web_view.item_playlist, 
         dict(template="telemeta/mediaitem_xspf.xml", mimetype="application/xspf+xml"),

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index ddfdc75632373713a14fb834c67505e0576a5aee..835da5a1ce71def3f32cfa4798218a04e43db770 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -124,7 +124,7 @@ class WebView:
             grapher_id = 'waveform'
         
         analyzers = [{'name':'','id':'','unit':'','value':''}]
-        # TODO: override timeside analyzer process when caching
+        # TODO: override timeside analyzer process when caching : write results to XML file in data/
         self.analyzer_mode = 0
         
         if self.analyzer_mode:
@@ -160,6 +160,12 @@ class WebView:
                     'visualizers': graphers, 'visualizer_id': grapher_id,'analysers': analyzers,
                     'audio_export_enabled': getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', False)
                     })
+    
+    def item_analyze(self, request, public_id):
+        # TODO: return an XML stream of the analyzed metadata
+        # response = HttpResponse(stream_from_file(media), mimetype = mime_type)
+        # return response
+        pass
 
     def item_visualize(self, request, public_id, visualizer_id, width, height):
         mime_type = 'image/png'
@@ -215,7 +221,7 @@ class WebView:
         item = MediaItem.objects.get(public_id=public_id)
         audio = os.path.join(os.path.dirname(__file__), item.file.path)
         decoder  = timeside.decoder.FileDecoder(audio)
-        print decoder.format(),  mime_type
+#        print decoder.format(),  mime_type
         if decoder.format() == mime_type:
             # source > stream
             response = HttpResponse(stream_from_file(audio), mimetype = mime_type)