projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b813d8c
)
[ultimedia] Fix extraction
author
Sergey M․
<dstftw@gmail.com>
Tue, 19 May 2015 15:28:41 +0000
(21:28 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 19 May 2015 15:28:41 +0000
(21:28 +0600)
youtube_dl/extractor/ultimedia.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ultimedia.py
b/youtube_dl/extractor/ultimedia.py
index 96c809eaf7155290210e0f8b18d3a2c7c948ba97..c4751050ec60901c2750b2f1692059f6246e23dc 100644
(file)
--- 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
import re
from .common import InfoExtractor
+from ..compat import compat_urllib_parse_urlparse
from ..utils import (
ExtractorError,
qualities,
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)
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')
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(
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'])
video_id)
quality = qualities(['flash', 'html5'])