catdog2/urlbot-native
1
0
Fork 0
Code Issues Pull Requests Releases Activity

wp, now with umlaute

Browse Source
This commit is contained in:
Peter Dahlberg
2015-02-06 13:19:14 +01:00
committed by urlbot
parent 5a2623b93f
commit 3fa94d79b4
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins.py
View File

@@ -8,6 +8,7 @@ if '__main__' == __name__:
import time, random, unicodedata, re, sys, urllib.request, json import time, random, unicodedata, re, sys, urllib.request, json
import types import types
import traceback import traceback
import urllib.parse
from local_config import conf, set_conf from local_config import conf, set_conf
from common import * from common import *
from urlbot import extract_title from urlbot import extract_title
@@ -532,24 +533,22 @@ def command_wp(argv,lang="de",**args):
'msg': args['reply_user'] + ": You must enter a query" 'msg': args['reply_user'] + ": You must enter a query"
} }
# FIXME: escaping. probably. api = { "action" : "query", "prop" : "extracts", "explaintext": "" ,
api = ('https://%s.wikipedia.org/w/api.php?action=query&prop=extracts&' + \ "exsentences" : 2, "rawcontinue" : 1, "format" : "json", "titles" : query }
'explaintext&exsentences=2&rawcontinue=1&format=json&titles=%s') % ( apiurl = "https://%s.wikipedia.org/w/api.php?%s" % (lang, urllib.parse.urlencode(api))
lang, query
)
link = 'https://%s.wikipedia.org/wiki/%s' % (lang, query) link = 'https://%s.wikipedia.org/wiki/%s' % (lang, query)
(j, short) = (None, None) (j, short) = (None, None)
failed = False failed = False
try: try:
response = urllib.request.urlopen(api) response = urllib.request.urlopen(apiurl)
buf = response.read(BUFSIZ) buf = response.read(BUFSIZ)
j = json.loads(buf.decode('utf-8')) j = json.loads(buf.decode("unicode_escape"))
except Exception as e: except Exception as e:
logger('plugin', 'wp(%s) failed: %s' % (query, str(e))) logger('plugin', 'wp(%s) failed: %s, %s' % (query, e, traceback.format_exc()))
return { return {
'msg': args['reply_user'] + ": something failed: %s" % str(e) 'msg': args['reply_user'] + ": something failed: %s" % e
} }
# FIXME: this looks rather shitty. We're looking for # FIXME: this looks rather shitty. We're looking for