add tests, add cache cleanup options to telemeta-cleanip command, re-add ogg and...

diff --git a/telemeta/management/commands/telemeta-cleanup.py b/telemeta/management/commands/telemeta-cleanup.py
index 7bb614c3a03bbdccee3f7bfcafa1903196793eaf..35f47a8eeb472940552aa8c794a3ec64ef23063e 100644 (file)
--- a/telemeta/management/commands/telemeta-cleanup.py
+++ b/telemeta/management/commands/telemeta-cleanup.py
@@ -3,21 +3,30 @@ from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from telemeta.models import *
 from telemeta.util.unaccent import unaccent
+from telemeta.cache import TelemetaCache
 import logging
 import codecs
 
 class Command(BaseCommand):
     help = "Cleanup DB : multiple analyses, data cache, export cache, etc.."
     args = "None"
+    cache_data = None
+    cache_export = None
 
     def handle(self, *args, **options):
+        if 'cache' in args:
+            self.cache_data = TelemetaCache(settings.TELEMETA_DATA_CACHE_DIR)
+            self.cache_export = TelemetaCache(settings.TELEMETA_EXPORT_CACHE_DIR)
+            print "Cleaning all cache..."
 
         items = MediaItem.objects.all()
         a_counter = 0
 
         print 'Cleaning multiple analyses per item...'
         for item in items:
-
+            if self.cache_data and self.cache_export:
+                self.cache_data.delete_item_data(item.code)
+                self.cache_export.delete_item_data(item.code)
             analyses = MediaItemAnalysis.objects.filter(item=item)
             ids = []
             for analysis in analyses:
@@ -31,3 +40,5 @@ class Command(BaseCommand):
 
         print "Done, cleaned %s analyses" % str(a_counter)
 
+
+

diff --git a/telemeta/management/commands/telemeta-test-import.py b/telemeta/management/commands/telemeta-test-import.py
index f0739d06c4154497fa1932581f828bd0878ebaaf..a242d87b60560bfeaa8fc99b0555104f8f09be90 100644 (file)
--- a/telemeta/management/commands/telemeta-test-import.py
+++ b/telemeta/management/commands/telemeta-test-import.py
@@ -13,8 +13,13 @@ class Command(BaseCommand):
     code = 'test'
     title = 'test'
     urls = ['http://files.parisson.com/telemeta/tests/media/sweep.mp3',
+            'http://files.parisson.com/telemeta/tests/media/sweep.wav',
+            'http://files.parisson.com/telemeta/tests/media/test.ogg',
+            'http://files.parisson.com/telemeta/tests/media/test.flac',
             'http://files.parisson.com/telemeta/tests/media/test4.mp3',
-            'http://files.parisson.com/telemeta/tests/media/test5.wav']
+            'http://files.parisson.com/telemeta/tests/media/test5.wav',
+            'http://files.parisson.com/telemeta/tests/media/test6.wav']
+
     cache_data = TelemetaCache(settings.TELEMETA_DATA_CACHE_DIR)
     cache_export = TelemetaCache(settings.TELEMETA_EXPORT_CACHE_DIR)
 
@@ -27,6 +32,7 @@ class Command(BaseCommand):
         collections = MediaCollection.objects.filter(code=self.code)
         if not collections:
             collection = MediaCollection(code=self.code, title=self.title)
+            collection.public_access = 'full'
             collection.save()
         else:
             collection = collections[0]

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 969933706877d23b9e75877e54ba129d5f21e7ed..058e05734e8260a5b5534cf681fda6cb60e902c1 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -539,9 +539,7 @@ class ItemView(object):
         # Get TimeSide processors
         formats = []
         for encoder in self.encoders:
-            #FIXME: timeside cannot encode to FLAC and OGG now :'(
-            if encoder.file_extension() != 'ogg' and encoder.file_extension() != 'flac':
-                formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
+            formats.append({'name': encoder.format(), 'extension': encoder.file_extension()})
 
         graphers = []
         for grapher in self.graphers: