mirror of
https://gitlab.com/dstftw/youtube-dl.git
synced 2020-11-16 09:42:26 +00:00
[douyu] Support Douyu shows (closes #12228)
This commit is contained in:
parent
3166b1f0ac
commit
7274f3d0e9
|
@ -1,3 +1,9 @@
|
||||||
|
version <unreleased>
|
||||||
|
|
||||||
|
Extractor
|
||||||
|
+ [douyu] Support Douyu shows (#12228)
|
||||||
|
|
||||||
|
|
||||||
version 2017.05.09
|
version 2017.05.09
|
||||||
|
|
||||||
Core
|
Core
|
||||||
|
|
|
@ -3,11 +3,14 @@ from __future__ import unicode_literals
|
||||||
|
|
||||||
import time
|
import time
|
||||||
import hashlib
|
import hashlib
|
||||||
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
unescapeHTML,
|
unescapeHTML,
|
||||||
|
unified_strdate,
|
||||||
|
urljoin,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -117,3 +120,82 @@ class DouyuTVIE(InfoExtractor):
|
||||||
'uploader': uploader,
|
'uploader': uploader,
|
||||||
'is_live': True,
|
'is_live': True,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class DouyuShowIE(InfoExtractor):
|
||||||
|
_VALID_URL = r'https?://v(?:mobile)?\.douyu\.com/show/(?P<id>[0-9a-zA-Z]+)'
|
||||||
|
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://v.douyu.com/show/rjNBdvnVXNzvE2yw',
|
||||||
|
'md5': '0c2cfd068ee2afe657801269b2d86214',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'rjNBdvnVXNzvE2yw',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': '陈一发儿:砒霜 我有个室友系列!04-01 22点场',
|
||||||
|
'duration': 7150.08,
|
||||||
|
'thumbnail': r're:^https?://.*\.jpg$',
|
||||||
|
'uploader': '陈一发儿',
|
||||||
|
'uploader_id': 'XrZwYelr5wbK',
|
||||||
|
'uploader_url': 'https://v.douyu.com/author/XrZwYelr5wbK',
|
||||||
|
'upload_date': '20170402',
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'https://vmobile.douyu.com/show/rjNBdvnVXNzvE2yw',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
url = url.replace('vmobile.', 'v.')
|
||||||
|
video_id = self._match_id(url)
|
||||||
|
|
||||||
|
webpage = self._download_webpage(url, video_id)
|
||||||
|
|
||||||
|
room_info = self._parse_json(self._search_regex(
|
||||||
|
r'var\s+\$ROOM\s*=\s*({.+});', webpage, 'room info'), video_id)
|
||||||
|
|
||||||
|
video_info = None
|
||||||
|
|
||||||
|
for trial in range(5):
|
||||||
|
# Sometimes Douyu rejects our request. Let's try it more times
|
||||||
|
try:
|
||||||
|
video_info = self._download_json(
|
||||||
|
'https://vmobile.douyu.com/video/getInfo', video_id,
|
||||||
|
query={'vid': video_id},
|
||||||
|
headers={
|
||||||
|
'Referer': url,
|
||||||
|
'x-requested-with': 'XMLHttpRequest',
|
||||||
|
})
|
||||||
|
break
|
||||||
|
except ExtractorError:
|
||||||
|
self._sleep(1, video_id)
|
||||||
|
|
||||||
|
if not video_info:
|
||||||
|
raise ExtractorError('Can\'t fetch video info')
|
||||||
|
|
||||||
|
formats = self._extract_m3u8_formats(
|
||||||
|
video_info['data']['video_url'], video_id,
|
||||||
|
entry_protocol='m3u8_native', ext='mp4')
|
||||||
|
|
||||||
|
upload_date = unified_strdate(self._html_search_regex(
|
||||||
|
r'<em>上传时间:</em><span>([^<]+)</span>', webpage,
|
||||||
|
'upload date', fatal=False))
|
||||||
|
|
||||||
|
uploader = uploader_id = uploader_url = None
|
||||||
|
mobj = re.search(
|
||||||
|
r'(?m)<a[^>]+href="/author/([0-9a-zA-Z]+)".+?<strong[^>]+title="([^"]+)"',
|
||||||
|
webpage)
|
||||||
|
if mobj:
|
||||||
|
uploader_id, uploader = mobj.groups()
|
||||||
|
uploader_url = urljoin(url, '/author/' + uploader_id)
|
||||||
|
|
||||||
|
return {
|
||||||
|
'id': video_id,
|
||||||
|
'title': room_info['name'],
|
||||||
|
'formats': formats,
|
||||||
|
'duration': room_info.get('duration'),
|
||||||
|
'thumbnail': room_info.get('pic'),
|
||||||
|
'upload_date': upload_date,
|
||||||
|
'uploader': uploader,
|
||||||
|
'uploader_id': uploader_id,
|
||||||
|
'uploader_url': uploader_url,
|
||||||
|
}
|
||||||
|
|
|
@ -251,7 +251,10 @@ from .democracynow import DemocracynowIE
|
||||||
from .dfb import DFBIE
|
from .dfb import DFBIE
|
||||||
from .dhm import DHMIE
|
from .dhm import DHMIE
|
||||||
from .dotsub import DotsubIE
|
from .dotsub import DotsubIE
|
||||||
from .douyutv import DouyuTVIE
|
from .douyutv import (
|
||||||
|
DouyuShowIE,
|
||||||
|
DouyuTVIE,
|
||||||
|
)
|
||||||
from .dplay import (
|
from .dplay import (
|
||||||
DPlayIE,
|
DPlayIE,
|
||||||
DPlayItIE,
|
DPlayItIE,
|
||||||
|
|
Loading…
Reference in a new issue