Changeset 446 for indytube/trunk

Timestamp:

12/22/08 03:22:52 (19 months ago)

Author:

andy

Message:

add in svn:igore

Location:

indytube/trunk/indytube

Files:

• . (modified) (1 prop)
• __init__.py (modified) (1 diff)
• config.py (modified) (1 diff)
• indytube.conf (modified) (1 diff)
• indytube.py (modified) (7 diffs)
• locks (deleted)

indytube/trunk/indytube/__init__.py

@@ -1 @@
-#
+#module

indytube/trunk/indytube/config.py

@@ -1 +1 @@
 # configuration for indytube
 
-CONF_FILE_DEFAULT = "indytube.conf"
+CONF_FILE_DEFAULT = "/etc/indytube/indytube.conf"

indytube/trunk/indytube/indytube.conf

@@ -20 +20 @@
 
 [paths]
+BASE_DIRECTORY=/home/andy/src/EngageMedia/indytube/indytube-trunk/indytube/
 VIDEO_FILE_DIRECTORY=content/videos/
 FLV_FILE_DIRECTORY=content/transcoded/

indytube/trunk/indytube/indytube.py

@@ -17 +17 @@
 #templating system
 from Cheetah.Template import Template
-#twisted networking
-from twisted.internet import reactor
-
-from config import CONF_FILE_DEFAULT
-
-class IndyTubeTranscoder(object):
-   """ The IndyTube transcoding class . Invokes mencoder and ffmpeg2theora """
+#
+# Define the indytube processor class
+# Uses the queueing server API to get jobs to peform, and do downloading/torrenting/transcoding/ etc 
+#
+#
+
+class IndyTubeProcessor(object):
+   """ The IndyTube processing class . Uses the Indytube Queue Server API to get jobs to perform. """
    #holds statistics of files checked, and successfully transcoded, for each pass.
    checked = 0
@@ -32 +33 @@
 
    def __init__(self):
-    """constructor for IndyTubeTranscoder"""
+    """constructor for IndyTubeProcessor"""
 
    def rereadConfig(self,signal,frame):
@@ -56 +57 @@
     self.DO_ENCODING=config.getboolean('encoder','DO_ENCODING')
     self.NUMBER_OF_PARALLEL_ENCODERS=config.getint('encoder','NUMBER_OF_PARALLEL_ENCODERS')
-    self.ENCODER_LOCKFILE_BASE=config.get('encoder','ENCODER_LOCKFILE_BASE')
+    self.ENCODER_LOCKFILE_BASE=config.get('paths','BASE_DIRECTORY') + config.get('encoder','ENCODER_LOCKFILE_BASE')
     self.POLLTIME=int(config.get('encoder','POLLTIME'))
 
-    self.VIDEO_FILE_DIRECTORY=config.get('paths','VIDEO_FILE_DIRECTORY')
-    self.FLV_FILE_DIRECTORY=config.get('paths','FLV_FILE_DIRECTORY')
-    self.INCLUDE_FILE_DIRECTORY=config.get('paths','INCLUDE_FILE_DIRECTORY')
-    self.TORRENT_DIRECTORY=config.get('paths','TORRENT_DIRECTORY')
+    self.VIDEO_FILE_DIRECTORY=config.get('paths','BASE_DIRECTORY') +config.get('paths','VIDEO_FILE_DIRECTORY')
+    self.FLV_FILE_DIRECTORY=config.get('paths','BASE_DIRECTORY') + config.get('paths','FLV_FILE_DIRECTORY')
+    self.INCLUDE_FILE_DIRECTORY=config.get('paths','BASE_DIRECTORY') + config.get('paths','INCLUDE_FILE_DIRECTORY')
+    self.TORRENT_DIRECTORY=config.get('paths','BASE_DIRECTORY') + config.get('paths','TORRENT_DIRECTORY')
 
     self.INCLUDE_FILE_SUFFIX=config.get('paths','INCLUDE_FILE_SUFFIX')
@@ -73 +74 @@
     self.SPLASH_IMAGE_FILE=config.get('urls','SPLASH_IMAGE_FILE')
 
-    self.LOG_FILE=config.get('logging','LOG_FILE')
+    self.LOG_FILE=config.get('paths','BASE_DIRECTORY') + config.get('logging','LOG_FILE')
     #whoa, eval , from a conf file input. nasty
     self.LOG_LEVEL=eval(config.get('logging','LOG_LEVEL'))
@@ -120 +121 @@
         self.xmlrpc_ref = xmlrpclib.Server(self.BITTORRENT_QUEUE)
         self.jobs = self.xmlrpc_ref.listofWaitingJobItems()
-    except:
-        logging.info("Ending indytube downloading component because of exception!")
+    except Exception,e:
+        logging.info("Ending indytube downloading component because of exception!\n Exception %s" % e)
         return
     #processing....  
@@ -301 +302 @@
                 try:
                         # touch the lock file
-                        os.mknod(lockfile)
+                        #we should catch the exception here, and return FALSE!
+                        try:
+                            os.mknod(lockfile)
+                        except:
+                            logging.info("lock file creation failed! ABORTING. %s " % lockfile)
+                            return False
 
                         # if the flv file (autogenerated) or html snippet is not there, then reencode!
@@ -394 +400 @@
         return [ worked, f ]
 
-def main():
-
-    def looperInvoker(indytuber):
-        """recursively invoked callback, to check invoking do_transcoding_loop"""
-    
-        logging.debug("started looperInvoker function at %s, calling loop every %s seconds " % (time.strftime("%D %H:%M:%S"), indytuber.POLLTIME))
-        #check for others
-        if indytuber.check_lock_file():
-
-            #do downloading
-            indytuber.do_downloading_loop()
-
-            #do transcoding
-            indytuber.do_transcoding_loop()
-
-            #do torrrenting
-            indytuber.do_torrent_loop()
-
-            os.remove(indytuber.ENCODER_LOCKFILE)
-
-        #recursive, time-delayed callback
-        #periodically run this function ,to keep looping
-        # passing along the indytube object as an argument. (try not to _call_ this function or else you'll end up in infinite recursion!)
-        reactor.callLater(indytuber.POLLTIME,looperInvoker,indytuber)
-
-        ##END looperInvoker
-  
-    #make an IndyTubeTranscoder object
-    indytuber = IndyTubeTranscoder()
-    #parse our config
-    if not (os.path.exists(CONF_FILE_DEFAULT)):
-        logging.error("cannot find configuration file %s " % (CONF_FILE_DEFAULT))
-        #leaving!!
-        sys.exit(0)
-        #this code path ENDS HERE
-
-    #ok, parse the file
-    indytuber.parse_config(CONF_FILE_DEFAULT)
-
-    #we have started!
-    logging.info("started main function at %s, calling loop every %s seconds " % (time.strftime("%D %H:%M:%S"), indytuber.POLLTIME))
-    #start it for real, once off
-    looperInvoker(indytuber)
-
-    #install a signal handler to re-read configuration files.
-    # eg kill -s USR2 <pid>
-    signal.signal(signal.SIGUSR2, indytuber.rereadConfig)
-
-    #start the twisted reactor
-    # see http://twistedmatrix.com/trac/wiki/FrequentlyAskedQuestions#Igetexceptions.ValueError:signalonlyworksinmainthreadwhenItrytorunmyTwistedprogramWhatswrong
-    # if you want to not install the signal handlers
-    reactor.run()
-
-# this only runs if the module was *not* imported
-if __name__ == '__main__':
-    main()
-
 # Copyright John Duda, 2006
-# Copyright Andy Nicholson, 2007
+# Copyright Andy Nicholson, 2007,2008
 
 # This program is free software; you can redistribute it and/or modify