Change the way timeouts are processed entirely to make the entire system more resilient.

[irc/quakenet/qwebirc.git] / qwebirc / ircclient.py

diff --git a/qwebirc/ircclient.py b/qwebirc/ircclient.py
index e5b88a5c254b32343003590b65b84f584cf0f4ec..75736252ad7d099d5600ce2fbdd525e502fa9650 100644 (file)
--- a/qwebirc/ircclient.py
+++ b/qwebirc/ircclient.py
@@ -15,7 +15,9 @@ def hmacfn(*args):
 
 class QWebIRCClient(basic.LineReceiver):
   delimiter = "\n"
-
+  def __init__(self, *args, **kwargs):
+    self.__nickname = "(unregistered)"
+    
   def dataReceived(self, data):
     basic.LineReceiver.dataReceived(self, data.replace("\r", ""))
 
@@ -31,6 +33,18 @@ class QWebIRCClient(basic.LineReceiver):
       self.handleCommand(command, prefix, params)
     except irc.IRCBadMessage:
       self.badMessage(line, *sys.exc_info())
+      
+    if command == "001":
+      self.__nickname = params[0]
+      
+      if self.__perform is not None:
+        for x in self.__perform:
+          self.write(x)
+        self.__perform = None
+    elif command == "NICK":
+      nick = prefix.split("!", 1)[0]
+      if nick == self.__nickname:
+        self.__nickname = params[0]
         
   def badMessage(self, args):
     self("badmessage", args)
@@ -50,6 +64,8 @@ class QWebIRCClient(basic.LineReceiver):
     self.lastError = None
     f = self.factory.ircinit
     nick, ident, ip, realname = f["nick"], f["ident"], f["ip"], f["realname"]
+    self.__nickname = nick
+    self.__perform = f.get("perform")
     
     hmac = hmacfn(ident, ip)
     self.write("USER %s bleh bleh %s %s :%s" % (ident, ip, hmac, realname))
@@ -58,6 +74,9 @@ class QWebIRCClient(basic.LineReceiver):
     self.factory.client = self
     self("connect")
 
+  def __str__(self):
+    return "<QWebIRCClient: %s!%s@%s>" % (self.__nickname, self.factory.ircinit["ident"], self.factory.ircinit["ip"])
+    
   def connectionLost(self, reason):
     if self.lastError:
       self.disconnect("Connection to IRC server lost: %s" % self.lastError)
@@ -88,9 +107,10 @@ class QWebIRCFactory(protocol.ClientFactory):
   def error(self, reason):
     self.client.error(reason)
 
-  def clientConnectionFailed(self, reason):
-    protocol.ClientFactory.clientConnectionFailed(reason)
-    self.client.disconnect("Connection to IRC server failed.")
+  def clientConnectionFailed(self, connector, reason):
+    protocol.ClientFactory.clientConnectionFailed(self, connector, reason)
+    self.publisher.event(["disconnect", "Connection to IRC server failed."])
+    self.publisher.disconnect()
 
 def createIRC(*args, **kwargs):
   f = QWebIRCFactory(*args, **kwargs)