alpha1:

-added conditions for triggers
 -evaluate "eval" attribute conditions
-arguments for events are automaticly named
 -name config via 'event_args' var in the plugin
-added plugin "buzzerbouncer"

Author: shuairan

config.xml

@@ -1,11 +1,26 @@
 <umbehki>
     <actions>
-        <action event="VLC.stopped">
+        
+        <!--<action event="VLC.stopped">
             <trigger name="Monitor.standby"/>
         </action>
+        -->
+        <action event="Fritzbox.incomingCall" enabled="false">
+            <trigger name="VLC.pause"/>
+        </action>
 
         <action event="Fritzbox.incomingCall">
-            <trigger name="VLC.pause"/>
+            <trigger name="Buzzerbouncer.openDoor">
+                <condition arg="Fritzbox.msn" value="3297089"/>
+            </trigger>
+            <!--<trigger name="VLC.pause"/> -->
+        </action>
+        
+        <action event="Test.everyMinute">
+            <trigger name="Test.deactivate">
+                <condition arg="Test.count" eval="{arg} &gt; 5 and {arg} &lt; 10"/>
+            </trigger>
+            <!--<trigger name="VLC.pause"/> -->
         </action>
 
     </actions>

plugins/buzzerbouncer.plugin

@@ -0,0 +1,9 @@
+[Core]
+Name = BuzzerBouncer
+Module = buzzerbouncer
+
+[Documentation]
+Author = Shuairan
+Version = 0.1
+Website = http://problemloeser.org
+Description = toggle the pins on the NetIO to open my door

plugins/buzzerbouncer.py

@@ -0,0 +1,20 @@
+from umb.UmbPlugin import *
+import telnetlib
+import time
+
+HOST = "192.168.25.200"
+PORT = 2701
+BUZZER = "io set ddr 0 ff 10"
+BUZZER_OFF = "io set ddr 0 00 10"
+
+class Buzzerbouncer(UmbPlugin):
+    def __init__(self):
+        UmbPlugin.__init__(self)
+        
+    @trigger
+    def openDoor(self):   
+        tn = telnetlib.Telnet(HOST, PORT)
+        tn.write(BUZZER+"\n")
+        time.sleep(1)
+        tn.write(BUZZER_OFF+"\n")
+        tn.close()

plugins/fritzbox/fritzbox.py

@@ -15,10 +15,11 @@
 
 class Fritzbox(UmbPlugin):
     #event list:
-    events = ["incomingCall"]
-  
+    events = [ "incomingCall" ]
+    event_args = {"incomingCall": ["phonenumber", "alias", "msn"] }
+    
     def __init__(self):
-        UmbPlugin.__init__(self, Fritzbox.events)
+        UmbPlugin.__init__(self)
         self.mythread = ListenThread(self)
         self.mythread.setDaemon(True)
         self.mythread.start()
@@ -156,7 +157,7 @@ def run(self):
                             # if no telephone number is received with the call
                             else:
                                 self.logger.info("phonecall from an unknown person")
-                                self.phonenumber = _('unknown')
+                                self.phonenumber = 'unknown'
                                 self.alias = 'unknown'
 
                             self.parent.raiseEvent("Fritzbox.incomingCall", self.phonenumber, self.alias, self.msn)

plugins/monitor.plugin

@@ -1,10 +1,10 @@
 [Core]
-Name = Monitor Plugin
+Name = Monitor
 Module = monitor
 
 [Documentation]
 Author = Shuairan
 Version = 0.1
 Website = http://problemloeser.org
-Description = plugin for controlling the computer screen (turning on, off)
+Description = monitor controllings
 

plugins/phone.plugin

@@ -6,17 +6,20 @@
 class Test(UmbPlugin):
     #event list:
     events = ["everyMinute", "testEvent"]
-  
+    event_args = {"everyMinute": ["count"],
+                  "testEvent": ["bla"]}
+    
     def __init__(self):
-        UmbPlugin.__init__(self, Test.events)
+        UmbPlugin.__init__(self)
         self.thread_killed = False
         self.th = threading.Thread(target = self.thread)
         self.th.start()
 
     def thread(self):
+        count = 0
         while not self.thread_killed:
-            
-            self.raiseEvent.everyMinute()
+            count = count+1
+            self.raiseEvent.everyMinute(count)
             for i in range(60):
                 time.sleep(1)
                 if self.thread_killed:
@@ -28,7 +31,12 @@ def out(self, *args):
             print "Out: %s " % args
         else: 
             print "Out (empty)"
-        self.raiseEvent("Test.testEvent")
+        self.raiseEvent("Test.testEvent", "argument")
 
     def aFoobarEvent(self, *args):
         self.raiseEvent()
+
+    @trigger
+    def deactivate(self):
+        IPlugin.deactivate(self)
+        self.thread_killed = True

plugins/phone.py

@@ -17,7 +17,7 @@ class VLC(UmbPlugin):
     events = ["stopped"]
 
     def __init__(self):
-        UmbPlugin.__init__(self, VLC.events)
+        UmbPlugin.__init__(self)
         self.lastState = None
 
         self.thread_killed = False

plugins/phone.py~

@@ -12,6 +12,7 @@ def loadActions(file='config.xml'):
     actions = cfg.getElementsByTagName('action')
 
     for action in actions:
+        action_enabled = action.getAttribute('enabled')
         event = action.getAttribute('event');
         triggers = action.getElementsByTagName('trigger');
 
@@ -21,22 +22,33 @@ def loadActions(file='config.xml'):
 
         for trigger in triggers:
             triggerName = trigger.getAttribute('name');
+            trigger_enabled = trigger.getAttribute('enabled')
             args = trigger.getAttribute('args');
+            
             logger.debug("Adding Trigger '%s' to Action '%s' with args %s " % (triggerName, event, args))
+            condition = trigger.getElementsByTagName('condition');
+            
+            cond = Condition(condition[0])
+            
             if args is "":
                 args = None
-            actionList[event].addTrigger(triggerName, args);
+            newTrigger = Trigger(triggerName,args,cond)
+            if action_enabled is 'false' or trigger_enabled is 'false':
+                newTrigger.deactivate()
+            
+            actionList[event].addTrigger(newTrigger)
 
     return actionList;
 
 
 class Action:
     def __init__(self):
         self.triggers = [];
-
+        self.activated = True
+        
     """ Todo: Add support for arguments"""
-    def addTrigger(self, trigger, args=None):
-        self.triggers.append(Trigger(trigger,args))
+    def addTrigger(self, trigger):
+        self.triggers.append(trigger)
 
     def getTrigger(self, name):
         for trigger in self.triggers:
@@ -47,6 +59,54 @@ def getTrigger(self, name):
 
 
 class Trigger:
-    def __init__(self, name, args=None):
+    def __init__(self, name, args=None, condition = None):
         self.name = name
         self.args = args
+        self.condition = condition
+        self.enabled = True
+    
+    @deprecated
+    def hasCondition(self):
+        if self.condition is not None: 
+            return True
+    
+    def checkCondition(self, args):
+        if self.condition is None:
+            #no condition
+            return True
+        else:
+            return self.condition.check(args)
+        
+    def activate(self):
+        self.enabled = True
+    
+    def deactivate(self):
+        self.enabled = False
+    
+        
+class Condition:
+    def __init__(self, xmldom):
+        self.arg = xmldom.getAttribute('arg');
+        self.value = xmldom.getAttribute('value');
+        
+        if xmldom.hasAttribute('eval'):
+            self.evaluate = xmldom.getAttribute('eval');
+        else:
+            self.evaluate = "{arg} is " + self.value
+        
+        logger.debug("EVALUATE %s " % self.evaluate)
+        
+    def check(self, arguments):
+        logger.debug("Checking condition for: '%s'?" %(self.arg))
+        logger.debug(arguments)
+        
+        if self.arg in arguments: 
+            value = arguments[self.arg]
+            eval_condition = self.evaluate.format(arg=value)
+            logger.debug("evaluation: '%s' " % self.evaluate.format(arg=self.arg))
+            logger.debug("evaluation: '%s' " % eval_condition)
+            if eval (eval_condition):
+                logger.debug("Condition is True!")
+                return True
+        
+        return False

plugins/test/test.py

@@ -12,21 +12,24 @@ class UmbPlugin(IPlugin):
     """
     default class of Umbheki Plugins
     """
+    events = []
+    event_args = None
 
-    def __init__(self, eventList=[]):
+    def __init__(self):
         IPlugin.__init__(self)
         self.name = self.__class__.__name__
         self.logger = logging.getLogger("Plugin:%s" % self.name)
         self.raiseEvent = EventRaiser(  self,
-                                        eventList,
+                                        self.events,
+                                        self.event_args,
                                         self.logger)
 
         self.trigger = None
-        
-    def raiseEvent(self, name, eventList, logger, watchdog):
+     
+    #def raiseEvent(self, name, eventList, logger, watchdog):
         """dummy, will be set to a new EventRaiser in __init__"""
-        pass
-        
+        #pass
+    
     def eventWatchdog(self, event, *args):
         """
         DO NOT USE AND NOT OVERWRITE! 
@@ -50,12 +53,18 @@ class EventRaiser(object):
     EventRaiser object
     """
 
-    def __init__(self, parent, eventList, logger):
+    def __init__(self, parent, eventList, eventArgs, logger):
         self.parent = parent
         self.logger = logger
         self.name = self.parent.name
+
+        self.event_args = {}
+        if eventArgs is not None:
+            self.event_args = dict(zip(map( lambda x:self.name+"."+x, eventArgs.keys()), eventArgs.values()))
+
         self.createEventMethods(eventList)
 
+        
     def __call__(self, eventName=None, *args):
         """
         raise an event. Three ways to raise:
@@ -68,10 +77,31 @@ def __call__(self, eventName=None, *args):
             eventmethod = sys._getframe(1).f_code.co_name
             eventName = "%s.%s" % (self.name, eventmethod)
 
+        
         self.logger.debug("Event called: %s " % eventName)
-        if len(args): self.logger.debug(args)
+        if len(args): 
+            self.logger.debug(args)
+            args = self.createEventArgumentList(eventName, args)
+            
         self.parent.eventWatchdog(eventName, args)
 
+    def createEventArgumentList(self, eventName, arguments):
+        """
+        maps the argument list (from 'event_args' in the plugin) 
+           to the arguments that came as parameter in the event call, creates a dictionary:
+           
+        """
+        eventargs = self.event_args[eventName]
+        if  len(arguments) and len(eventargs):
+            argList = dict(zip(map(lambda x:self.name+"."+x, eventargs), arguments))
+            #rest of unnamed arguments:
+            #rest = arguments[len(eventargs):]
+            #argList = argMap, rest
+        else:
+            argList = arguments
+            
+        return argList
+
     def createEventMethods(self, eventList):
         """
         add the event methods to the instance of this class for every 

plugins/vlc/vlc.py

@@ -97,14 +97,17 @@ def watchdog(self, event, args=None):
 
         logger = logging.getLogger("Umbheki Watchdog")
         logger.debug("event raised: '%s'" % event)
+        if args:
+            logger.debug(args)
 
         action = self.getAction(event)
         if action is not None:
             for trigger in action.triggers:
-                logger.debug("Trigger called '%s' args: %s " %(trigger.name, trigger.args))
-                self.callTrigger(trigger.name, trigger.args);
-
-
+                if trigger.activated and trigger.checkCondition(args):
+                    logger.debug("Trigger called '%s' args: %s " %(trigger.name, trigger.args))
+                    self.callTrigger(trigger.name, trigger.args);
+                else:
+                    logger.debug("Trigger '%s' is deactivated or condition-check returned false" % (trigger.name))
 
 class NotYetImplemented(Exception):
     def __init__(self):