Changeset 289 for indytube/trunk

Timestamp:

11/26/07 10:54:01 (14 months ago)

Author:

andy

Message:

Bugfix the refactoring of indytube main script. Mainly this gives us a
simple method that can be called externally to transcode a file.

Moved the file name for configuration into a config.py script

Location:

indytube/trunk/indytube

Files:

• config.py (added)
• indytube.py (modified) (5 diffs)

indytube/trunk/indytube/indytube.py

@@ -16 +16 @@
 from twisted.internet import reactor
 
-CONF_FILE_DEFAULT = '/etc/indytube/indytube.conf'
+from config import CONF_FILE_DEFAULT
 
 class IndyTubeTranscoder(object):
@@ -101 +101 @@
                 for f in files:
                         ok = self.attempt_transcode_file(f)
-                        self.checked = self.checked + 1
                         if ok:
                                 self.converted = self.converted + 1
@@ -111 +110 @@
         ## end : do_transcoding_loop
 
-def attempt_transcode_file(self, f):
+   def attempt_transcode_file(self, f):
         '''Start the transcoding attempt with file 'f'. Converts to FLV format, and OGG/Theora. Produces HTML snippets for including
            the players appropriate for the produced video format. At the moment, this is FlowPlayer for FLV, and Cortado java applet for OGG/Theora '''
@@ -120 +119 @@
         if extension.lower() in self.CONVERT_THESE:  #we should convert the file
 
-                relative_directory=root[len(self.VIDEO_FILE_DIRECTORY):]
+                #get last character, or first one
+                relative_directory=self.VIDEO_FILE_DIRECTORY[len(self.VIDEO_FILE_DIRECTORY):]
                 if relative_directory.startswith(os.sep):
                         relative_directory=relative_directory[1:]  # make sure we are relative
 
-                        videofile = os.path.join(root,f)
-                        lockfile = os.path.join(root,stem+".wetube_lock")  # we are encoding already
-                        skipfile = os.path.join(root,stem+".wetube_skip")  # we tried and failed, don't bother again
-                        flvfile  = os.path.join(self.FLV_FILE_DIRECTORY,relative_directory,stem+".flv")
-                        theorafile = os.path.join(self.FLV_FILE_DIRECTORY,relative_directory,stem+".ogg")
-                        includefile  = os.path.join(self.INCLUDE_FILE_DIRECTORY,relative_directory,stem+self.INCLUDE_FILE_SUFFIX)
-                        #logging.info("check for %s, %s, %s " % (lockfile, skipfile, flvfile))
-
-                        #check that another encoder isnt already processing this file (lockfile) or that we havent tried and failed before (skipfile)
-                        if not(os.path.exists(lockfile) or os.path.exists(skipfile)):
-                                #OK, valid video file ready to try to transcode
-                                logging.debug("Checking file %s, using extension %s " % ( os.path.join(root,f), extension))
-                                try:
-                                        # touch the lock file
-                                        os.mknod(lockfile)
-
-                                        # if the flv file (autogenerated) or html snippet is not there, then reencode!
-                                        if not(os.path.exists(flvfile)) or not(os.path.exists(includefile)):
-                                                logging.info('OK to try encoding: '+videofile)
+                root = self.VIDEO_FILE_DIRECTORY
+                videofile = os.path.join(root,f)
+                lockfile = os.path.join(root,stem+".wetube_lock")  # we are encoding already
+                skipfile = os.path.join(root,stem+".wetube_skip")  # we tried and failed, don't bother again
+                flvfile  = os.path.join(self.FLV_FILE_DIRECTORY,relative_directory,stem+".flv")
+                theorafile = os.path.join(self.FLV_FILE_DIRECTORY,relative_directory,stem+".ogg")
+                includefile  = os.path.join(self.INCLUDE_FILE_DIRECTORY,relative_directory,stem+self.INCLUDE_FILE_SUFFIX)
+                logging.info("check for %s, %s, %s " % (lockfile, skipfile, flvfile))
+
+                #check that another encoder isnt already processing this file (lockfile) or that we havent tried and failed before (skipfile)
+                if not(os.path.exists(lockfile) or os.path.exists(skipfile)):
+                        #OK, valid video file ready to try to transcode
+                        logging.info("Checking file %s, using extension %s " % ( os.path.join(root,f), extension))
+                        self.checked = self.checked + 1
+                        try:
+                                # touch the lock file
+                                os.mknod(lockfile)
+
+                                # if the flv file (autogenerated) or html snippet is not there, then reencode!
+                                if not(os.path.exists(flvfile)) or not(os.path.exists(includefile)):
+                                        logging.info('OK to try encoding: '+videofile)
                                                         
-                                                #pipe_to_null = '> /dev/null 2>&1'
-                                                if self.DO_ENCODING: #maybe we just want to regenerate the include file!
-                                                        #mencoder flv conversion
-                                                        start_time=time.time()
-                                                        encoder_command = self.MENCODER_LOCATION + " -quiet " + videofile + " -o " + flvfile + " " + self.MENCODER_OPTIONS
-                                                        os.system('nice -n '+self.BE_HOW_NICE+' '+encoder_command)
-                                                        finish_time=time.time()
-                                                        logging.info("Encoded %s in %.2f seconds, using cmd -- %s" % (videofile,finish_time-start_time,encoder_command))
-                                                        flvtool_command = self.FLVTOOL_LOCATION+" -U stdin "+flvfile
-                                                        os.system("cat "+ flvfile +" | "+ 'nice -n '+ self.BE_HOW_NICE+' '+flvtool_command) 
-
-                                                        #ffmpeg2theora , theora/ogg conversion
-                                                        start_time=time.time()  
-                                                        theora_cmd =  self.FFMPEG2THEORA_COMMAND + ' ' + videofile + " -o " + theorafile
-                                                        os.system('nice -n '+ self.BE_HOW_NICE+' '+ theora_cmd)
-                                                        finish_time=time.time()
-                                                        logging.info("Encoded %s in %.2f seconds, using cmd -- %s" % (videofile,finish_time-start_time,theora_cmd))
-
-                                                else:
-                                                        logging.debug("skipped encoding, will just do html template generation, if flv exists as non-zero size")
+                                        #pipe_to_null = '> /dev/null 2>&1'
+                                        if self.DO_ENCODING: #maybe we just want to regenerate the include file!
+                                                #mencoder flv conversion
+                                                start_time=time.time()
+                                                encoder_command = self.MENCODER_LOCATION + " -quiet " + videofile + " -o " + flvfile + " " + self.MENCODER_OPTIONS
+                                                os.system('nice -n '+self.BE_HOW_NICE+' '+encoder_command)
+                                                finish_time=time.time()
+                                                logging.info("Encoded %s in %.2f seconds, using cmd -- %s" % (videofile,finish_time-start_time,encoder_command))
+                                                flvtool_command = self.FLVTOOL_LOCATION+" -U stdin "+flvfile
+                                                os.system("cat "+ flvfile +" | "+ 'nice -n '+ self.BE_HOW_NICE+' '+flvtool_command) 
+
+                                                #ffmpeg2theora , theora/ogg conversion
+                                                start_time=time.time()  
+                                                theora_cmd =  self.FFMPEG2THEORA_COMMAND + ' ' + videofile + " -o " + theorafile
+                                                os.system('nice -n '+ self.BE_HOW_NICE+' '+ theora_cmd)
+                                                finish_time=time.time()
+                                                logging.info("Encoded %s in %.2f seconds, using cmd -- %s" % (videofile,finish_time-start_time,theora_cmd))
+
+                                        else:
+                                                logging.debug("skipped encoding, will just do html template generation, if flv exists as non-zero size")
                     
-                                        else:
-                                                logging.debug("flv file and html file already exists, not doing transcoding")
-
-                                        #make the flash HTML snippet if the flv got created correctly.
-                                        #XXX todo, separate out the flv and ogg theora (java applet) html snippet
-                                        if os.path.exists(flvfile) and os.path.getsize(flvfile)>0:
-                                                logging.info("Making html template - original size of %s: %.1fMB, Encoded size: %.1fMB" % (videofile,os.path.getsize(videofile)/1000000.0,os.path.getsize(flvfile)/1000000.0))
-                                                data_map={
-                                                        'flowplayer_location':self.FLOWPLAYER_LOCATION, 
-                                                        'videofile':relative_directory+'/'+stem+".flv", 
-                                                        'videobaseurl':self.VIDEO_SERVER_URL, 
-                                                        'splashbaseurl':self.SPLASH_IMAGE_BASE, 
-                                                        'splashfile':self.SPLASH_IMAGE_FILE, 
-                                                        'cortado_location':self.CORTADO_LOCATION, 
-                                                        'oggfile':stem+".ogg", 
-                                                        'mirid':stem
-                                                        }
-                                                t = Template(file=self.INCLUDE_TEMPLATE, searchList=[data_map])  
-                                                f=open(includefile, 'w')
-                                                f.write(t.respond())
-                                                f.close()
-
-                                                # OK ! It Worked.
-                                                worked = True
-
-                                        else:
-                                                logging.info("FLV file size is zero - assuming encoding failed! Permanently skipping file!")
-                                                os.mknod(skipfile)
+                                else:
+                                        logging.debug("flv file and html file already exists, not doing transcoding")
+
+                                #make the flash HTML snippet if the flv got created correctly.
+                                #XXX todo, separate out the flv and ogg theora (java applet) html snippet
+                                if os.path.exists(flvfile) and os.path.getsize(flvfile)>0:
+                                        logging.info("Making html template - original size of %s: %.1fMB, Encoded size: %.1fMB" % (videofile,os.path.getsize(videofile)/1000000.0,os.path.getsize(flvfile)/1000000.0))
+                                        data_map={
+                                                'flowplayer_location':self.FLOWPLAYER_LOCATION, 
+                                                'videofile':relative_directory+'/'+stem+".flv", 
+                                                'videobaseurl':self.VIDEO_SERVER_URL, 
+                                                'splashbaseurl':self.SPLASH_IMAGE_BASE, 
+                                                'splashfile':self.SPLASH_IMAGE_FILE, 
+                                                'cortado_location':self.CORTADO_LOCATION, 
+                                                'oggfile':stem+".ogg", 
+                                                'mirid':stem
+                                                }
+                                        t = Template(file=self.INCLUDE_TEMPLATE, searchList=[data_map])  
+                                        f=open(includefile, 'w')
+                                        f.write(t.respond())
+                                        f.close()
+
+                                        # OK ! It Worked.
+                                        worked = True
+
+                                else:
+                                        logging.info("FLV file size is zero - assuming encoding failed! Permanently skipping file!")
+                                        os.mknod(skipfile)
                        
-                                        #finished transcoding block , remove lock file 
-                                        os.remove(lockfile)
-
-                                except:
-                                        logging.info("Error while processing %s: %s" % (videofile,traceback.format_exc()))
-                                        os.remove(lockfile)
-                                        #remove this process's lockfile, this exception will stop the entire process
-                                        os.remove(self.ENCODER_LOCKFILE)
-
-                        else:
-                                logging.debug(' lock file or skip file present for file %s ' % videofile)
-        
+                                #finished transcoding block , remove lock file 
+                                os.remove(lockfile)
+
+                        except:
+                                logging.info("Error while processing %s: %s" % (videofile,traceback.format_exc()))
+                                os.remove(lockfile)
+
+                else:
+                        logging.debug(' lock file or skip file present for file %s ' % videofile)
+
         #return a status value
         return worked
@@ -241 +241 @@
 
     #install a signal handler to re-read configuration files.
+    # eg kill -USR2 <pid>
     signal.signal(signal.SIGUSR2, indytuber.rereadConfig)