restrict download formats for item, so you need to choose export formats explicitely...

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index f212972e5939e1a763df498623d1d47c0c9d0e99..1fde562bcfcb1ff456cfc46129813008fb302965 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -156,12 +156,6 @@ class ItemView(object):
         """Edit a given item"""
         item = MediaItem.objects.get(public_id=public_id)
 
-        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()})
-
         graphers = []
         for grapher in self.graphers:
             graphers.append({'name':grapher.name(), 'id': grapher.id()})
@@ -173,6 +167,9 @@ class ItemView(object):
             except:
                 grapher_id = 'waveform'
 
+        export_enabled = getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', True)
+        export_formats = getattr(settings, 'TELEMETA_DOWNLOAD_FORMATS', ('mp3', 'wav'))
+
         previous, next = self.item_previous_next(item)
         mime_type = self.item_analyze(item)
         #FIXME: use mimetypes.guess_type
@@ -208,10 +205,12 @@ class ItemView(object):
         forms = [item_form, format_form]
 
         return render(request, template,
-                    {'item': item, 'export_formats': formats,
+                    {'item': item,
+                     'export_formats': export_formats,
                     'visualizers': graphers, 'visualizer_id': grapher_id,
-                    'audio_export_enabled': getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', True),
-                    'forms': forms, 'previous' : previous, 'next' : next, 'mime_type': mime_type,
+                    'audio_export_enabled': export_enabled,
+                    'forms': forms, 'previous' : previous,
+                    'next' : next, 'mime_type': mime_type,
                     })
 
     def related_media_item_stream(self, request, item_public_id, media_id):