[common] update google_search(), fix #727

This commit is contained in:
Mort Yao 2015-10-21 22:36:11 +02:00
parent 834f5fdcf4
commit f65158fe70

View File

@ -1160,11 +1160,13 @@ def google_search(url):
keywords = r1(r'https?://(.*)', url) keywords = r1(r'https?://(.*)', url)
url = 'https://www.google.com/search?tbm=vid&q=%s' % parse.quote(keywords) url = 'https://www.google.com/search?tbm=vid&q=%s' % parse.quote(keywords)
page = get_content(url, headers=fake_headers) page = get_content(url, headers=fake_headers)
videos = re.findall(r'<a href="([^"]+)" onmousedown="[^"]+">([^<]+)<', page) videos = re.findall(r'<a href="(https?://[^"]+)" onmousedown="[^"]+">([^<]+)<', page)
durs = re.findall(r'<span class="vdur _dwc">[^<]+(\d+:\d+)', page) vdurs = re.findall(r'<span class="vdur _dwc">([^<]+)<', page)
durs = [r1(r'(\d+:\d+)', unescape_html(dur)) for dur in vdurs]
print("Google Videos search:") print("Google Videos search:")
for v in zip(videos, durs): for v in zip(videos, durs):
print("- video: %s [%s]" % (unescape_html(v[0][1]), v[1])) print("- video: %s [%s]" % (unescape_html(v[0][1]),
v[1] if v[1] else '?'))
print("# you-get %s" % log.sprint(v[0][0], log.UNDERLINE)) print("# you-get %s" % log.sprint(v[0][0], log.UNDERLINE))
print() print()
print("Best matched result:") print("Best matched result:")