X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=play-sound-status.py;h=2c30122b2dacee2d806ad2a223e00f8508c14e32;hb=df4d8e39e6182abf7a7b983e4db458420f5a091c;hp=cf48806f71ffacbf6ea803bf6d5a502fd525ae08;hpb=145d9f24a97bb321152205428713471beaa0c7f6;p=svn42.git diff --git a/play-sound-status.py b/play-sound-status.py index cf48806..2c30122 100755 --- 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,9 +69,13 @@ 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") + self.config_parser.set('mapping','DEFAULT',"halflife2") + self.config_parser.set('mapping','PANIC',"monkeyscream") + self.config_parser.set('mapping','ERROR',"nothing") self.config_parser.set('mapping','stratos',"tardis") self.config_parser.set('mapping','xro',"gladosreplaced") self.config_parser.set('mapping','equinox',"gladosparty") @@ -127,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 @@ -142,13 +150,17 @@ 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,args=[]): +def runRemoteCommand(remote_host,remote_shell,user,args=[]): global sshp,uwscfg sshp = None try: cmd = "ssh -i /flash/tuer/id_rsa -o PasswordAuthentication=no -o StrictHostKeyChecking=no %RHOST% %RSHELL%" - cmd = cmd.replace("%RHOST%",remote_host).replace("%RSHELL%",remote_shell).replace("%ARG%", " ".join(args)) + cmd = cmd.replace("%RHOST%",remote_host).replace("%RSHELL%",remote_shell).replace("%ARG%", " ".join(args)).replace("%USER%", user) logging.debug("runRemoteCommand: Executing: "+cmd) sshp = subprocess.Popen(cmd.split(" "), bufsize=1024, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False) logging.debug("runRemoteCommand: pid %d: running=%d" % (sshp.pid,sshp.poll() is None)) @@ -173,14 +185,14 @@ def runRemoteCommand(remote_host,remote_shell,args=[]): subprocess.call(["kill","-9",str(sshp.pid)]) time.sleep(5) -def runShellCommand(cmd,ptimeout,stdinput,args=[]): +def runShellCommand(cmd,ptimeout,stdinput,user,args=[]): global uwscfg - cmd = cmd.replace("%ARG%"," ".join(args)) + cmd = cmd.replace("%ARG%"," ".join(args)).replace("%USER%", user) if ptimeout is None or float(ptimeout) > 45: ptimeout = 45 - popenTimeout2(cmd,stdinput,float(ptimeout)) + popenTimeout2(cmd,stdinput,ptimeout=float(ptimeout)) -def executeAction(action_name, args=[]): +def executeAction(action_name, user, args=[]): if action_name is None: logging.error("executeAction: action_name is None") return False @@ -199,22 +211,26 @@ def executeAction(action_name, args=[]): #"registered" actions if action_type == "remotecmd": - return runRemoteCommand(uwscfg.getValue(action_name+"_remote_host"), uwscfg.getValue(action_name+"_remote_shell"), 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"), 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,args) + return executeAction(action_type,user=user,args=args) -def playThemeOf(user): +def playThemeOf(user,fallback_default): global uwscfg uwscfg.checkConfigUpdates() + if user is None: + user = "" config=uwscfg.getValue("mapping_"+str(user)) if config is None: - config=uwscfg.getValue("mapping_default") + config=uwscfg.getValue("mapping_"+str(fallback_default)) logging.debug("playThemeOf: action for user %s: %s" % (user,config)) - executeAction(config,[]) + executeAction(config,user,[]) def popenTimeout1(cmd, pinput, returncode_ok=[0], ptimeout = 20.0, pcheckint = 0.25): logging.debug("popenTimeout1: starting: " + cmd) @@ -226,7 +242,7 @@ def popenTimeout1(cmd, pinput, returncode_ok=[0], ptimeout = 20.0, pcheckint = 0 time.sleep(pcheckint) timeout_counter -= pcheckint if not sppoo.poll() is None: - logging.debug("popenTimeout2: subprocess %d finished, returncode: %d" % (sppoo.pid,sppoo.returncode)) + logging.debug("popenTimeout1: subprocess %d finished, returncode: %d" % (sppoo.pid,sppoo.returncode)) return (sppoo.returncode in returncode_ok) #timeout reached logging.error("popenTimeout1: subprocess took too long (>%fs), sending SIGTERM to pid %d" % (ptimeout,sppoo.pid)) @@ -330,18 +346,18 @@ while True: last_status=(status == "yes") unixts_panic_button=None if last_status: - playThemeOf(user=m.group(3)) + playThemeOf(user=m.group(3), fallback_default="DEFAULT") continue m = RE_BUTTON.match(line) if not m is None: - playThemeOf(user="panic") - continue + playThemeOf(user="PANIC", fallback_default="nothing") + continue m = RE_ERROR.match(line) if not m is None: - playThemeOf(user="error") - continue + playThemeOf(user="ERROR", fallback_default="nothing") + continue except Exception, ex: logging.error("main: "+str(ex))