diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-03-30 15:53:06 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-03-30 15:57:35 +0200 |
| commit | 83d548ef0fc451947806c7f21c542e0cd40b4e9d (patch) | |
| tree | 2a6cc838c30be5502eb347d273ba0ff7fe5b8389 | |
| parent | c72477bd322da671cb55cffce10fb2135fa94b1d (diff) | |
| download | youtube-dl-83d548ef0fc451947806c7f21c542e0cd40b4e9d.tar.gz youtube-dl-83d548ef0fc451947806c7f21c542e0cd40b4e9d.tar.xz youtube-dl-83d548ef0fc451947806c7f21c542e0cd40b4e9d.zip | |
[youtube] Encode ytsearch query
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index e206392bb..6384095f9 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1609,7 +1609,7 @@ class YoutubeUserIE(InfoExtractor): class YoutubeSearchIE(SearchInfoExtractor): IE_DESC = u'YouTube.com searches' - _API_URL = 'https://gdata.youtube.com/feeds/api/videos?q=%s&start-index=%i&max-results=50&v=2&alt=jsonc' + _API_URL = u'https://gdata.youtube.com/feeds/api/videos?q=%s&start-index=%i&max-results=50&v=2&alt=jsonc' _MAX_RESULTS = 1000 IE_NAME = u'youtube:search' _SEARCH_KEY = 'ytsearch' @@ -1620,9 +1620,12 @@ class YoutubeSearchIE(SearchInfoExtractor): video_ids = [] pagenum = 0 limit = n + PAGE_SIZE = 50 - while (50 * pagenum) < limit: - result_url = self._API_URL % (compat_urllib_parse.quote_plus(query), (50*pagenum)+1) + while (PAGE_SIZE * pagenum) < limit: + result_url = self._API_URL % ( + compat_urllib_parse.quote_plus(query.encode('utf-8')), + (PAGE_SIZE * pagenum) + 1) data_json = self._download_webpage( result_url, video_id=u'query "%s"' % query, note=u'Downloading page %s' % (pagenum + 1), |