diff options
| author | rzhxeo <rzhxeot7z81b4700@mailcatch.com> | 2014-02-24 01:15:51 +0100 |
|---|---|---|
| committer | rzhxeo <rzhxeot7z81b4700@mailcatch.com> | 2014-02-27 08:14:28 +0100 |
| commit | 1b86cc41cf3f7db5893597b4b1956104a77147f7 (patch) | |
| tree | 478cb50845b9d70fa5574bcc07a87833609a723c | |
| parent | 41d3ec5fba1b64be78f3ea823a604c28833a94cd (diff) | |
| download | youtube-dl-1b86cc41cf3f7db5893597b4b1956104a77147f7.tar.gz youtube-dl-1b86cc41cf3f7db5893597b4b1956104a77147f7.tar.xz youtube-dl-1b86cc41cf3f7db5893597b4b1956104a77147f7.zip | |
Add support for embed.ly
| -rw-r--r-- | youtube_dl/extractor/generic.py | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 9a2e54d14..e84c022a5 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -102,6 +102,18 @@ class GenericIE(InfoExtractor): 'title': '2cc213299525360.mov', # that's what we get }, }, + # embed.ly video + { + 'url': 'http://www.tested.com/science/weird/460206-tested-grinding-coffee-2000-frames-second/', + 'info_dict': { + 'id': '9ODmcdjQcHQ', + 'ext': 'mp4', + }, + # No need to test YoutubeIE here + 'params': { + 'skip_download': True, + }, + }, ] def report_download_webpage(self, video_id): @@ -381,6 +393,14 @@ class GenericIE(InfoExtractor): if mobj is not None: return self.url_result(mobj.group('url'), 'HuffPost') + # Look for embed.ly + mobj = re.search(r'class=["\']embedly-card["\'][^>]href=["\'](?P<url>[^"\']+)', webpage) + if mobj is not None: + return self.url_result(mobj.group('url')) + mobj = re.search(r'class=["\']embedly-embed["\'][^>]src=["\'][^"\']*url=(?P<url>[^&]+)', webpage) + if mobj is not None: + return self.url_result(compat_urllib_parse.unquote(mobj.group('url'))) + # Start with something easy: JW Player in SWFObject mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage) if mobj is None: |