home
·
contact
·
privacy
projects
/
plomlombot-irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more refactoring / de-globalizing.
[plomlombot-irc.git]
/
plomlombot.py
diff --git
a/plomlombot.py
b/plomlombot.py
index bea14223adea1ef355512111f804bc92338d9561..efd8474a56215fbb96a1ab756ec829aaefa481f7 100644
(file)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-6,20
+6,20
@@
import re
import urllib.request
import html
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:
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)
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):
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:
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", " ")
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:
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
if not ready[0]:
self._pingtest(send_ping)
return None
@@
-79,15
+79,15
@@
class IO:
line)
return line
line)
return line
-def init_
connection(
):
+def init_
session(servernet, port, timeout, nickname, username, channel
):
print("CONNECTING TO " + servernet)
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
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):
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])
act_on_privmsg(tokens)
if tokens[0] == "PING":
io.send_line("PONG " + tokens[1])
-
while 1:
try:
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
except ExceptionForRestart:
io.socket.close()
continue