aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-12-01 01:21:33 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-12-01 01:21:33 +0100
commit355e4fd07e7f9c0632d9d78415675f8b5cc3c2ce (patch)
treeb7b7f5e1925fc4f08ee9f2a6d0333a6d47d07017 /youtube_dl
parent5e09d6abbd09de92869cbb8ed204d18f9cd04931 (diff)
[generic] Find embedded dailymotion videos (Fixes #1848)
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/generic.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 37671430a..10ae06263 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -195,6 +195,15 @@ class GenericIE(InfoExtractor):
return self.playlist_result(
urlrs, playlist_id=video_id, playlist_title=video_title)
+ # Look for embedded Dailymotion player
+ matches = re.findall(
+ r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?dailymotion.com/embed/video/.+?)\1', webpage)
+ if matches:
+ urlrs = [self.url_result(unescapeHTML(tuppl[1]), 'Dailymotion')
+ for tuppl in matches]
+ return self.playlist_result(
+ urlrs, playlist_id=video_id, playlist_title=video_title)
+
# Look for Bandcamp pages with custom domain
mobj = re.search(r'<meta property="og:url"[^>]*?content="(.*?bandcamp\.com.*?)"', webpage)
if mobj is not None: