home
·
contact
·
privacy
projects
/
plomlombot-irc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
39a9778
)
Deglobalize servername variable.
author
Christian Heller
<c.heller@plomlompom.de>
Sun, 17 Jan 2016 21:24:16 +0000
(22:24 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Sun, 17 Jan 2016 21:24:16 +0000
(22:24 +0100)
plomlombot.py
patch
|
blob
|
history
diff --git
a/plomlombot.py
b/plomlombot.py
index 31ea88f90e56a34397f9379369d22cb2dede5b45..bea14223adea1ef355512111f804bc92338d9561 100644
(file)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-19,19
+19,21
@@
class ExceptionForRestart(Exception):
class IO:
class IO:
- def __init__(self, server, port):
+ def __init__(self, server
net
, port):
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):
+ def _pingtest(self
, send_ping=True
):
if self.last_pong + timeout < time.time():
if self.last_pong + timeout < time.time():
- print("SERVER NOT ANSWERING
TO PING
")
+ print("SERVER NOT ANSWERING")
raise ExceptionForRestart
raise ExceptionForRestart
- self.send_line("PING " + nickname + " " + servername)
+ if send_ping:
+ self.send_line("PING " + nickname + " " + 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:
ready = select.select([self.socket], [], [], int(timeout / 2))
if not ready[0]:
if len(self.line_buffer) > 0:
return self.line_buffer.pop(0)
while True:
ready = select.select([self.socket], [], [], int(timeout / 2))
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,8
+72,8
@@
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)
if line:
print("LINE FROM SERVER " + str(datetime.datetime.now()) + ": " +
line)
@@
-83,7
+85,6
@@
def init_connection():
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
def lineparser_loop():
return io
def lineparser_loop():