Merge branch 'V3.3' of github.com:nemunaire/nemubot into V3.3
This commit is contained in:
Némunaire
commit
ca3559833a
8 changed files with 100 additions and 142 deletions
|
|
@ -1,19 +1,13 @@
|
|||
# coding=utf-8
|
||||
|
||||
import http.client
|
||||
import re
|
||||
from urllib.parse import quote
|
||||
|
||||
import xmlparser
|
||||
from tools import web
|
||||
|
||||
class DDGSearch:
|
||||
def __init__(self, terms):
|
||||
self.terms = terms
|
||||
(res, page) = getPage(terms)
|
||||
if res == http.client.OK or res == http.client.SEE_OTHER:
|
||||
self.ddgres = xmlparser.parse_string(page)
|
||||
else:
|
||||
self.ddgres = None
|
||||
self.ddgres = web.getXML("http://api.duckduckgo.com/?q=%s&format=xml" % quote(terms))
|
||||
|
||||
@property
|
||||
def type(self):
|
||||
|
|
@ -55,7 +49,7 @@ class DDGSearch:
|
|||
@property
|
||||
def answer(self):
|
||||
try:
|
||||
return striphtml(self.ddgres.getFirstNode("Answer").getContent())
|
||||
return web.striphtml(self.ddgres.getFirstNode("Answer").getContent())
|
||||
except:
|
||||
return None
|
||||
|
||||
|
|
@ -68,22 +62,3 @@ class DDGSearch:
|
|||
return None
|
||||
except:
|
||||
return None
|
||||
|
||||
|
||||
def striphtml(data):
|
||||
p = re.compile(r'<.*?>')
|
||||
return p.sub('', data).replace("(", "/(").replace(")", ")/").replace(""", "\"")
|
||||
|
||||
def getPage(terms):
|
||||
conn = http.client.HTTPConnection("api.duckduckgo.com", timeout=5)
|
||||
try:
|
||||
conn.request("GET", "/?q=%s&format=xml" % quote(terms))
|
||||
except socket.gaierror:
|
||||
print ("impossible de récupérer la page %s."%(p))
|
||||
return (http.client.INTERNAL_SERVER_ERROR, None)
|
||||
|
||||
res = conn.getresponse()
|
||||
data = res.read()
|
||||
|
||||
conn.close()
|
||||
return (res.status, data)
|
||||
|
|
|
|||
|
|
@ -1,19 +1,22 @@
|
|||
# coding=utf-8
|
||||
|
||||
import http.client
|
||||
import re
|
||||
import socket
|
||||
from urllib.parse import quote
|
||||
|
||||
import xmlparser
|
||||
from tools import web
|
||||
|
||||
class WFASearch:
|
||||
def __init__(self, terms):
|
||||
self.terms = terms
|
||||
(res, page) = getPage(terms)
|
||||
if res == http.client.OK:
|
||||
self.wfares = xmlparser.parse_string(page)
|
||||
else:
|
||||
try:
|
||||
self.wfares = web.getXML("http://api.wolframalpha.com/v2/query?"
|
||||
"input=%s&appid=%s"
|
||||
% (quote(terms),
|
||||
CONF.getNode("wfaapi")["key"]))
|
||||
except (TypeError, KeyError):
|
||||
print ("You need a Wolfram|Alpha API key in order to use this "
|
||||
"module. Add it to the module configuration file:\n<wfaapi"
|
||||
" key=\"XXXXXX-XXXXXXXXXX\" />\nRegister at "
|
||||
"http://products.wolframalpha.com/api/")
|
||||
self.wfares = None
|
||||
|
||||
@property
|
||||
|
|
@ -25,7 +28,9 @@ class WFASearch:
|
|||
|
||||
@property
|
||||
def error(self):
|
||||
if self.wfares["error"] == "true":
|
||||
if self.wfares is None:
|
||||
return "An error occurs during computation."
|
||||
elif self.wfares["error"] == "true":
|
||||
return "An error occurs during computation: " + self.wfares.getNode("error").getNode("msg").getContent()
|
||||
elif self.wfares.hasNode("didyoumeans"):
|
||||
start = "Did you mean: "
|
||||
|
|
@ -62,21 +67,3 @@ class WFASearch:
|
|||
yield node["title"] + " " + subnode["title"] + ": " + subnode.getFirstNode("plaintext").getContent()
|
||||
except IndexError:
|
||||
pass
|
||||
|
||||
|
||||
def getPage(terms):
|
||||
conn = http.client.HTTPConnection("api.wolframalpha.com", timeout=15)
|
||||
try:
|
||||
conn.request("GET", "/v2/query?input=%s&appid=%s" % (quote(terms), CONF.getNode("wfaapi")["key"]))
|
||||
except socket.gaierror:
|
||||
print ("impossible de récupérer la page Wolfram|Alpha.")
|
||||
return (http.client.INTERNAL_SERVER_ERROR, None)
|
||||
except (TypeError, KeyError):
|
||||
print ("You need a Wolfram|Alpha API key in order to use this module. Add it to the module configuration file:\n<wfaapi key=\"XXXXXX-XXXXXXXXXX\" />\nRegister at http://products.wolframalpha.com/api/")
|
||||
return (http.client.INTERNAL_SERVER_ERROR, None)
|
||||
|
||||
res = conn.getresponse()
|
||||
data = res.read()
|
||||
|
||||
conn.close()
|
||||
return (res.status, data)
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@ from datetime import date
|
|||
from datetime import datetime
|
||||
|
||||
from . import SiteSoutenances
|
||||
from .Delayed import Delayed
|
||||
|
||||
nemubotversion = 3.2
|
||||
nemubotversion = 3.3
|
||||
|
||||
def help_tiny():
|
||||
"""Line inserted in the response to the command !help"""
|
||||
|
|
@ -24,11 +23,11 @@ def load(context):
|
|||
|
||||
def ask_soutenance(msg):
|
||||
req = ModuleState("request")
|
||||
if len(msg.cmd) > 1:
|
||||
req.setAttribute("user", msg.cmd[1])
|
||||
if len(msg.cmds) > 1:
|
||||
req.setAttribute("user", msg.cmds[1])
|
||||
else:
|
||||
req.setAttribute("user", "next")
|
||||
req.setAttribute("server", msg.srv.id)
|
||||
req.setAttribute("server", msg.server)
|
||||
req.setAttribute("channel", msg.channel)
|
||||
req.setAttribute("sender", msg.sender)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# coding=utf-8
|
||||
|
||||
import http.client
|
||||
import re
|
||||
import socket
|
||||
from urllib.parse import quote
|
||||
|
||||
from tools import web
|
||||
|
||||
nemubotversion = 3.3
|
||||
|
||||
def help_tiny ():
|
||||
|
|
@ -38,8 +38,8 @@ def cmd_syno(msg):
|
|||
|
||||
|
||||
def get_synos(word):
|
||||
(res, page) = getPage(word)
|
||||
if res == http.client.OK:
|
||||
page = web.getURLContent("http://www.crisco.unicaen.fr/des/synonymes/%s" % quote(word))
|
||||
if page is not None:
|
||||
synos = list()
|
||||
for line in page.decode().split("\n"):
|
||||
if re.match("[ \t]*<tr[^>]*>.*</tr>[ \t]*</table>.*", line) is not None:
|
||||
|
|
@ -48,29 +48,3 @@ def get_synos(word):
|
|||
return synos
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
def getPage(terms):
|
||||
conn = http.client.HTTPConnection("www.crisco.unicaen.fr", timeout=5)
|
||||
try:
|
||||
conn.request("GET", "/des/synonymes/%s" % quote(terms))
|
||||
except socket.gaierror:
|
||||
print ("impossible de récupérer la page Wolfram|Alpha.")
|
||||
return (http.client.INTERNAL_SERVER_ERROR, None)
|
||||
|
||||
res = conn.getresponse()
|
||||
data = res.read()
|
||||
|
||||
conn.close()
|
||||
return (res.status, data)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys
|
||||
if len(sys.argv) == 0:
|
||||
print ("Usage: ./syno.py word [word ...]")
|
||||
else:
|
||||
for word in sys.argv:
|
||||
synos = get_synos(word)
|
||||
if synos is not None:
|
||||
print ("Synonyme de %s : %s" % (word, ', '.join(synos)))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
# coding=utf-8
|
||||
|
||||
import http.client
|
||||
import re
|
||||
from xml.dom.minidom import parseString
|
||||
|
||||
from event import ModuleEvent
|
||||
from xmlparser.node import ModuleState
|
||||
from tools import web
|
||||
|
||||
nemubotversion = 3.3
|
||||
|
||||
|
|
@ -26,33 +23,18 @@ def help_full ():
|
|||
return "!velib /number/ ...: gives available bikes and slots at the station /number/."
|
||||
|
||||
|
||||
def getPage (s, p):
|
||||
conn = http.client.HTTPConnection(s, timeout=10)
|
||||
try:
|
||||
conn.request("GET", p)
|
||||
except socket.gaierror:
|
||||
print ("[%s] impossible de récupérer la page %s."%(s, p))
|
||||
return None
|
||||
|
||||
res = conn.getresponse()
|
||||
data = res.read()
|
||||
|
||||
conn.close()
|
||||
return (res.status, data)
|
||||
|
||||
def station_status(station):
|
||||
"""Gets available and free status of a given station"""
|
||||
(st, page) = getPage(CONF.getNode("server")["ip"], CONF.getNode("server")["url"] + station)
|
||||
if st == http.client.OK:
|
||||
response = parseString(page)
|
||||
available = response.documentElement.getElementsByTagName("available")
|
||||
if len(available) > 0:
|
||||
available = int(available[0].childNodes[0].nodeValue)
|
||||
response = web.getXML(CONF.getNode("server")["url"] + station)
|
||||
if response is not None:
|
||||
available = response.getNode("available").getContent()
|
||||
if available is not None and len(available) > 0:
|
||||
available = int(available)
|
||||
else:
|
||||
available = 0
|
||||
free = response.documentElement.getElementsByTagName("free")
|
||||
if len(free) > 0:
|
||||
free = int(free[0].childNodes[0].nodeValue)
|
||||
free = response.getNode("free").getContent()
|
||||
if free is not None and len(free) > 0:
|
||||
free = int(free)
|
||||
else:
|
||||
free = 0
|
||||
return (available, free)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" ?>
|
||||
<nemubotmodule name="velib">
|
||||
<server ip="www.velib.paris.fr" url="/service/stationdetails/paris/" />
|
||||
<server url="http://www.velib.paris.fr/service/stationdetails/paris/" />
|
||||
<message type="cmd" name="velib" call="ask_stations" />
|
||||
</nemubotmodule>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue