projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bbccouk] PEP8
[youtube-dl]
/
youtube_dl
/
extractor
/
bilibili.py
diff --git
a/youtube_dl/extractor/bilibili.py
b/youtube_dl/extractor/bilibili.py
index 45067b944996f7d3f6ce1ced97b379cd6ce40ff9..241b904a9e57f7cc3e61b6f086550578feb71b05 100644
(file)
--- a/
youtube_dl/extractor/bilibili.py
+++ b/
youtube_dl/extractor/bilibili.py
@@
-4,8
+4,8
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
+from ..compat import compat_parse_qs
from ..utils import (
from ..utils import (
- compat_parse_qs,
ExtractorError,
int_or_none,
unified_strdate,
ExtractorError,
int_or_none,
unified_strdate,
@@
-13,7
+13,7
@@
from ..utils import (
class BiliBiliIE(InfoExtractor):
class BiliBiliIE(InfoExtractor):
- _VALID_URL = r'http://www\.bilibili\.
tv
/video/av(?P<id>[0-9]+)/'
+ _VALID_URL = r'http://www\.bilibili\.
(?:tv|com)
/video/av(?P<id>[0-9]+)/'
_TEST = {
'url': 'http://www.bilibili.tv/video/av1074402/',
_TEST = {
'url': 'http://www.bilibili.tv/video/av1074402/',
@@
-29,10
+29,9
@@
class BiliBiliIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
-
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
webpage = self._download_webpage(url, video_id)
+
video_code = self._search_regex(
r'(?s)<div itemprop="video".*?>(.*?)</div>', webpage, 'video code')
video_code = self._search_regex(
r'(?s)<div itemprop="video".*?>(.*?)</div>', webpage, 'video code')
@@
-56,7
+55,7
@@
class BiliBiliIE(InfoExtractor):
'thumbnailUrl', video_code, 'thumbnail', fatal=False)
player_params = compat_parse_qs(self._html_search_regex(
'thumbnailUrl', video_code, 'thumbnail', fatal=False)
player_params = compat_parse_qs(self._html_search_regex(
- r'<iframe .*?class="player" src="https://secure
.bilibili.tv
/secure,([^"]+)"',
+ r'<iframe .*?class="player" src="https://secure
\.bilibili\.(?:tv|com)
/secure,([^"]+)"',
webpage, 'player params'))
if 'cid' in player_params:
webpage, 'player params'))
if 'cid' in player_params: