aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-04-30 01:46:06 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-04-30 01:46:06 +0200
commitebd3c7b3708e162860d08b6ab710f02a0b0685f8 (patch)
tree3c8d38afcc939ff91c5648398f09aa3c877535f1
parent29645a1d4471d527ab6ff5fc3c36d52ae2c8c6ea (diff)
[generic] Add support for protocol-independent URLs (Fixes #2810)
-rw-r--r--youtube_dl/extractor/generic.py23
1 files changed, 22 insertions, 1 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 13064e2cd..cfb009d79 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -248,6 +248,18 @@ class GenericIE(InfoExtractor):
'ext': 'mp4',
'title': 'Honda’s New Asimo Robot Is More Human Than Ever',
}
+ },
+ # Dailymotion embed
+ {
+ 'url': 'http://www.spi0n.com/zap-spi0n-com-n216/',
+ 'md5': '441aeeb82eb72c422c7f14ec533999cd',
+ 'info_dict': {
+ 'id': 'k2mm4bCdJ6CQ2i7c8o2',
+ 'ext': 'mp4',
+ 'title': 'Le Zap de Spi0n n°216 - Zapping du Web',
+ 'uploader': 'Spi0n',
+ },
+ 'add_ie': ['Dailymotion'],
}
]
@@ -333,6 +345,15 @@ class GenericIE(InfoExtractor):
}
def _real_extract(self, url):
+ if url.startswith('//'):
+ return {
+ '_type': 'url',
+ 'url': (
+ 'http:'
+ if self._downloader.params.get('prefer_insecure', False)
+ else 'https:') + url,
+ }
+
parsed_url = compat_urlparse.urlparse(url)
if not parsed_url.scheme:
default_search = self._downloader.params.get('default_search')
@@ -469,7 +490,7 @@ class GenericIE(InfoExtractor):
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')
+ urlrs = [self.url_result(unescapeHTML(tuppl[1]))
for tuppl in matches]
return self.playlist_result(
urlrs, playlist_id=video_id, playlist_title=video_title)