From: Guillaume Pellerin Date: Mon, 20 Jan 2014 20:55:41 +0000 (+0100) Subject: only get IValueAnalyzer list for default analyzers X-Git-Tag: 1.4.5-1~3^2~1 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4dfe33f052f631d228bd28d06c1314c86fc7cc01;p=telemeta.git only get IValueAnalyzer list for default analyzers --- diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py index 403e116e..7c2ed430 100644 --- a/example/sandbox/settings.py +++ b/example/sandbox/settings.py @@ -164,3 +164,4 @@ LOGIN_REDIRECT_URL = reverse_lazy('telemeta-desk-lists') EMAIL_HOST = 'localhost' DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' + diff --git a/telemeta/views/core.py b/telemeta/views/core.py index 22d7d03c..8f51b1ee 100644 --- a/telemeta/views/core.py +++ b/telemeta/views/core.py @@ -44,6 +44,7 @@ import datetime import tempfile import zipfile import timeside +import mimetypes from jsonrpc import jsonrpc_method diff --git a/telemeta/views/item.py b/telemeta/views/item.py index 8330f02e..5a9bb215 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -34,9 +34,10 @@ # Authors: Olivier Guilyardi # Guillaume Pellerin -import mimetypes + from telemeta.views.core import * + class ItemView(object): """Provide Item web UI methods""" @@ -44,14 +45,13 @@ class ItemView(object): decoders = timeside.core.processors(timeside.api.IDecoder) encoders = timeside.core.processors(timeside.api.IEncoder) analyzers = timeside.core.processors(timeside.api.IAnalyzer) + value_analyzers = timeside.core.processors(timeside.api.IValueAnalyzer) cache_data = TelemetaCache(settings.TELEMETA_DATA_CACHE_DIR) cache_export = TelemetaCache(settings.TELEMETA_EXPORT_CACHE_DIR) export_enabled = getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', True) export_formats = getattr(settings, 'TELEMETA_DOWNLOAD_FORMATS', ('mp3', 'wav')) - default_analyzers = ['mean_dc_shift', 'level'] - def get_export_formats(self): formats = [] for encoder in self.encoders: @@ -369,11 +369,10 @@ class ItemView(object): decoder = timeside.decoder.FileDecoder(item.file.path) pipe = decoder - for analyzer in self.analyzers: - if analyzer.id() in self.default_analyzers: - subpipe = analyzer() - analyzers_sub.append(subpipe) - pipe = pipe | subpipe + for analyzer in self.value_analyzers: + subpipe = analyzer() + analyzers_sub.append(subpipe) + pipe = pipe | subpipe try: sizes = settings.TELEMETA_DEFAULT_GRAPHER_SIZES