cleanup, fix data cache

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 6249c488ae42fdec054be6c555c4fae8f16447ed..3f5c8c528738a6b1def3eab99e4537933f57528e 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -20,6 +20,7 @@
 <script type="text/javascript">\r
 soundManager.url = '{% url telemeta-swf "./" %}';\r
 soundManager.flashVersion = 9;\r
+soundManager.useMovieStar = true; // enable MP4/M4A/AAC\r
 soundManager.debugMode = false;\r
 set_player_image_url('{% url telemeta-item-visualize item.public_id,visualizer_id,"WIDTH","HEIGHT" %}');\r
 load_player({{ item.approx_duration.as_seconds }});\r

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 6b5aff80d9949cfc19f94269ce8f7a8b426b34eb..b21b4756d1a64e499ecf2e56221edf34d0e4133d 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -160,7 +160,8 @@ class WebView:
         if grapher.id() != grapher_id:
             raise Http404
 
-        media = settings.TELEMETA_EXPORT_DATA_DIR + os.sep + public_id + '_' + grapher_id + '_' + width + '_' + height + '.png'
+        media = settings.TELEMETA_DATA_CACHE_DIR + \
+                    os.sep + '_'.join([public_id,  grapher_id,  width,  height]) + '.png'
         #graph.set_colors((255,255,255), 'purple')
         
         if not os.path.exists(media):
@@ -200,7 +201,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
             media = audio