From: Philipp Hagemeister Date: Wed, 5 Mar 2014 13:01:53 +0000 (+0100) Subject: Merge remote-tracking branch 'rzhxeo/embedly' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=f55a1f0a8815c89b01a7a353cfa0bd5118f75829;p=youtube-dl Merge remote-tracking branch 'rzhxeo/embedly' Conflicts: youtube_dl/extractor/generic.py --- f55a1f0a8815c89b01a7a353cfa0bd5118f75829 diff --cc youtube_dl/extractor/generic.py index 641d9babb,e84c022a5..dd60bc418 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@@ -101,22 -102,18 +101,34 @@@ class GenericIE(InfoExtractor) 'title': '2cc213299525360.mov', # that's what we get }, }, + # google redirect + { + 'url': 'http://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&ved=0CCUQtwIwAA&url=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DcmQHVoWB5FY&ei=F-sNU-LLCaXk4QT52ICQBQ&usg=AFQjCNEw4hL29zgOohLXvpJ-Bdh2bils1Q&bvm=bv.61965928,d.bGE', + 'info_dict': { + 'id': 'cmQHVoWB5FY', + 'ext': 'mp4', + 'upload_date': '20130224', + 'uploader_id': 'TheVerge', + 'description': 'Chris Ziegler takes a look at the Alcatel OneTouch Fire and the ZTE Open; two of the first Firefox OS handsets to be officially announced.', + 'uploader': 'The Verge', + 'title': 'First Firefox OS phones side-by-side', + }, + 'params': { + 'skip_download': False, + } - } ++ }, + # 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):