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

diff --git a/plomlombot.py b/plomlombot.py
old mode 100644
new mode 100755
index efd8474..6031d50
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -1,27 +1,33 @@
+#!/usr/bin/python3
+
+import argparse
 import socket
 import datetime
 import select
 import time
 import re
 import urllib.request
+import http.client
 import html
 
-SERVERNET = "irc.freenode.net"
+# Defaults, may be overwritten by command line arguments.
+SERVER = "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, timeout):
+    def __init__(self, server, port, timeout):
         self.timeout = timeout
         self.socket = socket.socket()
-        self.socket.connect((servernet, port))
+        self.socket.connect((server, port))
         self.socket.setblocking(0)
         self.line_buffer = []
         self.rune_buffer = ""
@@ -41,7 +47,7 @@ class IO:
         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)
+              + str(datetime.datetime.now()) + ": " + msg)
         msg = msg + "\r\n"
         msg_len = len(msg)
         total_sent_len = 0
@@ -65,7 +71,7 @@ class IO:
             if len(received_runes) == 0:
                 print("SOCKET CONNECTION BROKEN")
                 raise ExceptionForRestart
-            self.rune_buffer += received_runes 
+            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]
@@ -76,44 +82,50 @@ class IO:
         line = self._recv_line_wrapped(send_ping)
         if line:
             print("LINE FROM SERVER " + str(datetime.datetime.now()) + ": " +
-            line)
+                  line)
         return line
 
-def init_session(servernet, port, timeout, nickname, username, channel):
-    print("CONNECTING TO " + servernet)
-    io = IO(servernet, port, timeout)
+
+def init_session(server, port, timeout, nickname, username, channel):
+    print("CONNECTING TO " + server)
+    io = IO(server, port, timeout)
     io.send_line("NICK " + nickname)
     io.send_line("USER " + username + " 0 * : ")
     io.send_line("JOIN " + channel)
     return io
 
+
 def lineparser_loop(io, nickname):
 
     def act_on_privmsg(tokens):
 
         def url_check(msg):
-            matches = re.findall("(https?://[^\s]+)", msg)
+            matches = re.findall("(https?://[^\s>]+)", msg)
             for i in range(len(matches)):
                 url = matches[i]
+                request = urllib.request.Request(url, headers={
+                    "User-Agent": "plomlombot"
+                })
                 try:
-                    webpage = urllib.request.urlopen(url, timeout=15)
-                except urllib.error.HTTPError as error:
+                    webpage = urllib.request.urlopen(request, timeout=15)
+                except (urllib.error.HTTPError, urllib.error.URLError,
+                        UnicodeError, http.client.BadStatusLine) as error:
                     print("TROUBLE FOLLOWING URL: " + str(error))
                     continue
                 charset = webpage.info().get_content_charset()
                 if not charset:
-                    charset="utf-8"
+                    charset = "utf-8"
                 content_type = webpage.info().get_content_type()
-                if not content_type in ('text/html', 'text/xml',
-                        'application/xhtml+xml'):
+                if content_type not in ('text/html', 'text/xml',
+                                        'application/xhtml+xml'):
                     print("TROUBLE INTERPRETING URL: bad content type "
-                            + 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)
+                             + title)
 
         sender = ""
         for rune in tokens[0]:
@@ -133,7 +145,7 @@ def lineparser_loop(io, nickname):
         msg = str.join(" ", tokens[3:])[1:]
         url_check(msg)
 
-    while 1:
+    while True:
         line = io.recv_line()
         if not line:
             continue
@@ -143,11 +155,37 @@ def lineparser_loop(io, nickname):
                 act_on_privmsg(tokens)
             if tokens[0] == "PING":
                 io.send_line("PONG " + tokens[1])
-while 1:
+
+
+def parse_command_line_arguments():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-s, --server", action="store", dest="server",
+                        default=SERVER,
+                        help="server or server net to connect to (default: "
+                        + SERVER + ")")
+    parser.add_argument("-p, --port", action="store", dest="port", type=int,
+                        default=PORT, help="port to connect to (default : "
+                        + str(PORT) + ")")
+    parser.add_argument("-t, --timeout", action="store", dest="timeout",
+                        type=int, default=TIMEOUT,
+                        help="timeout in seconds after which to attempt " +
+                        "reconnect (default: " + str(TIMEOUT) + ")")
+    parser.add_argument("-u, --username", action="store", dest="username",
+                        default=USERNAME, help="username to use (default: "
+                        + USERNAME + ")")
+    parser.add_argument("-n, --nickname", action="store", dest="nickname",
+                        default=NICKNAME, help="nickname to use (default: "
+                        + NICKNAME + ")")
+    parser.add_argument("CHANNEL", action="store", help="channel to join")
+    opts, unknown = parser.parse_known_args()
+    return opts
+
+opts = parse_command_line_arguments()
+while True:
     try:
-        io = init_session(SERVERNET, PORT, TIMEOUT, NICKNAME, USERNAME,
-                CHANNEL)
-        lineparser_loop(io, NICKNAME)
+        io = init_session(opts.server, opts.port, opts.timeout, opts.nickname,
+                          opts.username, opts.CHANNEL)
+        lineparser_loop(io, opts.nickname)
     except ExceptionForRestart:
         io.socket.close()
         continue