summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <[email protected]>2013-04-20 19:22:45 +0200
committerJaime Marquínez Ferrándiz <[email protected]>2013-04-20 19:22:45 +0200
commit8c416ad29a43bb1a73a0a29b82c0e1baef1ee90a (patch)
treeee39a0e6ecf9a68bb6816d1cd201a29577f33f51
parentc72938240e8edd75296c1dbe262769e5002ce811 (diff)
downloadyoutube-dl-8c416ad29a43bb1a73a0a29b82c0e1baef1ee90a.tar.gz
youtube-dl-8c416ad29a43bb1a73a0a29b82c0e1baef1ee90a.zip
Remove calls to _downloader.download in Youtube searchs
Instead, return the urls of the videos.
-rwxr-xr-xyoutube_dl/InfoExtractors.py21
1 files changed, 8 insertions, 13 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index c50052a73..86a8ca511 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -1510,11 +1510,9 @@ class YoutubeSearchIE(InfoExtractor):
prefix = prefix[8:]
query = query.encode('utf-8')
if prefix == '':
- self._download_n_results(query, 1)
- return
+ return self._get_n_results(query, 1)
elif prefix == 'all':
- self._download_n_results(query, self._max_youtube_results)
- return
+ self._get_n_results(query, self._max_youtube_results)
else:
try:
n = int(prefix)
@@ -1524,14 +1522,12 @@ class YoutubeSearchIE(InfoExtractor):
elif n > self._max_youtube_results:
self._downloader.report_warning(u'ytsearch returns max %i results (you requested %i)' % (self._max_youtube_results, n))
n = self._max_youtube_results
- self._download_n_results(query, n)
- return
+ return self._get_n_results(query, n)
except ValueError: # parsing prefix as integer fails
- self._download_n_results(query, 1)
- return
+ return self._get_n_results(query, 1)
- def _download_n_results(self, query, n):
- """Downloads a specified number of results for a query"""
+ def _get_n_results(self, query, n):
+ """Get a specified number of results for a query"""
video_ids = []
pagenum = 0
@@ -1560,9 +1556,8 @@ class YoutubeSearchIE(InfoExtractor):
if len(video_ids) > n:
video_ids = video_ids[:n]
- for id in video_ids:
- self._downloader.download(['http://www.youtube.com/watch?v=%s' % id])
- return
+ videos = [self.url_result('http://www.youtube.com/watch?v=%s' % id, 'Youtube') for id in video_ids]
+ return videos
class GoogleSearchIE(InfoExtractor):