Changeset 27a5b88 for telemeta/export/flac.py

Timestamp:

05/21/07 01:20:38 (6 years ago)

Author:

yomguy <>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

dfc0718

Parents:

3e80d17

git-author:

yomguy <> (05/21/07 01:20:38)

git-committer:

yomguy <> (05/21/07 01:20:38)

Message:

Moved audio generator to ExporterCore?.core_process

File:

• telemeta/export/flac.py (modified) (4 diffs)

telemeta/export/flac.py

@@ -86 +86 @@
         media.save()
         
-    def process(self, item_id, source, metadata, options=None):
-        self.item_id = item_id
-        self.source = source
-        self.metadata = metadata
-        self.options = {}
+    def get_args(self,options=None):
+        """Get process options and return arguments for the encoder"""
         args = ''
-        
         if not options is None:
             self.options = options
-            
-            if 'verbose' in self.options and self.options['verbose'] != '0':
-                args = args
-            else:
+            if not ('verbose' in self.options and self.options['verbose'] != '0'):
                 args = args + ' -s '
-                
+
             if 'flac_quality' in self.options:
                 args = args+' -f -'+self.options['flac_quality']
@@ -107 +100 @@
         else:
             args = args+' -s -f -'+self.quality_default
-    
+        return args
+        
+    def process(self, item_id, source, metadata, options=None):
+        self.item_id = item_id
+        self.source = source
+        self.metadata = metadata
+        #self.options = {}
+        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 -'
+
+        # Pre-proccessing
         try:
-            # Pre-proccessing (core)
-            self.ext = self.get_file_extension()
             self.dest = self.pre_process(self.item_id,
                                          self.source,
@@ -117 +120 @@
                                          self.cache_dir,
                                          self.options)
-                                         
-            # Initializing
-            chunk = 0
-            file_out = open(self.dest,'w')
-            
-            proc = subprocess.Popen( \
-                    'sox "'+self.source+'" -q -w -r 44100 -t wav -c2 - '+
-                    '| flac '+args+' -c -',
-                    shell=True,
-                    bufsize=self.buffer_size,
-                    stdin=subprocess.PIPE,
-                    stdout=subprocess.PIPE,
-                    close_fds=True)
+        except:
+            yield 'ExporterError [3]: pre_process'
 
-            chunk = proc.stdout.read(self.buffer_size)
-            yield chunk
-            file_out.write(chunk)
+        # Processing (streaming + cache writing)
+        try:
+            stream = self.core_process(self.command,self.buffer_size,self.dest)
+            for chunk in stream:
+                yield chunk
+        except:
+            yield 'ExporterError: core_process'
 
-            # Processing
-            while chunk:
-                chunk = proc.stdout.read(self.buffer_size)
-                yield chunk
-                file_out.write(chunk)           
-            
-            #file_in.close()
-            file_out.close()
-
-            # Encoding
-            #os.system('flac '+args+' -o "'+self.dest+'" "'+ \
-            #          self.source+'" > /dev/null')
-
-            # Post-proccessing (self)
-            self.write_tags()
+        # Post-proccessing
+        try:
+            self.write_tags()        
             self.post_process(self.item_id,
                          self.source,
@@ -156 +140 @@
                          self.cache_dir,
                          self.options)
+        except:
+            yield 'ExporterError: post_process'
 
-            # Output
-            #return self.dest
 
-        except IOError:
-            yield 'ExporterError [3]: source file does not exist.'
-
+        # Encoding
+            #os.system('flac '+args+' -o "'+self.dest+'" "'+ \
+            #          self.source+'" > /dev/null')