diff options
author | remitamine <remitamine@gmail.com> | 2016-03-05 18:35:48 +0100 |
---|---|---|
committer | remitamine <remitamine@gmail.com> | 2016-03-05 18:35:48 +0100 |
commit | a9793f58a1971e3f458be01200df485f4e9b0bda (patch) | |
tree | b2079a2fa3c44641e81dc18e17e0276eb0c15155 /youtube_dl/extractor/engadget.py | |
parent | 7177fd24f8ed262024501c1020e5791c811fbfe4 (diff) | |
parent | 1d4c9ed90ca8c01fcfdb838bafaa201c04bd599e (diff) | |
download | youtube-dl-a9793f58a1971e3f458be01200df485f4e9b0bda.tar.xz |
Merge pull request #8754 from remitamine/5min
update 5min related web sites info extraction and add support for Aol features.
Diffstat (limited to 'youtube_dl/extractor/engadget.py')
-rw-r--r-- | youtube_dl/extractor/engadget.py | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/youtube_dl/extractor/engadget.py b/youtube_dl/extractor/engadget.py index e4180701d..e5e57d485 100644 --- a/youtube_dl/extractor/engadget.py +++ b/youtube_dl/extractor/engadget.py @@ -1,21 +1,13 @@ from __future__ import unicode_literals -import re - from .common import InfoExtractor -from ..utils import ( - url_basename, -) class EngadgetIE(InfoExtractor): - _VALID_URL = r'''(?x)https?://www.engadget.com/ - (?:video(?:/5min)?/(?P<id>\d+)| - [\d/]+/.*?) - ''' + _VALID_URL = r'https?://www.engadget.com/video/(?P<id>\d+)' _TEST = { - 'url': 'http://www.engadget.com/video/5min/518153925/', + 'url': 'http://www.engadget.com/video/518153925/', 'md5': 'c6820d4828a5064447a4d9fc73f312c9', 'info_dict': { 'id': '518153925', @@ -27,15 +19,4 @@ class EngadgetIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) - - if video_id is not None: - return self.url_result('5min:%s' % video_id) - else: - title = url_basename(url) - webpage = self._download_webpage(url, title) - ids = re.findall(r'<iframe[^>]+?playList=(\d+)', webpage) - return { - '_type': 'playlist', - 'title': title, - 'entries': [self.url_result('5min:%s' % vid) for vid in ids] - } + return self.url_result('5min:%s' % video_id) |