ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update valvesounds.py

Browse source
This commit is contained in:
Steven Smith 2013-09-13 17:45:13 +08:00
parent b460fb2fd2
commit a69c4eceb3
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/valvesounds.py
View file

@ -4,16 +4,9 @@ import urllib2
def get_sound_info(game, search): def get_sound_info(game, search):
# Currently, http.get_json doesn't support adding headers.
def get_json(url):
request = urllib2.Request(url)
request.add_header('User-Agent', http.ua_cloudbot)
opener = urllib2.build_opener()
return json.loads(opener.open(request).read())
search = search.replace(" ", "+") search = search.replace(" ", "+")
try: try:
data = get_json("http://p2sounds.blha303.com.au/search/%s/%s" % (game, search)) data = http.get_json("http://p2sounds.blha303.com.au/search/%s/%s?format=json" % (game, search))
except urllib2.HTTPError as e: except urllib2.HTTPError as e:
return "Error: " + json.loads(e.read())["error"] return "Error: " + json.loads(e.read())["error"]
items = [] items = []