Added irc command parsing in wmd/parser.py

git-svn-id: svn://svn.zzq.org/warmachine/trunk@4 3ede8657-8418-0410-873f-eb3fb5a66eab

4 files changed, 28 insertions, 5 deletions

diff --git a/conf/users.py b/conf/users.py
index 1b7ffc7..174380c 100644
--- a/conf/users.py
+++ b/conf/users.py
@@ -2,3 +2,4 @@ user = []
 user.append('ashcrow')
 user.append('beav')
 user.append('wes')
+user.append('com4')
diff --git a/passiveactions/logtoconsole.py b/passiveactions/logtoconsole.py
index 533e082..952bded 100644
--- a/passiveactions/logtoconsole.py
+++ b/passiveactions/logtoconsole.py
@@ -5,7 +5,7 @@ class logtoconsole:
 
     def getAction(self, data, users):
         try:
-            print data
+#            print data
             return False
         except:
             return False
diff --git a/warmachine.py b/warmachine.py
index 0a358fc..769e7b6 100644
--- a/warmachine.py
+++ b/warmachine.py
@@ -78,7 +78,17 @@ class irc:
         """
         while True:
             data = self.irc.recv(4096)
-            #obj_data = parser.ircparse(data)
+
+            if data == '':
+                continue
+
+            # Buffering for MOTD.
+            if data[-1] != '\n':
+                data = data + self.irc.recv(4096)
+
+            for line in data.split('\r\n'):
+                obj_data = parser.ircparse(line)
+                #pass to action handlers here...
 
             # Passive Actions
             try:
@@ -97,14 +107,15 @@ class irc:
                                 break
                     else:
                         input = data.split()
-                        self.send('PRIVMSG ' + input[2] + ' :' + curuser + ': stop bothering me jerk.')
+                        self.send('PRIVMSG ' + input[2] + ' :' + curuser +
+                            ': stop bothering me jerk.')
             except Exception,e:
                 print "Action failed"
                 print e
 
 
 if __name__ == '__main__':
-    i = irc('irc.efnet.org', 'warmachine', 'omgident')
+    i = irc('localhost', 'warmachine', 'omgident')
     i.connect()
     i.join('#zzq')
     i.MainLoop()
diff --git a/wmd/parser.py b/wmd/parser.py
index ecb2e55..52a0e9a 100644
--- a/wmd/parser.py
+++ b/wmd/parser.py
@@ -4,6 +4,7 @@ class ircparse(object):
     def __init__(self, data):
         self.prefix =''
         self.command = ''
+        self.params = ''
         
         self._rawdata = data
 
@@ -11,7 +12,8 @@ class ircparse(object):
         #print data
         #print "xo" * 40
 
-        self._process_data(data)
+        if data != '':
+            self._process_data(data)
 
     def _process_data(self, data):
         data = data.strip()
@@ -28,3 +30,12 @@ class ircparse(object):
             #
             # TODO: Get the server name from the parent object.
             pass
+
+        # Command comes 2nd (Or first if the prefix is missing) 
+        self.command = data.split(' ')[1]
+
+        # Finally we reconstruct the parameters. We'll let the plugins figure out
+        # what they mean since they could potentially be very different.
+        for param in data.split(' ')[2:]:
+            self.params += param + " "
+        self.params.strip()