diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-05-19 21:28:41 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-05-19 21:28:41 +0600 |
| commit | d9d747a06ab3b4c36c6063074ffb42aeb185431f (patch) | |
| tree | e18d9b8e824cde5fc577bb1dfc5a77ed8d7d0d2d | |
| parent | b813d8caf1b23821036b77b851e42ba0a0ad35a7 (diff) | |
| download | youtube-dl-d9d747a06ab3b4c36c6063074ffb42aeb185431f.zip youtube-dl-d9d747a06ab3b4c36c6063074ffb42aeb185431f.tar.gz youtube-dl-d9d747a06ab3b4c36c6063074ffb42aeb185431f.tar.bz2 | |
[ultimedia] Fix extraction
| -rw-r--r-- | youtube_dl/extractor/ultimedia.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube_dl/extractor/ultimedia.py b/youtube_dl/extractor/ultimedia.py index 96c809e..c475105 100644 --- a/youtube_dl/extractor/ultimedia.py +++ b/youtube_dl/extractor/ultimedia.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import re from .common import InfoExtractor +from ..compat import compat_urllib_parse_urlparse from ..utils import ( ExtractorError, qualities, @@ -44,9 +45,9 @@ class UltimediaIE(InfoExtractor): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) - deliver_url = self._search_regex( - r'<iframe[^>]+src="(https?://(?:www\.)?ultimedia\.com/deliver/[^"]+)"', - webpage, 'deliver URL') + deliver_url = self._proto_relative_url(self._search_regex( + r'<iframe[^>]+src="((?:https?:)?//(?:www\.)?ultimedia\.com/deliver/[^"]+)"', + webpage, 'deliver URL'), compat_urllib_parse_urlparse(url).scheme + ':') deliver_page = self._download_webpage( deliver_url, video_id, 'Downloading iframe page') @@ -57,7 +58,8 @@ class UltimediaIE(InfoExtractor): player = self._parse_json( self._search_regex( - r"jwplayer\('player(?:_temp)?'\)\.setup\(({.+?})\)\.on", deliver_page, 'player'), + r"jwplayer\('player(?:_temp)?'\)\.setup\(({.+?})\)\.on", + deliver_page, 'player'), video_id) quality = qualities(['flash', 'html5']) |