projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[limelight] Improve embeds detection (closes #13895)
[youtube-dl]
/
youtube_dl
/
extractor
/
pandatv.py
diff --git
a/youtube_dl/extractor/pandatv.py
b/youtube_dl/extractor/pandatv.py
index 133cc9b884c656b9f1ab66c0af7f446cd68a7fbd..c86d7077127e2da252bd90db257bc152aa18e166 100644
(file)
--- a/
youtube_dl/extractor/pandatv.py
+++ b/
youtube_dl/extractor/pandatv.py
@@
-10,13
+10,13
@@
from ..utils import (
class PandaTVIE(InfoExtractor):
IE_DESC = '熊猫TV'
class PandaTVIE(InfoExtractor):
IE_DESC = '熊猫TV'
- _VALID_URL = r'http://(?:www\.)?panda\.tv/(?P<id>[0-9]+)'
- _TEST
=
{
- 'url': 'http://www.panda.tv/
10091
',
+ _VALID_URL = r'http
s?
://(?:www\.)?panda\.tv/(?P<id>[0-9]+)'
+ _TEST
S = [
{
+ 'url': 'http://www.panda.tv/
66666
',
'info_dict': {
'info_dict': {
- 'id': '
10091
',
+ 'id': '
66666
',
'title': 're:.+',
'title': 're:.+',
- 'uploader': 'å
\9b
\9a
å¾
\92
',
+ 'uploader': 'å
\88
\98
æ
\9d
\80
鸡
',
'ext': 'flv',
'is_live': True,
},
'ext': 'flv',
'is_live': True,
},
@@
-24,13
+24,16
@@
class PandaTVIE(InfoExtractor):
'skip_download': True,
},
'skip': 'Live stream is offline',
'skip_download': True,
},
'skip': 'Live stream is offline',
- }
+ }, {
+ 'url': 'https://www.panda.tv/66666',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
config = self._download_json(
def _real_extract(self, url):
video_id = self._match_id(url)
config = self._download_json(
- 'http://www.panda.tv/api_room?roomid=%s' % video_id, video_id)
+ 'http
s
://www.panda.tv/api_room?roomid=%s' % video_id, video_id)
error_code = config.get('errno', 0)
if error_code is not 0:
error_code = config.get('errno', 0)
if error_code is not 0:
@@
-74,7
+77,7
@@
class PandaTVIE(InfoExtractor):
continue
for pref, (ext, pl) in enumerate((('m3u8', '-hls'), ('flv', ''))):
formats.append({
continue
for pref, (ext, pl) in enumerate((('m3u8', '-hls'), ('flv', ''))):
formats.append({
- 'url': 'http://pl%s%s.live.panda.tv/live_panda/%s%s%s.%s'
+ 'url': 'http
s
://pl%s%s.live.panda.tv/live_panda/%s%s%s.%s'
% (pl, plflag1, room_key, live_panda, suffix[quality], ext),
'format_id': '%s-%s' % (k, ext),
'quality': quality,
% (pl, plflag1, room_key, live_panda, suffix[quality], ext),
'format_id': '%s-%s' % (k, ext),
'quality': quality,