nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Rework on networking module

Browse Source
This commit is contained in:
nemunaire 2014-09-10 21:28:47 +02:00
parent 4f19f08c9f
commit 4cbf73c45a
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/networking.py
View File

@ -37,11 +37,13 @@ def cmd_w3m(msg):
res.append_message(line.decode())
return res
else:
raise IRCException("Veuillez indiquer une URL à visiter.")
raise IRCException("Indicate the URL to visit.")
@hook("cmd_hook", "curl")
def cmd_curl(msg):
if len(msg.cmds) > 1:
if len(msg.cmds) < 2:
raise IRCException("Indicate the URL to visit.")
try:
req = web.getURLContent(" ".join(msg.cmds[1:]))
if req is not None:
@ -50,18 +52,17 @@ def cmd_curl(msg):
res.append_message(m)
return res
else:
return Response(msg.sender, "Une erreur est survenue lors de l'accès à cette URL", channel=msg.channel)
raise IRCException("An error occurs when trying to access the page")
except socket.timeout:
return Response(msg.sender, "le délais d'attente a été dépassé durant l'accès à %s" % msg.cmds[1:], channel=msg.channel, nick=msg.nick)
raise IRCException("The request timeout when trying to access the page")
except socket.error as e:
return Response(msg.sender, e.strerror, channel=msg.channel)
else:
return Response(msg.sender, "Veuillez indiquer une URL à visiter.",
channel=msg.channel)
raise IRCException(e.strerror)
@hook("cmd_hook", "curly")
def cmd_curly(msg):
if len(msg.cmds) > 1:
if len(msg.cmds) < 2:
raise IRCException("Indicate the URL to visit.")
url = msg.cmds[1]
o = urllib.parse.urlparse(url, "http")
if o.netloc == "":
@ -87,8 +88,6 @@ def cmd_curly(msg):
conn.close()
return Response(msg.sender, "Entêtes de la page %s : HTTP/%s, statut : %d %s ; headers : %s" % (url, res.version, res.status, res.reason, ", ".join(["\x03\x02" + h + "\x03\x02: " + v for h, v in res.getheaders()])), channel=msg.channel)
else:
raise IRCException("Veuillez indiquer une URL à visiter.")
@hook("cmd_hook", "traceurl")
def cmd_traceurl(msg):
@ -99,7 +98,7 @@ def cmd_traceurl(msg):
res.append(Response(msg.sender, trace, channel=msg.channel, title="TraceURL"))
return res
else:
return Response(msg.sender, "Indiquer une URL à tracer !", channel=msg.channel)
raise IRCException("Indiquer a URL to trace!")
def extractdate(str):