From: yomguy <>
Date: Wed, 23 May 2007 19:11:31 +0000 (+0000)
Subject: - Fixed ExportProcessError
X-Git-Tag: 1.1~906
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d0362b666b18ddcd7a9474f40cec543591eca300;p=telemeta.git

- Fixed ExportProcessError
- Remove sox piping for FLAC
---

diff --git a/telemeta/export/api.py b/telemeta/export/api.py
index 8e031d81..cdd336e0 100644
--- a/telemeta/export/api.py
+++ b/telemeta/export/api.py
@@ -74,13 +74,14 @@ class ExportProcessError(TelemetaError):
 
     def __init__(self, message, command, subprocess):
         self.message = message
-        self.command = command
+        self.command = str(command)
         self.subprocess = subprocess
 
     def __str__(self):
-        error = self.subprocess.stderr.read()
+        if self.subprocess.stderr != None:
+            error = self.subprocess.stderr.read()
+        else:
+            error = ''
         return "%s ; command: %s; error: %s" % (self.message,
                                                 self.command,
                                                 error)
-
-    
\ No newline at end of file
diff --git a/telemeta/export/core.py b/telemeta/export/core.py
index 00e87b13..d01139e8 100644
--- a/telemeta/export/core.py
+++ b/telemeta/export/core.py
@@ -185,7 +185,7 @@ class ExporterCore(Component):
     def post_process(self, item_id, source, metadata, ext, 
                      cache_dir, options=None):
         """ Post processing : write tags, print infos, etc..."""
-        #self.write_tags()
+        self.write_tags()
         if not options is None:
             if 'verbose' in self.options and self.options['verbose'] != '0':
                 print self.dest
diff --git a/telemeta/export/flac.py b/telemeta/export/flac.py
index 4626e167..3e96d1a5 100644
--- a/telemeta/export/flac.py
+++ b/telemeta/export/flac.py
@@ -107,8 +107,7 @@ class FlacExporter(ExporterCore):
         self.metadata = metadata
         self.args = self.get_args(options)
         self.ext = self.get_file_extension()
-        self.command = 'sox "'+self.source+'" -q -w -r 44100 -t wav -c2 - '+ \
-                       '| flac '+self.args+' -c -'
+        self.command = 'flac '+self.args+' "'+self.source+'" -c -'
 
         # Pre-proccessing
         self.dest = self.pre_process(self.item_id,
@@ -119,7 +118,7 @@ class FlacExporter(ExporterCore):
                                          self.options)
 
         # Processing (streaming + cache writing)
-        stream = self.core_process(self.command,self.buffer_size,self.dest)
+        stream = self.core_process(self.command, self.buffer_size, self.dest)
         for chunk in stream:
             yield chunk
 
@@ -131,7 +130,3 @@ class FlacExporter(ExporterCore):
                          self.cache_dir,
                          self.options)
 
-        # Encoding
-            #os.system('flac '+args+' -o "'+self.dest+'" "'+ \
-            #          self.source+'" > /dev/null')
-
diff --git a/telemeta/export/mp3.py b/telemeta/export/mp3.py
index 77643120..21401b4f 100644
--- a/telemeta/export/mp3.py
+++ b/telemeta/export/mp3.py
@@ -132,7 +132,7 @@ class Mp3Exporter(ExporterCore):
         self.args = self.get_args(self.metadata,options)
         self.ext = self.get_file_extension()
         self.command = 'sox "'+self.source+'" -q -w -r 44100 -t wav -c2 - '+ \
-                       '| lame '+self.args+' - '
+                       '| lame '+self.args+' --tc "default" - '
             
         # Pre-proccessing
         self.dest = self.pre_process(self.item_id,
@@ -148,7 +148,7 @@ class Mp3Exporter(ExporterCore):
         for chunk in stream:
             yield chunk
 
-        # Post-proccessing     
+        # Post-proccessing
         self.post_process(self.item_id,
                          self.source,
                          self.metadata,
@@ -156,7 +156,3 @@ class Mp3Exporter(ExporterCore):
                          self.cache_dir,
                          self.options)
 
-        # Encoding
-        # os.system('lame '+args+' --tc "default" "'+self.source+
-        #                        '" "'+self.dest+'"')
-            
diff --git a/telemeta/export/ogg.py b/telemeta/export/ogg.py
index 5d6b239e..f473a1f0 100644
--- a/telemeta/export/ogg.py
+++ b/telemeta/export/ogg.py
@@ -106,7 +106,6 @@ class OggExporter(ExporterCore):
                        '| oggenc '+self.args+' -'
 
         # Pre-proccessing
-
         self.dest = self.pre_process(self.item_id,
                                         self.source,
                                         self.metadata,
@@ -128,7 +127,3 @@ class OggExporter(ExporterCore):
                         self.cache_dir,
                         self.options)
 
-        # Post-proccessing
-        #os.system('sox "'+self.source+'" -w -r 44100 -t wav -c2 - \
-        #      | oggenc '+args+' -o "'+self.dest+'" -')
-