X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=efd8474a56215fbb96a1ab756ec829aaefa481f7;hp=bea14223adea1ef355512111f804bc92338d9561;hb=61948f17eafecaae17078d916ba2193983eaa339;hpb=f57e401a07b83296f255c1b3b672d7bf8241b357

diff --git a/plomlombot.py b/plomlombot.py
index bea1422..efd8474 100644
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -6,20 +6,20 @@ import re
 import urllib.request
 import html
 
-servernet = "irc.freenode.net"
-port = 6667
-servername = ""
-timeout = 240
-username = "plomlombot"
-nickname = username
-channel = "#zrolaps"
+SERVERNET = "irc.freenode.net"
+PORT = 6667
+TIMEOUT = 240
+USERNAME = "plomlombot"
+NICKNAME = USERNAME
+CHANNEL = "#zrolaps-test"
 
 class ExceptionForRestart(Exception):
     pass
 
 class IO:
 
-    def __init__(self, servernet, port):
+    def __init__(self, servernet, port, timeout):
+        self.timeout = timeout
         self.socket = socket.socket()
         self.socket.connect((servernet, port))
         self.socket.setblocking(0)
@@ -29,11 +29,11 @@ class IO:
         self.servername = self.recv_line(send_ping=False).split(" ")[0][1:]
 
     def _pingtest(self, send_ping=True):
-        if self.last_pong + timeout < time.time():
+        if self.last_pong + self.timeout < time.time():
             print("SERVER NOT ANSWERING")
             raise ExceptionForRestart
         if send_ping:
-            self.send_line("PING " + nickname + " " + self.servername)
+            self.send_line("PING " + self.servername)
 
     def send_line(self, msg):
         msg = msg.replace("\r", " ")
@@ -56,7 +56,7 @@ class IO:
         if len(self.line_buffer) > 0:
             return self.line_buffer.pop(0)
         while True:
-            ready = select.select([self.socket], [], [], int(timeout / 2))
+            ready = select.select([self.socket], [], [], int(self.timeout / 2))
             if not ready[0]:
                 self._pingtest(send_ping)
                 return None
@@ -79,15 +79,15 @@ class IO:
             line)
         return line
 
-def init_connection():
+def init_session(servernet, port, timeout, nickname, username, channel):
     print("CONNECTING TO " + servernet)
-    io = IO(servernet, port)
+    io = IO(servernet, port, timeout)
     io.send_line("NICK " + nickname)
     io.send_line("USER " + username + " 0 * : ")
     io.send_line("JOIN " + channel)
     return io
 
-def lineparser_loop():
+def lineparser_loop(io, nickname):
 
     def act_on_privmsg(tokens):
 
@@ -143,11 +143,11 @@ def lineparser_loop():
                 act_on_privmsg(tokens)
             if tokens[0] == "PING":
                 io.send_line("PONG " + tokens[1])
-
 while 1:
     try:
-        io = init_connection()
-        lineparser_loop()
+        io = init_session(SERVERNET, PORT, TIMEOUT, NICKNAME, USERNAME,
+                CHANNEL)
+        lineparser_loop(io, NICKNAME)
     except ExceptionForRestart:
         io.socket.close()
         continue