From ae258e6c37c9d58df9581d130f23d0a4e7e719ec Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Fri, 13 Sep 2013 17:27:18 +0800 Subject: [PATCH 1/4] Update valvesounds.py --- plugins/valvesounds.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/plugins/valvesounds.py b/plugins/valvesounds.py index 4eb60ec..7c4b93e 100644 --- a/plugins/valvesounds.py +++ b/plugins/valvesounds.py @@ -1,13 +1,20 @@ from util import hook, http, web import json -from urllib2 import HTTPError +import urllib2 def get_sound_info(game, search): + # Currently, http.get_json doesn't support adding headers. + def get_json(url, headers): + request = urllib2.Request(url) + request.add_header('User-Agent', http.ua_cloudbot) + opener = urllib2.build_opener() + return json.loads(opener.open(request)) + search = search.replace(" ", "+") try: - data = http.get_json("http://p2sounds.blha303.com.au/search/%s/%s" % (game, search)) - except HTTPError as e: + data = get_json("http://p2sounds.blha303.com.au/search/%s/%s" % (game, search)) + except urllib2.HTTPError as e: return "Error: " + json.loads(e.read())["error"] items = [] for item in data["items"]: From e8947a603b2c3876da30de6f09fbfd1e3857ce3a Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Fri, 13 Sep 2013 17:28:51 +0800 Subject: [PATCH 2/4] Update valvesounds.py --- plugins/valvesounds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/valvesounds.py b/plugins/valvesounds.py index 7c4b93e..b5178bc 100644 --- a/plugins/valvesounds.py +++ b/plugins/valvesounds.py @@ -5,7 +5,7 @@ import urllib2 def get_sound_info(game, search): # Currently, http.get_json doesn't support adding headers. - def get_json(url, headers): + def get_json(url): request = urllib2.Request(url) request.add_header('User-Agent', http.ua_cloudbot) opener = urllib2.build_opener() From b460fb2fd2dfed0fa71e85494ee5980bace68c91 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Fri, 13 Sep 2013 17:30:01 +0800 Subject: [PATCH 3/4] Update valvesounds.py --- plugins/valvesounds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/valvesounds.py b/plugins/valvesounds.py index b5178bc..a8bd9a3 100644 --- a/plugins/valvesounds.py +++ b/plugins/valvesounds.py @@ -9,7 +9,7 @@ def get_sound_info(game, search): request = urllib2.Request(url) request.add_header('User-Agent', http.ua_cloudbot) opener = urllib2.build_opener() - return json.loads(opener.open(request)) + return json.loads(opener.open(request).read()) search = search.replace(" ", "+") try: From a69c4eceb3d3bf35e3b6a4cb58f092ba454517d0 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Fri, 13 Sep 2013 17:45:13 +0800 Subject: [PATCH 4/4] Update valvesounds.py --- plugins/valvesounds.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/plugins/valvesounds.py b/plugins/valvesounds.py index a8bd9a3..5535877 100644 --- a/plugins/valvesounds.py +++ b/plugins/valvesounds.py @@ -4,16 +4,9 @@ import urllib2 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(" ", "+") 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: return "Error: " + json.loads(e.read())["error"] items = []