nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

nemuspeak: factoring code with nemubot

Browse Source
This commit is contained in:
Némunaire 2012-07-24 02:34:01 +02:00
parent 8230ed39e9
commit 7f539c926b
3 changed files with 60 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
message.py
View File

@ -61,7 +61,7 @@ class Message:
if self.cmd == 'PRIVMSG': if self.cmd == 'PRIVMSG':
#Check for CTCP request #Check for CTCP request
self.ctcp = len(words[3]) > 1 and (words[3][0] == 0x01 or words[3][1] == 0x01) self.ctcp = len(words[3]) > 1 and (words[3][0] == 0x01 or words[3][1] == 0x01)
self.content = b' '.join(words[3:]) self.content = self.pickWords(words[3:])
elif self.cmd == '353' and len(words) > 3: elif self.cmd == '353' and len(words) > 3:
for i in range(2, len(words)): for i in range(2, len(words)):
if words[i][0] == 58: if words[i][0] == 58:
@ -78,7 +78,7 @@ class Message:
self.channel = words[3] self.channel = words[3]
self.content = self.pickWords(words[4:]) self.content = self.pickWords(words[4:])
else: else:
print (line) #print (line)
self.content = self.pickWords(words[3:]) self.content = self.pickWords(words[3:])
else: else:
print (line) print (line)
@ -86,7 +86,7 @@ class Message:
self.channel = words[2].decode() self.channel = words[2].decode()
self.content = b' '.join(words[3:]) self.content = b' '.join(words[3:])
self.decode() self.decode()
self.private = private or (self.channel is not None and self.channel == self.srv.nick) self.private = private or (self.channel is not None and self.srv is not None and self.channel == self.srv.nick)
def pickWords(self, words): def pickWords(self, words):
"""Parse last argument of a line: can be a single word or a sentence starting with :""" """Parse last argument of a line: can be a single word or a sentence starting with :"""

146
nemuspeak.py
View File

@ -7,9 +7,9 @@ import signal
import os import os
import re import re
import subprocess import subprocess
import shlex
from datetime import datetime from datetime import datetime
from datetime import timedelta from datetime import timedelta
from xml.dom.minidom import parse
import _thread import _thread
if len(sys.argv) <= 1: if len(sys.argv) <= 1:
@ -26,7 +26,9 @@ if len(sys.argv) == 3:
else: else:
basedir = "./" basedir = "./"
import module_states_file as msf
import message import message
import server
SMILEY = list() SMILEY = list()
CORRECTIONS = list() CORRECTIONS = list()
@ -35,34 +37,6 @@ talkEC = 0
stopSpk = 0 stopSpk = 0
lastmsg = None lastmsg = None
dom = parse(sys.argv[1])
config = dom.getElementsByTagName('config')[0]
if config.hasAttribute("nick"):
NICK = config.getAttribute("nick")
else:
NICK = "bot"
if config.hasAttribute("owner"):
OWNER = config.getAttribute("owner")
else:
OWNER = " "
if config.hasAttribute("realname"):
REALNAME = config.getAttribute("realname")
else:
REALNAME = OWNER + "'s bot"
for smiley in config.getElementsByTagName('smiley'):
if smiley.hasAttribute("txt") and smiley.hasAttribute("mood"):
SMILEY.append((smiley.getAttribute("txt"), smiley.getAttribute("mood")))
print ("%d smileys loaded"%len(SMILEY))
for correct in config.getElementsByTagName('correction'):
if correct.hasAttribute("bad") and correct.hasAttribute("good"):
CORRECTIONS.append((" " + (correct.getAttribute("bad") + " "), (" " + correct.getAttribute("good") + " ")))
print ("%d corrections loaded"%len(CORRECTIONS))
def speak(endstate): def speak(endstate):
global lastmsg, g_queue, talkEC, stopSpk global lastmsg, g_queue, talkEC, stopSpk
talkEC = 1 talkEC = 1
@ -86,7 +60,7 @@ def speak(endstate):
force = 1 force = 1
if force or msg.channel != lastmsg.channel: if force or msg.channel != lastmsg.channel:
if msg.channel == OWNER: if msg.channel == msg.srv.owner:
sentence += "En message priver. " #Just to avoid é :p sentence += "En message priver. " #Just to avoid é :p
else: else:
sentence += "Sur " + msg.channel + ". " sentence += "Sur " + msg.channel + ". "
@ -119,7 +93,7 @@ def speak(endstate):
if re.match("^ *[^a-zA-Z0-9 ][a-zA-Z]{2}[^a-zA-Z0-9 ]", msg.content) is not None: if re.match("^ *[^a-zA-Z0-9 ][a-zA-Z]{2}[^a-zA-Z0-9 ]", msg.content) is not None:
if sentence != "": if sentence != "":
intro = subprocess.call(["espeak", "-v", "fr", sentence]) intro = subprocess.call(["espeak", "-v", "fr", "--", sentence])
#intro.wait() #intro.wait()
lang = msg.content[1:3].lower() lang = msg.content[1:3].lower()
@ -127,7 +101,7 @@ def speak(endstate):
else: else:
sentence += msg.content sentence += msg.content
spk = subprocess.call(["espeak", "-v", lang, sentence]) spk = subprocess.call(["espeak", "-v", lang, "--", sentence])
#spk.wait() #spk.wait()
lastmsg = msg lastmsg = msg
@ -138,99 +112,59 @@ def speak(endstate):
talkEC = 1 talkEC = 1
class Server: class Server(server.Server):
def __init__(self, server): def treat_msg(self, line, private = False):
if server.hasAttribute("server"):
self.host = server.getAttribute("server")
else:
self.host = "localhost"
if server.hasAttribute("port"):
self.port = int(server.getAttribute("port"))
else:
self.port = 6667
if server.hasAttribute("password"):
self.password = server.getAttribute("password")
else:
self.password = None
self.channels = list()
for channel in server.getElementsByTagName('channel'):
self.channels.append(channel.getAttribute("name"))
def launch(self):
_thread.start_new_thread(self.connect, ())
def authorize(self, msg):
return msg.nick != OWNER and (msg.channel == OWNER or msg.channel in self.channels)
def read(self):
global stopSpk, talkEC, g_queue global stopSpk, talkEC, g_queue
readbuffer = b"" #Here we store all the messages from server
while 1:
raw = self.s.recv(1024) #recieve server messages
if not raw:
break
readbuffer = readbuffer + raw
temp = readbuffer.split(b"\n")
readbuffer = temp.pop( )
for line in temp:
try: try:
msg = message.Message(self, line) msg = message.Message (self, line, private)
except: if msg.cmd == 'PING':
print ("Une erreur est survenue lors du traitement du message : %s"%line) msg.treat (self.mods)
exc_type, exc_value, exc_traceback = sys.exc_info() elif msg.cmd == 'PRIVMSG' and msg.authorize():
traceback.print_exception(exc_type, exc_value, exc_traceback) if msg.nick != msg.srv.owner:
continue g_queue.append(msg)
if talkEC == 0:
if msg.cmd == b"PING": _thread.start_new_thread(speak, (0,))
self.s.send(("PONG %s\r\n" % msg.content).encode ()) elif msg.content[0] == "`":
elif msg.cmd == b"PRIVMSG" and (self.authorize(msg) or msg.content[0] == '`'): cmd = shlex.split(msg.content[1:])
if msg.content[0] == '`' and msg.nick == OWNER:
cmd = msg.content[1:].split(' ')
if cmd[0] == "speak": if cmd[0] == "speak":
_thread.start_new_thread(speak, (0,)) _thread.start_new_thread(speak, (0,))
elif cmd[0] == 'reset': elif cmd[0] == "reset":
while len(g_queue) > 0: while len(g_queue) > 0:
g_queue.pop() g_queue.pop()
elif cmd[0] == 'save': elif cmd[0] == "save":
if talkEC == 0: if talkEC == 0:
talkEC = 1 talkEC = 1
stopSpk = 1 stopSpk = 1
elif cmd[0] == 'test': elif cmd[0] == "add":
g_queue.append(message.Message(self, b":Quelqun!someone@p0m.fr PRIVMSG %s :Ceci est un message de test ;)"%(self.channels)))
elif cmd[0] == 'list':
print ("Currently listened channels:")
for chan in self.channels:
print (chan)
print ("-- ")
elif cmd[0] == 'add' and len(cmd) > 1:
self.channels.append(cmd[1]) self.channels.append(cmd[1])
print (cmd[1] + " added to listened channels") print (cmd[1] + " added to listened channels")
elif cmd[0] == 'del' and len(cmd) > 1: elif cmd[0] == "del":
if self.channels.count(cmd[1]) > 0: if self.channels.count(cmd[1]) > 0:
self.channels.remove(cmd[1]) self.channels.remove(cmd[1])
print (cmd[1] + " removed from listened channels") print (cmd[1] + " removed from listened channels")
else: else:
print (cmd[1] + " not in listened channels") print (cmd[1] + " not in listened channels")
except:
print ("\033[1;31mERROR:\033[0m occurred during the processing of the message: %s" % line)
exc_type, exc_value, exc_traceback = sys.exc_info()
traceback.print_exception(exc_type, exc_value, exc_traceback)
else:
g_queue.append(msg)
if talkEC == 0:
_thread.start_new_thread(speak, (0,))
def connect(self): config = msf.parse_file(sys.argv[1])
self.s = socket.socket( ) #Create the socket
self.s.connect((self.host, self.port)) #Connect to server
if self.password != None:
self.s.send(("PASS %s\r\n" % self.password).encode())
self.s.send(("NICK %s\r\n" % NICK).encode())
self.s.send(("USER %s %s bla :%s\r\n" % (NICK, self.host, REALNAME)).encode())
self.read()
for server in config.getElementsByTagName('server'): for smiley in config.getNodes("smiley"):
srv = Server(server) if smiley.hasAttribute("txt") and smiley.hasAttribute("mood"):
srv.launch() SMILEY.append((smiley.getAttribute("txt"), smiley.getAttribute("mood")))
print ("%d smileys loaded"%len(SMILEY))
for correct in config.getNodes("correction"):
if correct.hasAttribute("bad") and correct.hasAttribute("good"):
CORRECTIONS.append((" " + (correct.getAttribute("bad") + " "), (" " + correct.getAttribute("good") + " ")))
print ("%d corrections loaded"%len(CORRECTIONS))
for serveur in config.getNodes("server"):
srv = Server(serveur, config["nick"], config["owner"], config["realname"])
srv.launch(None)
def sighup_h(signum, frame): def sighup_h(signum, frame):
global talkEC, stopSpk global talkEC, stopSpk

4
server.py
View File

@ -229,10 +229,8 @@ class Server(threading.Thread):
print (" Already connected.") print (" Already connected.")
def treat_msg(self, line, private = False): def treat_msg(self, line, private = False):
if srv is None:
srv = self
try: try:
msg = message.Message (srv, line, private) msg = message.Message (self, line, private)
msg.treat (self.mods) msg.treat (self.mods)
except: except:
print ("\033[1;31mERROR:\033[0m occurred during the processing of the message: %s" % line) print ("\033[1;31mERROR:\033[0m occurred during the processing of the message: %s" % line)