Fixed export verbose mode in option dict (see export_test)

diff --git a/telemeta/export/core.py b/telemeta/export/core.py
index c54eed952d49f4f1f13e2816b5f7bea4c0a42216..e64409976cf2c8a36ad69a49f1a6e6740c35c6d9 100644 (file)
--- a/telemeta/export/core.py
+++ b/telemeta/export/core.py
@@ -146,7 +146,7 @@ class ExporterCore(Component):
 
        def post_process(self, item_id, source, metadata, ext, cache_dir, options):
                """ Post processing of the Core. Print infos, etc..."""
-               if 'verbose' in self.metadata and self.verbose != '0':
+               if 'verbose' in self.options and self.options['verbose'] != '0':
                        print self.dest
                        print self.get_file_info()
 

diff --git a/telemeta/export/flac.py b/telemeta/export/flac.py
index 101331e371c5e2f25ab88733803b623273a2a014..c7cae565071749010b85141fc07ae89f8f9bf5c1 100644 (file)
--- a/telemeta/export/flac.py
+++ b/telemeta/export/flac.py
@@ -24,12 +24,13 @@ class FlacExporter(ExporterCore):
        
        def __init__(self):
                self.item_id = ''
-               self.metadata = []
-               self.description = ''
-               self.info = []
                self.source = ''
+               self.metadata = {}
+               self.options = {}
+               self.description = ''
                self.dest = ''
                self.quality_default = '5'
+               self.info = []
                
        def get_format(self):
                return 'FLAC'
@@ -88,13 +89,13 @@ class FlacExporter(ExporterCore):
                self.metadata = metadata
                self.options = options
 
-               if 'flac_quality' in self.metadata and \
-                  self.metadata['flac_quality'] != '':
-                       args = '-f -V -'+self.metadata['flac_quality']
+               if 'flac_quality' in self.options and \
+                  self.options['flac_quality'] != '':
+                       args = '-f -V -'+self.options['flac_quality']
                else:
-                       args = '-f -s   -V -'+self.quality_default
+                       args = '-f -V -'+self.quality_default
 
-               if not 'verbose' in self.metadata or self.metadata['verbose'] == '0':
+               if 'verbose' in self.options and self.options['verbose'] == '0':
                        args = args+' -s'
        
                try:

diff --git a/telemeta/export/ogg.py b/telemeta/export/ogg.py
index 2e88400de761456c2913e8f88bafa5ffc9e4ba57..a1ec2133aeb841c13a60af95ebdf868bcd2132b9 100644 (file)
--- a/telemeta/export/ogg.py
+++ b/telemeta/export/ogg.py
@@ -24,11 +24,12 @@ class OggExporter(ExporterCore):
        
        def __init__(self):
                self.item_id = ''
-               self.metadata = []
+               self.metadata = {}
                self.description = ''
                self.info = []
                self.source = ''
                self.dest = ''
+               self.options = {}
                self.bitrate_default = '192'
 
        def get_format(self):
@@ -77,14 +78,14 @@ class OggExporter(ExporterCore):
                self.metadata = metadata
                self.options = options
 
-               if 'ogg_bitrate' in self.metadata:
-                       args = '-b '+self.metadata['ogg_bitrate']
-               elif 'ogg_quality' in self.metadata:
-                       args = '-q '+self.metadata['ogg_quality']
+               if 'ogg_bitrate' in self.options:
+                       args = '-b '+self.options['ogg_bitrate']
+               elif 'ogg_quality' in self.options:
+                       args = '-q '+self.options['ogg_quality']
                else:
                        args = '-b '+self.bitrate_default
 
-               if not 'verbose' in self.metadata or self.metadata['verbose'] == '0':
+               if 'verbose' in self.options and self.options['verbose'] == '0':
                        args = args + ' -Q'
                
                if os.path.exists(self.source) and not iswav16(self.source):

diff --git a/telemeta/export/wav.py b/telemeta/export/wav.py
index 4d4cf97f4c2894126c3ecf64cc0b60b49891f4c3..9cf679fc8c5eec844f756f0c665ca4501660cd15 100644 (file)
--- a/telemeta/export/wav.py
+++ b/telemeta/export/wav.py
@@ -23,12 +23,12 @@ class WavExporter(ExporterCore):
        
        def __init__(self):
                self.item_id = ''
-               self.metadata = []
+               self.metadata = {}
                self.description = ''
                self.info = []
                self.source = ''
                self.dest = ''
-               
+               self.options = {}
                
        def get_format(self):
                return 'WAV'
@@ -87,7 +87,7 @@ class WavExporter(ExporterCore):
        def create_par_key(self):
                """ Create the par2 keys of the dest """
                args = 'c -n1 '
-               if not 'verbose' in self.metadata or self.metadata['verbose'] == '0':
+               if 'verbose' in self.options and self.options['verbose'] == '0':
                        args = args + '-q -q '
                try:
                        os.system('par2 '+args+' "'+self.dest+'"')
@@ -116,14 +116,7 @@ class WavExporter(ExporterCore):
                        
                        # Pre-proccessing (self)
                        self.write_tags()
-                       self.post_process(self.item_id,
-                                                self.source,
-                                                self.metadata,
-                                                self.ext,
-                                                self.cache_dir,
-                                                self.options)
 
-                       # Special post process
                        # Create the md5 key
                        #if 'md5' in self.metadata and self.metadata['md5']:
                        self.create_md5_key()
@@ -132,6 +125,13 @@ class WavExporter(ExporterCore):
                        #if 'par2' in self.metadata and self.metadata['par2']:
                        self.create_par_key()
 
+                       self.post_process(self.item_id,
+                                                self.source,
+                                                self.metadata,
+                                                self.ext,
+                                                self.cache_dir,
+                                                self.options)
+
                        # Output                                
                        return self.dest
 

diff --git a/tests/export_test.py b/tests/export_test.py
index 9cce862156a215dca7eb5bdc0ee52cde40a8251c..0e88536607dff849e93c8ab49978e4f8671b9fcf 100644 (file)
--- a/tests/export_test.py
+++ b/tests/export_test.py
@@ -10,7 +10,6 @@
 #
 # Author: Guillaume Pellerin <pellerin@parisson.com>
 
-
 import os
 
 from telemeta.export import *
@@ -25,7 +24,7 @@ metadata = {'Collection': 'Test',
                 'Artist': 'Cellar',
                 'Encoder': 'Telemeta',
                 }
-options = {'verbose': '1'}
+options = {'verbose': '0'}
 
 
 class ExportTest(Component):
@@ -34,12 +33,14 @@ class ExportTest(Component):
        def run(self):
                for exporter in self.exporters:
                        format = exporter.get_format()
-                       print "+------------------------------------------"
-                       print '| Testing exporter format: ' + format
-                       print "+------------------------------------------"
+                       if 'verbose' in options and options['verbose'] != '0':
+                               print "+------------------------------------------"
+                               print '| Testing exporter format: ' + format
+                               print "+------------------------------------------"
                        exporter.set_cache_dir(cache_dir)
                        exporter.process(item_id,source,metadata,options)
 
+
 compmgr = ComponentManager()
 test = ExportTest(compmgr)
 test.run()