From af7869031a720920b8185e54c894cb068eee2a54 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 21 Dec 2011 14:04:33 +0100 Subject: [PATCH] add tests, add cache cleanup options to telemeta-cleanip command, re-add ogg and flac for download --- telemeta/management/commands/telemeta-cleanup.py | 13 ++++++++++++- .../management/commands/telemeta-test-import.py | 8 +++++++- telemeta/web/base.py | 4 +--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/telemeta/management/commands/telemeta-cleanup.py b/telemeta/management/commands/telemeta-cleanup.py index 7bb614c3..35f47a8e 100644 --- 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 f0739d06..a242d87b 100644 --- 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 96993370..058e0573 100644 --- 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: -- 2.39.5