suggest: fix for new API

This commit is contained in:
Ryan Hitchman 2014-03-13 10:38:18 -07:00
parent 65846913e4
commit ac78be39f5
1 changed files with 13 additions and 18 deletions

View File

@ -1,4 +1,3 @@
import json
import random
import re
@ -6,29 +5,25 @@ from util import hook, http
@hook.command
def suggest(inp, inp_unstripped=''):
def suggest(inp, inp_unstripped=None):
".suggest [#n] <phrase> -- gets a random/the nth suggested google search"
if inp_unstripped is not None:
inp = inp_unstripped
m = re.match('^#(\d+) (.+)$', inp)
num = 0
if m:
num, inp = m.groups()
num = int(num)
if num > 10:
return 'can only get first ten suggestions'
else:
num = 0
page = http.get('http://google.com/complete/search',
output='json', client='hp', q=inp)
page_json = page.split('(', 1)[1][:-1]
suggestions = json.loads(page_json)[1]
json = http.get_json('http://suggestqueries.google.com/complete/search', client='firefox', q=inp)
suggestions = json[1]
if not suggestions:
return 'no suggestions found'
if num:
if not num:
num = random.randint(1, len(suggestions))
if len(suggestions) + 1 <= num:
return 'only got %d suggestions' % len(suggestions)
out = suggestions[num - 1]
else:
out = random.choice(suggestions)
return '#%d: %s' % (int(out[2][0]) + 1, out[0].replace('<b>', '').replace('</b>', ''))
return '#%d: %s' % (num, out)