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 31ea88f90e56a34397f9379369d22cb2dede5b45..efd8474a56215fbb96a1ab756ec829aaefa481f7 100644
(file)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-6,32
+6,34
@@
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, server, port):
+ def __init__(self, servernet, port, timeout):
+ self.timeout = timeout
self.socket = socket.socket()
self.socket = socket.socket()
- self.socket.connect((server, port))
+ self.socket.connect((server
net
, port))
self.socket.setblocking(0)
self.line_buffer = []
self.rune_buffer = ""
self.last_pong = time.time()
self.socket.setblocking(0)
self.line_buffer = []
self.rune_buffer = ""
self.last_pong = time.time()
+ self.servername = self.recv_line(send_ping=False).split(" ")[0][1:]
- def _pingtest(self):
- if self.last_pong + timeout < time.time():
- print("SERVER NOT ANSWERING
TO PING
")
+ def _pingtest(self
, send_ping=True
):
+ if self.last_pong +
self.
timeout < time.time():
+ print("SERVER NOT ANSWERING")
raise ExceptionForRestart
raise ExceptionForRestart
- self.send_line("PING " + nickname + " " + servername)
+ if send_ping:
+ self.send_line("PING " + self.servername)
def send_line(self, msg):
msg = msg.replace("\r", " ")
def send_line(self, msg):
msg = msg.replace("\r", " ")
@@
-50,13
+52,13
@@
class IO:
raise ExceptionForRestart
total_sent_len += sent_len
raise ExceptionForRestart
total_sent_len += sent_len
- def
recv_line_wrapped(self
):
+ def
_recv_line_wrapped(self, send_ping=True
):
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]:
if not ready[0]:
- self._pingtest()
+ self._pingtest(
send_ping
)
return None
self.last_pong = time.time()
received_runes = self.socket.recv(1024).decode("UTF-8")
return None
self.last_pong = time.time()
received_runes = self.socket.recv(1024).decode("UTF-8")
@@
-70,23
+72,22
@@
class IO:
if len(self.line_buffer) > 0:
return self.line_buffer.pop(0)
if len(self.line_buffer) > 0:
return self.line_buffer.pop(0)
- def recv_line(self):
- line = self.
recv_line_wrapped(
)
+ def recv_line(self
, send_ping=True
):
+ line = self.
_recv_line_wrapped(send_ping
)
if line:
print("LINE FROM SERVER " + str(datetime.datetime.now()) + ": " +
line)
return line
if line:
print("LINE FROM SERVER " + str(datetime.datetime.now()) + ": " +
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)
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
return io
-def lineparser_loop():
+def lineparser_loop(
io, nickname
):
def act_on_privmsg(tokens):
def act_on_privmsg(tokens):
@@
-142,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