From: yomguy <>
Date: Tue, 31 Aug 2010 12:14:25 +0000 (+0000)
Subject: cleanup, fix data cache
X-Git-Tag: 1.1~491
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e23e0e83cc3b55a76eef0649501038fd651b06cc;p=telemeta.git

cleanup, fix data cache
---

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 6249c488..3f5c8c52 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -20,6 +20,7 @@
 <script type="text/javascript">
 soundManager.url = '{% url telemeta-swf "./" %}';
 soundManager.flashVersion = 9;
+soundManager.useMovieStar = true; // enable MP4/M4A/AAC
 soundManager.debugMode = false;
 set_player_image_url('{% url telemeta-item-visualize item.public_id,visualizer_id,"WIDTH","HEIGHT" %}');
 load_player({{ item.approx_duration.as_seconds }});
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 6b5aff80..b21b4756 100644
--- 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