X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=31ea88f90e56a34397f9379369d22cb2dede5b45;hp=747ab077700fa772d1c54cc62b61290c1a7bcad1;hb=39a97788307a22f4b398451df11b536dbcdc744b;hpb=24cf06720f7e0c13e6075f69426529a2119085ba

diff --git a/plomlombot.py b/plomlombot.py
index 747ab07..31ea88f 100644
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -1,18 +1,24 @@
 import socket
-import datetime 
+import datetime
 import select
 import time
 import re
 import urllib.request
 import html
 
+servernet = "irc.freenode.net"
+port = 6667
 servername = ""
-timeout = 480
+timeout = 240
 username = "plomlombot"
 nickname = username
 channel = "#zrolaps"
 
+class ExceptionForRestart(Exception):
+    pass
+
 class IO:
+
     def __init__(self, server, port):
         self.socket = socket.socket()
         self.socket.connect((server, port))
@@ -20,21 +26,30 @@ class IO:
         self.line_buffer = []
         self.rune_buffer = ""
         self.last_pong = time.time()
+
     def _pingtest(self):
         if self.last_pong + timeout < time.time():
-            raise RuntimeError("server not answering")
+            print("SERVER NOT ANSWERING TO PING")
+            raise ExceptionForRestart
         self.send_line("PING " + nickname + " " + servername)
-    def send_line(self, msg_orig):
-        msg = msg_orig + "\r\n"
+
+    def send_line(self, msg):
+        msg = msg.replace("\r", " ")
+        msg = msg.replace("\n", " ")
+        if len(msg.encode("utf-8")) > 510:
+            print("NOT SENT LINE TO SERVER (too long): " + msg)
+        print("LINE TO SERVER: "
+            + str(datetime.datetime.now()) + ": " + msg)
+        msg = msg + "\r\n"
         msg_len = len(msg)
         total_sent_len = 0
         while total_sent_len < msg_len:
             sent_len = self.socket.send(bytes(msg[total_sent_len:], "UTF-8"))
             if sent_len == 0:
-                raise RuntimeError("socket connection broken")
+                print("SOCKET CONNECTION BROKEN")
+                raise ExceptionForRestart
             total_sent_len += sent_len
-        print("LINE TO SERVER: "
-            + str(datetime.datetime.now()) + ": " + msg_orig)
+
     def recv_line_wrapped(self):
         if len(self.line_buffer) > 0:
             return self.line_buffer.pop(0)
@@ -46,13 +61,15 @@ class IO:
             self.last_pong = time.time()
             received_runes = self.socket.recv(1024).decode("UTF-8")
             if len(received_runes) == 0:
-                raise RuntimeError("socket connection broken")
+                print("SOCKET CONNECTION BROKEN")
+                raise ExceptionForRestart
             self.rune_buffer += received_runes 
             lines_split = str.split(self.rune_buffer, "\r\n")
             self.line_buffer += lines_split[:-1]
             self.rune_buffer = lines_split[-1]
             if len(self.line_buffer) > 0:
                 return self.line_buffer.pop(0)
+
     def recv_line(self):
         line = self.recv_line_wrapped()
         if line:
@@ -60,43 +77,76 @@ class IO:
             line)
         return line
 
-io = IO("irc.freenode.net", 6667)
-io.send_line("NICK " + nickname)
-io.send_line("USER " + username + " 0 * : ")
-io.send_line("JOIN " + channel)
-servername = io.recv_line().split(" ")[0][1:]
-while 1:
-    line = io.recv_line()
-    if not line:
-        continue
-    tokens = line.split(" ")
-    if len(tokens) > 1:
-        if tokens[1] == "PRIVMSG":
-            sender = ""
-            for rune in tokens[0]:
-                if rune == "!":
-                    break
-                if rune != ":":
-                    sender += rune
-            receiver = ""
-            for rune in tokens[2]:
-                if rune == "!":
-                    break
-                if rune != ":":
-                    receiver += rune
-            target = sender
-            if receiver != nickname:
-                target = receiver
-            msg = str.join(" ", tokens[3:])[1:]
+def init_connection():
+    print("CONNECTING TO " + servernet)
+    io = IO(servernet, port)
+    io.send_line("NICK " + nickname)
+    io.send_line("USER " + username + " 0 * : ")
+    io.send_line("JOIN " + channel)
+    servername = io.recv_line().split(" ")[0][1:]
+    return io
+
+def lineparser_loop():
+
+    def act_on_privmsg(tokens):
+
+        def url_check(msg):
             matches = re.findall("(https?://[^\s]+)", msg)
             for i in range(len(matches)):
                 url = matches[i]
-                webpage = urllib.request.urlopen(url)
+                try:
+                    webpage = urllib.request.urlopen(url, timeout=15)
+                except urllib.error.HTTPError as error:
+                    print("TROUBLE FOLLOWING URL: " + str(error))
+                    continue
                 charset = webpage.info().get_content_charset()
+                if not charset:
+                    charset="utf-8"
+                content_type = webpage.info().get_content_type()
+                if not content_type in ('text/html', 'text/xml',
+                        'application/xhtml+xml'):
+                    print("TROUBLE INTERPRETING URL: bad content type "
+                            + content_type)
+                    continue
                 content = webpage.read().decode(charset)
                 title = str(content).split('<title>')[1].split('</title>')[0]
                 title = html.unescape(title)
-                io.send_line("PRIVMSG "
-                    + target + " :page title for url: " + title)
-        if tokens[0] == "PING":
-            io.send_line("PONG " + tokens[1])
+                io.send_line("PRIVMSG " + target + " :page title for url: "
+                    + title)
+
+        sender = ""
+        for rune in tokens[0]:
+            if rune == "!":
+                break
+            if rune != ":":
+                sender += rune
+        receiver = ""
+        for rune in tokens[2]:
+            if rune == "!":
+                break
+            if rune != ":":
+                receiver += rune
+        target = sender
+        if receiver != nickname:
+            target = receiver
+        msg = str.join(" ", tokens[3:])[1:]
+        url_check(msg)
+
+    while 1:
+        line = io.recv_line()
+        if not line:
+            continue
+        tokens = line.split(" ")
+        if len(tokens) > 1:
+            if tokens[1] == "PRIVMSG":
+                act_on_privmsg(tokens)
+            if tokens[0] == "PING":
+                io.send_line("PONG " + tokens[1])
+
+while 1:
+    try:
+        io = init_connection()
+        lineparser_loop()
+    except ExceptionForRestart:
+        io.socket.close()
+        continue