projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[soundcloud] Handle 'secret_token' for 'w.soundcloud.com/player/?url=*' urls (fixes...
[youtube-dl]
/
youtube_dl
/
extractor
/
xuite.py
diff --git
a/youtube_dl/extractor/xuite.py
b/youtube_dl/extractor/xuite.py
index a9dbf8c2de1e5c5c8ca75793eeb86450c825381c..81d885fdcee1cf788c217e862629df58f386d73c 100644
(file)
--- a/
youtube_dl/extractor/xuite.py
+++ b/
youtube_dl/extractor/xuite.py
@@
-14,7
+14,7
@@
from ..utils import (
class XuiteIE(InfoExtractor):
_REGEX_BASE64 = r'(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?'
class XuiteIE(InfoExtractor):
_REGEX_BASE64 = r'(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?'
- _VALID_URL = r'http
://vlog.xuite
.net/(?:play|embed)/(?P<id>%s)' % _REGEX_BASE64
+ _VALID_URL = r'http
s?://vlog\.xuite\
.net/(?:play|embed)/(?P<id>%s)' % _REGEX_BASE64
_TESTS = [{
# Audio
'url': 'http://vlog.xuite.net/play/RGkzc1ZULTM4NjA5MTQuZmx2',
_TESTS = [{
# Audio
'url': 'http://vlog.xuite.net/play/RGkzc1ZULTM4NjA5MTQuZmx2',
@@
-69,18
+69,26
@@
class XuiteIE(InfoExtractor):
'only_matching': True,
}]
'only_matching': True,
}]
+ @staticmethod
+ def base64_decode_utf8(data):
+ return base64.b64decode(data.encode('utf-8')).decode('utf-8')
+
+ @staticmethod
+ def base64_encode_utf8(data):
+ return base64.b64encode(data.encode('utf-8')).decode('utf-8')
+
def _extract_flv_config(self, media_id):
def _extract_flv_config(self, media_id):
- base64_media_id =
base64.b64encode(media_id.encode('utf-8')).decode('utf-8'
)
+ base64_media_id =
self.base64_encode_utf8(media_id
)
flv_config = self._download_xml(
'http://vlog.xuite.net/flash/player?media=%s' % base64_media_id,
'flv config')
prop_dict = {}
for prop in flv_config.findall('./property'):
flv_config = self._download_xml(
'http://vlog.xuite.net/flash/player?media=%s' % base64_media_id,
'flv config')
prop_dict = {}
for prop in flv_config.findall('./property'):
- prop_id =
base64.b64decode(prop.attrib['id']).decode('utf-8'
)
+ prop_id =
self.base64_decode_utf8(prop.attrib['id']
)
# CDATA may be empty in flv config
if not prop.text:
continue
# CDATA may be empty in flv config
if not prop.text:
continue
- encoded_content =
base64.b64decode(prop.text).decode('utf-8'
)
+ encoded_content =
self.base64_decode_utf8(prop.text
)
prop_dict[prop_id] = compat_urllib_parse_unquote(encoded_content)
return prop_dict
prop_dict[prop_id] = compat_urllib_parse_unquote(encoded_content)
return prop_dict