diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-06-23 20:41:54 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-06-23 20:41:54 +0200 |
| commit | 934858ad86f5b628978d3bcdd7edd765d4590840 (patch) | |
| tree | e42ce0d296826e8649a810e1c41efae4371224b3 /youtube_dl/InfoExtractors.py | |
| parent | 3c25b9abaee69657db9c75d80a5671c8c4206615 (diff) | |
Move YahooSearchIE to youtube_dl.extractor.yahoo
Diffstat (limited to 'youtube_dl/InfoExtractors.py')
| -rwxr-xr-x | youtube_dl/InfoExtractors.py | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 26fc65690..fb10c2ec4 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -27,7 +27,7 @@ from .extractor.metacafe import MetacafeIE from .extractor.statigram import StatigramIE from .extractor.photobucket import PhotobucketIE from .extractor.vimeo import VimeoIE -from .extractor.yahoo import YahooIE +from .extractor.yahoo import YahooIE, YahooSearchIE from .extractor.youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE from .extractor.zdf import ZDFIE @@ -45,39 +45,6 @@ from .extractor.zdf import ZDFIE -class YahooSearchIE(SearchInfoExtractor): - """Information Extractor for Yahoo! Video search queries.""" - - _MAX_RESULTS = 1000 - IE_NAME = u'screen.yahoo:search' - _SEARCH_KEY = 'yvsearch' - - def _get_n_results(self, query, n): - """Get a specified number of results for a query""" - - res = { - '_type': 'playlist', - 'id': query, - 'entries': [] - } - for pagenum in itertools.count(0): - result_url = u'http://video.search.yahoo.com/search/?p=%s&fr=screen&o=js&gs=0&b=%d' % (compat_urllib_parse.quote_plus(query), pagenum * 30) - webpage = self._download_webpage(result_url, query, - note='Downloading results page '+str(pagenum+1)) - info = json.loads(webpage) - m = info[u'm'] - results = info[u'results'] - - for (i, r) in enumerate(results): - if (pagenum * 30) +i >= n: - break - mobj = re.search(r'(?P<url>screen\.yahoo\.com/.*?-\d*?\.html)"', r) - e = self.url_result('http://' + mobj.group('url'), 'Yahoo') - res['entries'].append(e) - if (pagenum * 30 +i >= n) or (m[u'last'] >= (m[u'total'] -1 )): - break - - return res class BlipTVUserIE(InfoExtractor): |