projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[__init__] Simplify colon presence check
[youtube-dl]
/
youtube_dl
/
extractor
/
miomio.py
diff --git
a/youtube_dl/extractor/miomio.py
b/youtube_dl/extractor/miomio.py
index 3f812e00568c312fa9952d169f14ddd39bbde17e..170ebd9eb9e285f91e4b8bd85c05b13f745039a8 100644
(file)
--- a/
youtube_dl/extractor/miomio.py
+++ b/
youtube_dl/extractor/miomio.py
@@
-4,11
+4,11
@@
from __future__ import unicode_literals
import random
from .common import InfoExtractor
import random
from .common import InfoExtractor
-from ..compat import compat_urllib_request
from ..utils import (
xpath_text,
int_or_none,
ExtractorError,
from ..utils import (
xpath_text,
int_or_none,
ExtractorError,
+ sanitized_Request,
)
)
@@
-52,6
+52,8
@@
class MioMioIE(InfoExtractor):
mioplayer_path = self._search_regex(
r'src="(/mioplayer/[^"]+)"', webpage, 'ref_path')
mioplayer_path = self._search_regex(
r'src="(/mioplayer/[^"]+)"', webpage, 'ref_path')
+ http_headers = {'Referer': 'http://www.miomio.tv%s' % mioplayer_path}
+
xml_config = self._search_regex(
r'flashvars="type=(?:sina|video)&(.+?)&',
webpage, 'xml config')
xml_config = self._search_regex(
r'flashvars="type=(?:sina|video)&(.+?)&',
webpage, 'xml config')
@@
-61,17
+63,13
@@
class MioMioIE(InfoExtractor):
'http://www.miomio.tv/mioplayer/mioplayerconfigfiles/xml.php?id=%s&r=%s' % (id, random.randint(100, 999)),
video_id)
'http://www.miomio.tv/mioplayer/mioplayerconfigfiles/xml.php?id=%s&r=%s' % (id, random.randint(100, 999)),
video_id)
- vid_config_request =
compat_urllib_request.
Request(
+ vid_config_request =
sanitized_
Request(
'http://www.miomio.tv/mioplayer/mioplayerconfigfiles/sina.php?{0}'.format(xml_config),
'http://www.miomio.tv/mioplayer/mioplayerconfigfiles/sina.php?{0}'.format(xml_config),
- headers=
{'Referer': 'http://www.miomio.tv/mioplayer/mioplayer-v3.0.swf'}
)
+ headers=
http_headers
)
# the following xml contains the actual configuration information on the video file(s)
vid_config = self._download_xml(vid_config_request, video_id)
# the following xml contains the actual configuration information on the video file(s)
vid_config = self._download_xml(vid_config_request, video_id)
- http_headers = {
- 'Referer': 'http://www.miomio.tv%s' % mioplayer_path,
- }
-
if not int_or_none(xpath_text(vid_config, 'timelength')):
raise ExtractorError('Unable to load videos!', expected=True)
if not int_or_none(xpath_text(vid_config, 'timelength')):
raise ExtractorError('Unable to load videos!', expected=True)