projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/generic] Ensure format id is unicode string
[youtube-dl]
/
youtube_dl
/
extractor
/
googlesearch.py
diff --git
a/youtube_dl/extractor/googlesearch.py
b/youtube_dl/extractor/googlesearch.py
index 498304cb2bd9b605d44e67291a2f38bf4481a6f8..5279fa807f6903fa757c552b3e9ad3e013e5b494 100644
(file)
--- a/
youtube_dl/extractor/googlesearch.py
+++ b/
youtube_dl/extractor/googlesearch.py
@@
-4,9
+4,6
@@
import itertools
import re
from .common import SearchInfoExtractor
import re
from .common import SearchInfoExtractor
-from ..compat import (
- compat_urllib_parse,
-)
class GoogleSearchIE(SearchInfoExtractor):
class GoogleSearchIE(SearchInfoExtractor):
@@
-34,13
+31,16
@@
class GoogleSearchIE(SearchInfoExtractor):
}
for pagenum in itertools.count():
}
for pagenum in itertools.count():
- result_url = (
- 'http://www.google.com/search?tbm=vid&q=%s&start=%s&hl=en'
- % (compat_urllib_parse.quote_plus(query), pagenum * 10))
-
webpage = self._download_webpage(
webpage = self._download_webpage(
- result_url, 'gvsearch:' + query,
- note='Downloading result page ' + str(pagenum + 1))
+ 'http://www.google.com/search',
+ 'gvsearch:' + query,
+ note='Downloading result page %s' % (pagenum + 1),
+ query={
+ 'tbm': 'vid',
+ 'q': query,
+ 'start': pagenum * 10,
+ 'hl': 'en',
+ })
for hit_idx, mobj in enumerate(re.finditer(
r'<h3 class="r"><a href="([^"]+)"', webpage)):
for hit_idx, mobj in enumerate(re.finditer(
r'<h3 class="r"><a href="([^"]+)"', webpage)):