|
|
@ -4,6 +4,7 @@ from __future__ import unicode_literals
|
|
|
|
import re
|
|
|
|
import re
|
|
|
|
|
|
|
|
|
|
|
|
from .common import InfoExtractor
|
|
|
|
from .common import InfoExtractor
|
|
|
|
|
|
|
|
from ..compat import compat_urllib_parse_urlparse
|
|
|
|
from ..utils import (
|
|
|
|
from ..utils import (
|
|
|
|
ExtractorError,
|
|
|
|
ExtractorError,
|
|
|
|
qualities,
|
|
|
|
qualities,
|
|
|
@ -44,9 +45,9 @@ class UltimediaIE(InfoExtractor):
|
|
|
|
video_id = self._match_id(url)
|
|
|
|
video_id = self._match_id(url)
|
|
|
|
webpage = self._download_webpage(url, video_id)
|
|
|
|
webpage = self._download_webpage(url, video_id)
|
|
|
|
|
|
|
|
|
|
|
|
deliver_url = self._search_regex(
|
|
|
|
deliver_url = self._proto_relative_url(self._search_regex(
|
|
|
|
r'<iframe[^>]+src="(https?://(?:www\.)?ultimedia\.com/deliver/[^"]+)"',
|
|
|
|
r'<iframe[^>]+src="((?:https?:)?//(?:www\.)?ultimedia\.com/deliver/[^"]+)"',
|
|
|
|
webpage, 'deliver URL')
|
|
|
|
webpage, 'deliver URL'), compat_urllib_parse_urlparse(url).scheme + ':')
|
|
|
|
|
|
|
|
|
|
|
|
deliver_page = self._download_webpage(
|
|
|
|
deliver_page = self._download_webpage(
|
|
|
|
deliver_url, video_id, 'Downloading iframe page')
|
|
|
|
deliver_url, video_id, 'Downloading iframe page')
|
|
|
@ -57,7 +58,8 @@ class UltimediaIE(InfoExtractor):
|
|
|
|
|
|
|
|
|
|
|
|
player = self._parse_json(
|
|
|
|
player = self._parse_json(
|
|
|
|
self._search_regex(
|
|
|
|
self._search_regex(
|
|
|
|
r"jwplayer\('player(?:_temp)?'\)\.setup\(({.+?})\)\.on", deliver_page, 'player'),
|
|
|
|
r"jwplayer\('player(?:_temp)?'\)\.setup\(({.+?})\)\.on",
|
|
|
|
|
|
|
|
deliver_page, 'player'),
|
|
|
|
video_id)
|
|
|
|
video_id)
|
|
|
|
|
|
|
|
|
|
|
|
quality = qualities(['flash', 'html5'])
|
|
|
|
quality = qualities(['flash', 'html5'])
|
|
|
|