From: Naglis Jonaitis Date: Fri, 17 Oct 2014 22:52:55 +0000 (+0300) Subject: [generic] Make sure Wistia embed URLs contain the protocol (Closes #3977) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=9471c4440599b02bf648091560097eaab690db50;p=youtube-dl [generic] Make sure Wistia embed URLs contain the protocol (Closes #3977) Also, improve detection (Addresses #3662) --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 158dc95a5..9057a6beb 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -654,15 +654,17 @@ class GenericIE(InfoExtractor): match = re.search( r']+?src=(["\'])(?P(?:https?:)?//(?:fast\.)?wistia\.net/embed/iframe/.+?)\1', webpage) if match: + embed_url = self._proto_relative_url( + unescapeHTML(match.group('url'))) return { '_type': 'url_transparent', - 'url': unescapeHTML(match.group('url')), + 'url': embed_url, 'ie_key': 'Wistia', 'uploader': video_uploader, 'title': video_title, 'id': video_id, } - match = re.search(r'(?:id=["\']wistia_|data-wistiaid=["\']|Wistia\.embed\(["\'])(?P[^"\']+)', webpage) + match = re.search(r'(?:id=["\']wistia_|data-wistia-?id=["\']|Wistia\.embed\(["\'])(?P[^"\']+)', webpage) if match: return { '_type': 'url_transparent',