small refactoring

[svn42.git] / play-sound-status.py

diff --git a/play-sound-status.py b/play-sound-status.py
index afee171..976bed4 100755 (executable)
--- a/play-sound-status.py
+++ b/play-sound-status.py
@@ -15,6 +15,7 @@ import subprocess
 import types
 import ConfigParser
 import traceback
+import random
 
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
@@ -68,6 +69,9 @@ class UWSConfig:
     self.config_parser.set('gladosreplaced','type',"slugplaymp3")
     self.config_parser.add_section('nothing')
     self.config_parser.set('nothing','type',"nothing")
+    self.config_parser.add_section('randomset1')
+    self.config_parser.set('randomset1','type',"random")
+    self.config_parser.set('randomset1','one_of',"halflife2 gladosparty")
     self.config_parser.add_section('mapping')
     self.config_parser.set('mapping','DEFAULT',"halflife2")
     self.config_parser.set('mapping','PANIC',"monkeyscream")
@@ -128,8 +132,11 @@ class UWSConfig:
     underscore_pos=name.find('_')
     if underscore_pos < 0:
       raise AttributeError
+    return self.getSectionValue(name[0:underscore_pos], name[underscore_pos+1:])
+
+  def getSectionValue(self, section, name):
     try:
-      return self.config_parser.get(name[0:underscore_pos], name[underscore_pos+1:])
+      return self.config_parser.get(section,name)
     except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
       return None
 
@@ -143,6 +150,10 @@ class UWSConfig:
       raise AttributeError
 
 
+def runRandomAction(action_list,user,args=[]):
+  if not type(action_list) == types.ListType:
+    raise ValueError("runRandomAction: action_list must be a list")
+  return executeAction(random.choice(action_list),user,args)
 
 def runRemoteCommand(remote_host,remote_shell,user,args=[]):
   global sshp,uwscfg
@@ -179,7 +190,9 @@ def runShellCommand(cmd,ptimeout,stdinput,user,args=[]):
   cmd = cmd.replace("%ARG%"," ".join(args)).replace("%USER%", user)
   if ptimeout is None or float(ptimeout) > 45:
     ptimeout = 45
-  popenTimeout2(cmd,stdinput,ptimeout=float(ptimeout))
+  else:
+    ptimeout = int(float(ptimeout))
+  popenTimeout2(cmd,stdinput,ptimeout=ptimeout)
 
 def executeAction(action_name, user, args=[]):
   if action_name is None:
@@ -190,7 +203,7 @@ def executeAction(action_name, user, args=[]):
     logging.error("executeAction: action %s not found or has no type" % action_name)
     return False
   action_delay=uwscfg.getValue(action_name+"_delay")
-  logging.debug("executeAction, action_name=%s, action_type=%s, action_delay=%s" % (action_name,action_type,action_delay))  
+  logging.info("executeAction %s of type %s for user %s with delay %s" % (action_name,action_type,user,action_delay))  
   if not action_delay is None:
     time.sleep(float(action_delay))
   
@@ -200,11 +213,13 @@ def executeAction(action_name, user, args=[]):
   
   #"registered" actions
   if action_type == "remotecmd":
-    return runRemoteCommand(uwscfg.getValue(action_name+"_remote_host"), uwscfg.getValue(action_name+"_remote_shell"), user=user, args=args)
+    return runRemoteCommand(uwscfg.getSectionValue(action_name,"remote_host"), uwscfg.getSectionValue(action_name,"remote_shell"), user=user, args=args)
   elif action_type == "shellcmd":
-    return runShellCommand(cmd=uwscfg.getValue(action_name+"_cmd"), ptimeout=uwscfg.getValue(action_name+"_timeout"), stdinput=uwscfg.getValue(action_name+"_stdinput"), user=user, args=args)
+    return runShellCommand(cmd=uwscfg.getSectionValue(action_name,"cmd"), ptimeout=uwscfg.getSectionValue(action_name,"timeout"), stdinput=uwscfg.getSectionValue(action_name,"stdinput"), user=user, args=args)
   elif action_type == "nothing":
     return True
+  elif action_type == "random":
+    return runRandomAction(action_list=uwscfg.getSectionValue(action_name,"one_of").split(" "),user=user,args=args)
   else:
     return executeAction(action_type,user=user,args=args)
   
@@ -276,7 +291,7 @@ def popenTimeout2(cmd, pinput, returncode_ok=[0], ptimeout=21):
     return False
 
 def exitHandler(signum, frame):
-  logging.info("Update-Web-Status stopping")
+  logging.info("stopping")
   try:
     conn.close()
   except: