From: Philipp Hagemeister Date: Fri, 22 Aug 2014 15:40:36 +0000 (+0200) Subject: Merge remote-tracking branch 'anovicecodemonkey/generic-data-video-url' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=c71dfccc98208be44b1f639af72a257dae34d966;p=youtube-dl Merge remote-tracking branch 'anovicecodemonkey/generic-data-video-url' Conflicts: youtube_dl/extractor/generic.py --- c71dfccc98208be44b1f639af72a257dae34d966 diff --cc youtube_dl/extractor/generic.py index 8e915735e,dfa8d6153..7246ea7fc --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@@ -261,34 -261,20 +261,48 @@@ class GenericIE(InfoExtractor) }, 'add_ie': ['Dailymotion'], }, + # YouTube embed + { + 'url': 'http://www.badzine.de/ansicht/datum/2014/06/09/so-funktioniert-die-neue-englische-badminton-liga.html', + 'info_dict': { + 'id': 'FXRb4ykk4S0', + 'ext': 'mp4', + 'title': 'The NBL Auction 2014', + 'uploader': 'BADMINTON England', + 'uploader_id': 'BADMINTONEvents', + 'upload_date': '20140603', + 'description': 'md5:9ef128a69f1e262a700ed83edb163a73', + }, + 'add_ie': ['Youtube'], + 'params': { + 'skip_download': True, + } + }, + # MTVSercices embed + { + 'url': 'http://www.gametrailers.com/news-post/76093/north-america-europe-is-getting-that-mario-kart-8-mercedes-dlc-too', + 'md5': '35727f82f58c76d996fc188f9755b0d5', + 'info_dict': { + 'id': '0306a69b-8adf-4fb5-aace-75f8e8cbfca9', + 'ext': 'mp4', + 'title': 'Review', + 'description': 'Mario\'s life in the fast lane has never looked so good.', + }, + }, + # YouTube embed via + { + 'url': 'https://play.google.com/store/apps/details?id=com.gameloft.android.ANMP.GloftA8HM', + 'md5': 'c267b1ab6d736057d64babaa37e07a66', + 'info_dict': { + 'id': 'Ybd-qmqYYpA', + 'ext': 'mp4', + 'title': 'Asphalt 8: Airborne - Chinese Great Wall - Android Game Trailer', + 'uploader': 'gameloftandroid', + 'uploader_id': 'gameloftandroid', + 'upload_date': '20140321', + 'description': 'md5:9c6dca5dd75b7131ce482ccf080749d6' + } + } ] def report_download_webpage(self, video_id): @@@ -512,13 -487,8 +526,14 @@@ # Look for embedded YouTube player matches = re.findall(r'''(?x) - (?:]+?src=|data-video-url=|embedSWF\(\s*) - (["\'])(?P(?:https?:)?//(?:www\.)?youtube\.com/ + (?: + ]+?src=| ++ data-video-url=| + ]+?src=| + embedSWF\(?:\s* + ) + (["\']) + (?P(?:https?:)?//(?:www\.)?youtube\.com/ (?:embed|v)/.+?) \1''', webpage) if matches: