mirrors/roar
1
Fork 0
mirror of https://github.com/lalbornoz/roar.git synced 2024-11-22 15:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

pngbot.py:IrcBot.clientNextTimeout: moved from IrcMiRCARTBot.

Browse Source 
pngbot.py:IrcBot.connect(): close() & return False given timeout and True given success.
pngbot.py:IrcBot.readline(): honour clientNextTimeout and return "" given timer expiry.
pngbot.py:IrcBot.sendline(): ignore clientNextTimeout.
pngbot.py:IrcMiRCARTBot.connect(): honour & pass IrcBot.connect() return value.
pngbot.py:IrcMiRCARTBot.dispatch{Join,Kick,Timer}(): (re)set clientNextTimeout to time.time() + 15 seconds.
pngbot.py:IrcMiRCARTBot.dispatch(): dispatch expired timers prior to calling readline() & honour "" return value.
pngbot.py:main(): honour IrcMiRCARTBot.connect() return value & delay reconnection by 15 seconds.
This commit is contained in:
Lucio Andrés Illanes Albornoz 2018-01-03 02:16:55 +01:00
parent 3a207fc53c
commit 98eae4257c
1 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
pngbot.py
View File

@ -34,6 +34,7 @@ class IrcBot:
serverHname = serverPort = None; serverHname = serverPort = None;
clientNick = clientIdent = clientGecos = None; clientNick = clientIdent = clientGecos = None;
clientSocket = clientSocketFile = None; clientSocket = clientSocketFile = None;
clientNextTimeout = None
# {{{ connect(): Connect to server and register w/ optional timeout # {{{ connect(): Connect to server and register w/ optional timeout
def connect(self, timeout=None): def connect(self, timeout=None):
@ -44,12 +45,15 @@ class IrcBot:
except BlockingIOError: except BlockingIOError:
pass pass
if timeout: if timeout:
select.select([], [self.clientSocket.fileno()], [], timeout) readySet = select.select([], [self.clientSocket.fileno()], [], timeout)
if len(readySet[1]) == 0:
self.close(); return False;
else: else:
select.select([], [self.clientSocket.fileno()], []) select.select([], [self.clientSocket.fileno()], [])
self.clientSocketFile = self.clientSocket.makefile() self.clientSocketFile = self.clientSocket.makefile()
self.sendline("NICK", self.clientNick) self.sendline("NICK", self.clientNick)
self.sendline("USER", self.clientIdent, "0", "0", self.clientGecos) self.sendline("USER", self.clientIdent, "0", "0", self.clientGecos)
return True
# }}} # }}}
# {{{ close(): Close connection to server # {{{ close(): Close connection to server
def close(self): def close(self):
@ -57,15 +61,22 @@ class IrcBot:
self.clientSocket.close() self.clientSocket.close()
self.clientSocket = self.clientSocketFile = None; self.clientSocket = self.clientSocketFile = None;
# }}} # }}}
# {{{ readline(): Read and parse single line from server into canonicalised list w/ optional timeout # {{{ readline(): Read and parse single line from server into canonicalised list, honouring timers
def readline(self, timeout=None): def readline(self):
if timeout: if self.clientNextTimeout:
select.select([self.clientSocket.fileno()], [], [], timeout) timeNow = time.time()
if self.clientNextTimeout <= timeNow:
return ""
else: else:
select.select([self.clientSocket.fileno()], [], []) readySet = select.select([self.clientSocket.fileno()], [], [], self.clientNextTimeout - timeNow)
else:
readySet = select.select([self.clientSocket.fileno()], [], [])
msg = self.clientSocketFile.readline() msg = self.clientSocketFile.readline()
if len(msg): if len(msg):
msg = msg.rstrip("\r\n") msg = msg.rstrip("\r\n")
else:
if len(readySet[0]) == 0:
return ""
else: else:
return None return None
msg = msg.split(" :", 1) msg = msg.split(" :", 1)
@ -79,8 +90,8 @@ class IrcBot:
msg = [""] + msg[0:] msg = [""] + msg[0:]
return msg return msg
# }}} # }}}
# {{{ sendline(): Parse and send single line to server from list w/ optional timeout # {{{ sendline(): Parse and send single line to server from list, ignoring timers
def sendline(self, *args, timeout=None): def sendline(self, *args):
msg = ""; argNumMax = len(args); msg = ""; argNumMax = len(args);
for argNum in range(0, argNumMax): for argNum in range(0, argNumMax):
if argNum == (argNumMax - 1): if argNum == (argNumMax - 1):
@ -89,12 +100,7 @@ class IrcBot:
msg += args[argNum] + " " msg += args[argNum] + " "
msg = (msg + "\r\n").encode(); msgLen = len(msg); msgBytesSent = 0; msg = (msg + "\r\n").encode(); msgLen = len(msg); msgBytesSent = 0;
while msgBytesSent < msgLen: while msgBytesSent < msgLen:
if timeout: readySet = select.select([], [self.clientSocket.fileno()], [])
timeLast = time.time()
select.select([], [self.clientSocket.fileno()], [], timeout)
timeNow = time.time(); timeout -= timeNow - timeLast;
else:
select.select([], [self.clientSocket.fileno()], [])
msgBytesSent = self.clientSocket.send(msg) msgBytesSent = self.clientSocket.send(msg)
msg = msg[msgBytesSent:]; msgLen -= msgBytesSent; msg = msg[msgBytesSent:]; msgLen -= msgBytesSent;
# }}} # }}}
@ -107,16 +113,19 @@ class IrcBot:
class IrcMiRCARTBot(IrcBot): class IrcMiRCARTBot(IrcBot):
"""IRC<->MiRCART bot""" """IRC<->MiRCART bot"""
clientChannelLastMessage = clientChannelOps = clientChannel = None clientChannelLastMessage = clientChannelOps = clientChannel = None
clientChannelRejoinTimerNext = clientChannelRejoin = None clientChannelRejoin = None
# {{{ connect(): Connect to server and (re)initialise w/ optional timeout # {{{ connect(): Connect to server and (re)initialise w/ optional timeout
def connect(self, timeout=None): def connect(self, timeout=None):
print("Connecting to {}:{}...".format(self.serverHname, self.serverPort)) print("Connecting to {}:{}...".format(self.serverHname, self.serverPort))
super().connect(timeout) if super().connect(timeout):
print("Connected to {}:{}.".format(self.serverHname, self.serverPort)) print("Connected to {}:{}.".format(self.serverHname, self.serverPort))
print("Registering on {}:{} as {}, {}, {}...".format(self.serverHname, self.serverPort, self.clientNick, self.clientIdent, self.clientGecos)) print("Registering on {}:{} as {}, {}, {}...".format(self.serverHname, self.serverPort, self.clientNick, self.clientIdent, self.clientGecos))
self.clientLastMessage = 0; self.clientChannelOps = []; self.clientLastMessage = 0; self.clientChannelOps = [];
clientChannelRejoinTimerNext = 0; self.clientChannelRejoin = False; self.clientChannelRejoin = False
return True
else:
return False
# }}} # }}}
# {{{ dispatchNone(): Dispatch None message from server # {{{ dispatchNone(): Dispatch None message from server
def dispatchNone(self): def dispatchNone(self):
@ -142,14 +151,14 @@ class IrcMiRCARTBot(IrcBot):
# {{{ dispatchJoin(): Dispatch single JOIN message from server # {{{ dispatchJoin(): Dispatch single JOIN message from server
def dispatchJoin(self, message): def dispatchJoin(self, message):
print("Joined {} on {}:{}.".format(message[2].lower(), self.serverHname, self.serverPort)) print("Joined {} on {}:{}.".format(message[2].lower(), self.serverHname, self.serverPort))
self.clientChannelRejoinTimerNext = 0; self.clientChannelRejoin = False; self.clientNextTimeout = None; self.clientChannelRejoin = False;
# }}} # }}}
# {{{ dispatchKick(): Dispatch single KICK message from server # {{{ dispatchKick(): Dispatch single KICK message from server
def dispatchKick(self, message): def dispatchKick(self, message):
if message[2].lower() == self.clientChannel.lower() \ if message[2].lower() == self.clientChannel.lower() \
and message[3].lower() == self.clientNick.lower(): and message[3].lower() == self.clientNick.lower():
print("Kicked from {} by {}, rejoining in 15 seconds".format(message[2].lower(), message[0])) print("Kicked from {} by {}, rejoining in 15 seconds".format(message[2].lower(), message[0]))
self.clientChannelRejoinTimerNext = time.time() + 15; self.clientChannelRejoin = True; self.clientNextTimeout = time.time() + 15; self.clientChannelRejoin = True;
# }}} # }}}
# {{{ dispatchMode(): Dispatch single MODE message from server # {{{ dispatchMode(): Dispatch single MODE message from server
def dispatchMode(self, message): def dispatchMode(self, message):
@ -221,23 +230,20 @@ class IrcMiRCARTBot(IrcBot):
if self.clientChannelRejoin: if self.clientChannelRejoin:
print("Attempting to join {} on {}:{}...".format(self.clientChannel, self.serverHname, self.serverPort)) print("Attempting to join {} on {}:{}...".format(self.clientChannel, self.serverHname, self.serverPort))
self.sendline("JOIN", self.clientChannel) self.sendline("JOIN", self.clientChannel)
self.clientChannelRejoinTimerNext = time.time() + 15; self.clientChannelRejoin = True; self.clientNextTimeout = time.time() + 15; self.clientChannelRejoin = True;
# }}} # }}}
# {{{ dispatch(): Read, parse, and dispatch single line from server # {{{ dispatch(): Read, parse, and dispatch single line from server
def dispatch(self): def dispatch(self):
while True: while True:
clientTimerNextDelta = 0 if self.clientNextTimeout:
if self.clientChannelRejoinTimerNext:
timeNow = time.time() timeNow = time.time()
if self.clientChannelRejoinTimerNext > timeNow: if self.clientNextTimeout <= timeNow:
clientTimerNextDelta = self.clientChannelRejoinTimerNext - timeNow
if clientTimerNextDelta:
timeNow = time.time()
if self.clientChannelRejoinTimerNext <= timeNow:
self.dispatchTimer() self.dispatchTimer()
serverMessage = self.readline(clientTimerNextDelta) serverMessage = self.readline()
if serverMessage == None: if serverMessage == None:
self.dispatchNone(); break; self.dispatchNone(); break;
elif serverMessage == "":
continue
elif serverMessage[1] == "001": elif serverMessage[1] == "001":
self.dispatch001(serverMessage) self.dispatch001(serverMessage)
elif serverMessage[1] == "353": elif serverMessage[1] == "353":
@ -282,9 +288,10 @@ class IrcMiRCARTBot(IrcBot):
def main(*argv): def main(*argv):
_IrcMiRCARTBot = IrcMiRCARTBot(*argv[1:]) _IrcMiRCARTBot = IrcMiRCARTBot(*argv[1:])
while True: while True:
_IrcMiRCARTBot.connect(15) if _IrcMiRCARTBot.connect(15):
_IrcMiRCARTBot.dispatch() _IrcMiRCARTBot.dispatch()
_IrcMiRCARTBot.close() _IrcMiRCARTBot.close()
time.sleep(15)
if __name__ == "__main__": if __name__ == "__main__":
if ((len(sys.argv) - 1) < 1)\ if ((len(sys.argv) - 1) < 1)\