mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-02 17:53:16 +01:00
b827ee921f
* [scrippsnetworks] Add new extractor(closes #19857)(closes #22981) * [teachable] Improve locked lessons detection (#23528) * [teachable] Fail with error message if no video URL found * [extractors] add missing import for ScrippsNetworksIE * [brightcove] cache brightcove player policy keys * [prosiebensat1] improve geo restriction handling(closes #23571) * [soundcloud] automatically update client id on failing requests * [spankbang] Fix extraction (closes #23307, closes #23423, closes #23444) * [spankbang] Improve removed video detection (#23423) * [brightcove] update policy key on failing requests * [pornhub] Fix extraction and add support for m3u8 formats (closes #22749, closes #23082) * [pornhub] Improve locked videos detection (closes #22449, closes #22780) * [brightcove] invalidate policy key cache on failing requests * [soundcloud] fix client id extraction for non fatal requests * [ChangeLog] Actualize [ci skip] * [devscripts/create-github-release] Switch to using PAT for authentication Basic authentication will be deprecated soon * release 2020.01.01 * [redtube] Detect private videos (#23518) * [vice] improve extraction(closes #23631) * [devscripts/create-github-release] Remove unused import * [wistia] improve format extraction and extract subtitles(closes #22590) * [nrktv:seriebase] Fix extraction (closes #23625) (#23537) * [discovery] fix anonymous token extraction(closes #23650) * [scrippsnetworks] add support for www.discovery.com videos * [scrippsnetworks] correct test case URL * [dctp] fix format extraction(closes #23656) * [pandatv] Remove extractor (#23630) * [naver] improve extraction - improve geo-restriction handling - extract automatic captions - extract uploader metadata - extract VLive HLS formats * [naver] improve metadata extraction * [cloudflarestream] improve extraction - add support for bytehighway.net domain - add support for signed URLs - extract thumbnail * [cloudflarestream] import embed URL extraction * [lego] fix extraction and extract subtitle(closes #23687) * [safari] Fix kaltura session extraction (closes #23679) (#23670) * [orf:fm4] Fix extraction (#23599) * [orf:radio] Clean description and improve extraction * [twitter] add support for promo_video_website cards(closes #23711) * [vodplatform] add support for embed.kwikmotion.com domain * [ndr:base:embed] Improve thumbnails extraction (closes #23731) * [canvas] Add support for new API endpoint and update tests (closes #17680, closes #18629) * [travis] Add flake8 job (#23720) * [yourporn] Fix extraction (closes #21645, closes #22255, closes #23459) * [ChangeLog] Actualize [ci skip] * release 2020.01.15 * [soundcloud] Restore previews extraction (closes #23739) * [orf:tvthek] Improve geo restricted videos detection (closes #23741) * [zype] improve extraction - extract subtitles(closes #21258) - support URLs with alternative keys/tokens(#21258) - extract more metadata * [americastestkitchen] fix extraction * [nbc] add support for nbc multi network URLs(closes #23049) * [ard] improve extraction(closes #23761) - simplify extraction - extract age limit and series - bypass geo-restriction * [ivi:compilation] Fix entries extraction (closes #23770) * [24video] Add support for 24video.vip (closes #23753) * [businessinsider] Fix jwplatform id extraction (closes #22929) (#22954) * [ard] add a missing condition * [azmedien] fix extraction(closes #23783) * [voicerepublic] fix extraction * [stretchinternet] fix extraction(closes #4319) * [youtube] Fix sigfunc name extraction (closes #23819) * [ChangeLog] Actualize [ci skip] * release 2020.01.24 * [soundcloud] imporve private playlist/set tracks extraction https://github.com/ytdl-org/youtube-dl/issues/3707#issuecomment-577873539 * [svt] fix article extraction(closes #22897)(closes #22919) * [svt] fix series extraction(closes #22297) * [viewlift] improve extraction - fix extraction(closes #23851) - add add support for authentication - add support for more domains * [vimeo] fix album extraction(closes #23864) * [tva] Relax _VALID_URL (closes #23903) * [tv5mondeplus] Fix extraction (closes #23907, closes #23911) * [twitch:stream] Lowercase channel id for stream request (closes #23917) * [sportdeutschland] Update to new sportdeutschland API They switched to SSL, but under a different host AND path... Remove the old test cases because these videos have become unavailable. * [popcorntimes] Add extractor (closes #23949) * [thisoldhouse] fix extraction(closes #23951) * [toggle] Add support for mewatch.sg (closes #23895) (#23930) * [compat] Introduce compat_realpath (refs #23991) * [update] Fix updating via symlinks (closes #23991) * [nytimes] improve format sorting(closes #24010) * [abc:iview] Support 720p (#22907) (#22921) * [nova:embed] Fix extraction (closes #23672) * [nova:embed] Improve (closes #23690) * [nova] Improve extraction (refs #23690) * [jpopsuki] Remove extractor (closes #23858) * [YoutubeDL] Fix playlist entry indexing with --playlist-items (closes #10591, closes #10622) * [test_YoutubeDL] Fix get_ids * [test_YoutubeDL] Add tests for #10591 (closes #23873) * [24video] Add support for porn.24video.net (closes #23779, closes #23784) * [npr] Add support for streams (closes #24042) * [ChangeLog] Actualize [ci skip] * release 2020.02.16 * [tv2dk:bornholm:play] Fix extraction (#24076) * [imdb] Fix extraction (closes #23443) * [wistia] Add support for multiple generic embeds (closes #8347, closes #11385) * [teachable] Add support for multiple videos per lecture (closes #24101) * [pornhd] Fix extraction (closes #24128) * [options] Remove duplicate short option -v for --version (#24162) * [extractor/common] Convert ISM manifest to unicode before processing on python 2 (#24152) * [YoutubeDL] Force redirect URL to unicode on python 2 * Remove no longer needed compat_str around geturl * [youjizz] Fix extraction (closes #24181) * [test_subtitles] Remove obsolete test * [zdf:channel] Fix tests * [zapiks] Fix test * [xtube] Fix metadata extraction (closes #21073, closes #22455) * [xtube:user] Fix test * [telecinco] Fix extraction (refs #24195) * [telecinco] Add support for article opening videos * [franceculture] Fix extraction (closes #24204) * [xhamster] Fix extraction (closes #24205) * [ChangeLog] Actualize [ci skip] * release 2020.03.01 * [vimeo] Fix subtitles URLs (#24209) * [servus] Add support for new URL schema (closes #23475, closes #23583, closes #24142) * [youtube:playlist] Fix tests (closes #23872) (#23885) * [peertube] Improve extraction * [peertube] Fix issues and improve extraction (closes #23657) * [pornhub] Improve title extraction (closes #24184) * [vimeo] fix showcase password protected video extraction(closes #24224) * [youtube] Fix age-gated videos support without login (closes #24248) * [youtube] Fix tests * [ChangeLog] Actualize [ci skip] * release 2020.03.06 * [nhk] update API version(closes #24270) * [youtube] Improve extraction in 429 error conditions (closes #24283) * [youtube] Improve age-gated videos extraction in 429 error conditions (refs #24283) * [youtube] Remove outdated code Additional get_video_info requests don't seem to provide any extra itags any longer * [README.md] Clarify 429 error * [pornhub] Add support for pornhubpremium.com (#24288) * [utils] Add support for cookies with spaces used instead of tabs * [ChangeLog] Actualize [ci skip] * release 2020.03.08 * Revert "[utils] Add support for cookies with spaces used instead of tabs" According to [1] TABs must be used as separators between fields. Files produces by some tools with spaces as separators are considered malformed. 1. https://curl.haxx.se/docs/http-cookies.html This reverts commitcff99c91d1
. * [utils] Add reference to cookie file format * Revert "[vimeo] fix showcase password protected video extraction(closes #24224)" This reverts commit12ee431676
. * [nhk] Relax _VALID_URL (#24329) * [nhk] Remove obsolete rtmp formats (closes #24329) * [nhk] Update m3u8 URL and use native hls (#24329) * [ndr] Fix extraction (closes #24326) * [xtube] Fix formats extraction (closes #24348) * [xtube] Fix typo * [hellporno] Fix extraction (closes #24399) * [cbc:watch] Add support for authentication * [cbc:watch] Fix authenticated device token caching (closes #19160) * [soundcloud] fix download url extraction(closes #24394) * [limelight] remove disabled API requests(closes #24255) * [bilibili] Add support for new URL schema with BV ids (closes #24439, closes #24442) * [bilibili] Add support for player.bilibili.com (closes #24402) * [teachable] Extract chapter metadata (closes #24421) * [generic] Look for teachable embeds before wistia * [teachable] Update upskillcourses domain New version does not use teachable platform any longer * [teachable] Update gns3 domain * [teachable] Update test * [ChangeLog] Actualize [ci skip] * [ChangeLog] Actualize [ci skip] * release 2020.03.24 * [spankwire] Fix extraction (closes #18924, closes #20648) * [spankwire] Add support for generic embeds (refs #24633) * [youporn] Add support form generic embeds * [mofosex] Add support for generic embeds (closes #24633) * [tele5] Fix extraction (closes #24553) * [extractor/common] Skip malformed ISM manifest XMLs while extracting ISM formats (#24667) * [tv4] Fix ISM formats extraction (closes #24667) * [twitch:clips] Extend _VALID_URL (closes #24290) (#24642) * [motherless] Fix extraction (closes #24699) * [nova:embed] Fix extraction (closes #24700) * [youtube] Skip broken multifeed videos (closes #24711) * [soundcloud] Extract AAC format * [soundcloud] Improve AAC format extraction (closes #19173, closes #24708) * [thisoldhouse] Fix video id extraction (closes #24548) Added support for: with of without "www." and either ".chorus.build" or ".com" It now validated correctly on older URL's ``` <iframe src="https://thisoldhouse.chorus.build/videos/zype/5e33baec27d2e50001d5f52f ``` and newer ones ``` <iframe src="https://www.thisoldhouse.com/videos/zype/5e2b70e95216cc0001615120 ``` * [thisoldhouse] Improve video id extraction (closes #24549) * [youtube] Fix DRM videos detection (refs #24736) * [options] Clarify doc on --exec command (closes #19087) (#24883) * [prosiebensat1] Improve extraction and remove 7tv.de support (#24948) * [prosiebensat1] Extract series metadata * [tenplay] Relax _VALID_URL (closes #25001) * [tvplay] fix Viafree extraction(closes #15189)(closes #24473)(closes #24789) * [yahoo] fix GYAO Player extraction and relax title URL regex(closes #24178)(closes #24778) * [youtube] Use redirected video id if any (closes #25063) * [youtube] Improve player id extraction and add tests * [extractor/common] Extract multiple JSON-LD entries * [crunchyroll] Fix and improve extraction (closes #25096, closes #25060) * [ChangeLog] Actualize [ci skip] * release 2020.05.03 * [puhutv] Remove no longer available HTTP formats (closes #25124) * [utils] Improve cookie files support + Add support for UTF-8 in cookie files * Skip malformed cookie file entries instead of crashing (invalid entry len, invalid expires at) * [dailymotion] Fix typo * [compat] Introduce compat_cookiejar_Cookie * [extractor/common] Use compat_cookiejar_Cookie for _set_cookie (closes #23256, closes #24776) To always ensure cookie name and value are bytestrings on python 2. * [orf] Add support for more radio stations (closes #24938) (#24968) * [uol] fix extraction(closes #22007) * [downloader/http] Finish downloading once received data length matches expected Always do this if possible, i.e. if Content-Length or expected length is known, not only in test. This will save unnecessary last extra loop trying to read 0 bytes. * [downloader/http] Request last data block of exact remaining size Always request last data block of exact size remaining to download if possible not the current block size. * [iprima] Improve extraction (closes #25138) * [youtube] Improve signature cipher extraction (closes #25188) * [ChangeLog] Actualize [ci skip] * release 2020.05.08 * [spike] fix Bellator mgid extraction(closes #25195) * [bbccouk] PEP8 * [mailru] Fix extraction (closes #24530) (#25239) * [README.md] flake8 HTTPS URL (#25230) * [youtube] Add support for yewtu.be (#25226) * [soundcloud] reduce API playlist page limit(closes #25274) * [vimeo] improve format extraction and sorting(closes #25285) * [redtube] Improve title extraction (#25208) * [indavideo] Switch to HTTPS for API request (#25191) * [utils] Fix file permissions in write_json_file (closes #12471) (#25122) * [redtube] Improve formats extraction and extract m3u8 formats (closes #25311, closes #25321) * [ard] Improve _VALID_URL (closes #25134) (#25198) * [giantbomb] Extend _VALID_URL (#25222) * [postprocessor/ffmpeg] Embed series metadata with --add-metadata * [youtube] Add support for more invidious instances (#25417) * [ard:beta] Extend _VALID_URL (closes #25405) * [ChangeLog] Actualize [ci skip] * release 2020.05.29 * [jwplatform] Improve embeds extraction (closes #25467) * [periscope] Fix untitled broadcasts (#25482) * [twitter:broadcast] Add untitled periscope broadcast test * [malltv] Add support for sk.mall.tv (#25445) * [brightcove] Fix subtitles extraction (closes #25540) * [brightcove] Sort imports * [twitch] Pass v5 accept header and fix thumbnails extraction (closes #25531) * [twitch:stream] Fix extraction (closes #25528) * [twitch:stream] Expect 400 and 410 HTTP errors from API * [tele5] Prefer jwplatform over nexx (closes #25533) * [jwplatform] Add support for bypass geo restriction * [tele5] Bypass geo restriction * [ChangeLog] Actualize [ci skip] * release 2020.06.06 * [kaltura] Add support for multiple embeds on a webpage (closes #25523) * [youtube] Extract chapters from JSON (closes #24819) * [facebook] Support single-video ID links I stumbled upon this at https://www.facebook.com/bwfbadminton/posts/10157127020046316 . No idea how prevalent it is yet. * [youtube] Fix playlist and feed extraction (closes #25675) * [youtube] Fix thumbnails extraction and remove uploader id extraction warning (closes #25676) * [youtube] Fix upload date extraction * [youtube] Improve view count extraction * [youtube] Fix uploader id and uploader URL extraction * [ChangeLog] Actualize [ci skip] * release 2020.06.16 * [youtube] Fix categories and improve tags extraction * [youtube] Force old layout (closes #25682, closes #25683, closes #25680, closes #25686) * [ChangeLog] Actualize [ci skip] * release 2020.06.16.1 * [brightcove] Improve embed detection (closes #25674) * [bellmedia] add support for cp24.com clip URLs(closes #25764) * [youtube:playlists] Extend _VALID_URL (closes #25810) * [youtube] Prevent excess HTTP 301 (#25786) * [wistia] Restrict embed regex (closes #25969) * [youtube] Improve description extraction (closes #25937) (#25980) * [youtube] Fix sigfunc name extraction (closes #26134, closes #26135, closes #26136, closes #26137) * [ChangeLog] Actualize [ci skip] * release 2020.07.28 * [xhamster] Extend _VALID_URL (closes #25789) (#25804) * [xhamster] Fix extraction (closes #26157) (#26254) * [xhamster] Extend _VALID_URL (closes #25927) Co-authored-by: Remita Amine <remitamine@gmail.com> Co-authored-by: Sergey M․ <dstftw@gmail.com> Co-authored-by: nmeum <soeren+github@soeren-tempel.net> Co-authored-by: Roxedus <me@roxedus.dev> Co-authored-by: Singwai Chan <c.singwai@gmail.com> Co-authored-by: cdarlint <cdarlint@users.noreply.github.com> Co-authored-by: Johannes N <31795504+jonolt@users.noreply.github.com> Co-authored-by: jnozsc <jnozsc@gmail.com> Co-authored-by: Moritz Patelscheck <moritz.patelscheck@campus.tu-berlin.de> Co-authored-by: PB <3854688+uno20001@users.noreply.github.com> Co-authored-by: Philipp Hagemeister <phihag@phihag.de> Co-authored-by: Xaver Hellauer <software@hellauer.bayern> Co-authored-by: d2au <d2au.dev@gmail.com> Co-authored-by: Jan 'Yenda' Trmal <jtrmal@gmail.com> Co-authored-by: jxu <7989982+jxu@users.noreply.github.com> Co-authored-by: Martin Ström <name@my-domain.se> Co-authored-by: The Hatsune Daishi <nao20010128@gmail.com> Co-authored-by: tsia <github@tsia.de> Co-authored-by: 3risian <59593325+3risian@users.noreply.github.com> Co-authored-by: Tristan Waddington <tristan.waddington@gmail.com> Co-authored-by: Devon Meunier <devon.meunier@gmail.com> Co-authored-by: Felix Stupp <felix.stupp@outlook.com> Co-authored-by: tom <tomster954@gmail.com> Co-authored-by: AndrewMBL <62922222+AndrewMBL@users.noreply.github.com> Co-authored-by: willbeaufoy <will@willbeaufoy.net> Co-authored-by: Philipp Stehle <anderschwiedu@googlemail.com> Co-authored-by: hh0rva1h <61889859+hh0rva1h@users.noreply.github.com> Co-authored-by: comsomisha <shmelev1996@mail.ru> Co-authored-by: TotalCaesar659 <14265316+TotalCaesar659@users.noreply.github.com> Co-authored-by: Juan Francisco Cantero Hurtado <iam@juanfra.info> Co-authored-by: Dave Loyall <dave@the-good-guys.net> Co-authored-by: tlsssl <63866177+tlsssl@users.noreply.github.com> Co-authored-by: Rob <ankenyr@gmail.com> Co-authored-by: Michael Klein <github@a98shuttle.de> Co-authored-by: JordanWeatherby <47519158+JordanWeatherby@users.noreply.github.com> Co-authored-by: striker.sh <19488257+strikersh@users.noreply.github.com> Co-authored-by: Matej Dujava <mdujava@gmail.com> Co-authored-by: Glenn Slayden <5589855+glenn-slayden@users.noreply.github.com> Co-authored-by: MRWITEK <mrvvitek@gmail.com> Co-authored-by: JChris246 <43832407+JChris246@users.noreply.github.com> Co-authored-by: TheRealDude2 <the.real.dude@gmx.de>
451 lines
16 KiB
Python
451 lines
16 KiB
Python
# coding: utf-8
|
||
from __future__ import unicode_literals
|
||
|
||
import hashlib
|
||
import re
|
||
|
||
from .common import InfoExtractor
|
||
from ..compat import (
|
||
compat_parse_qs,
|
||
compat_urlparse,
|
||
)
|
||
from ..utils import (
|
||
ExtractorError,
|
||
int_or_none,
|
||
float_or_none,
|
||
parse_iso8601,
|
||
smuggle_url,
|
||
str_or_none,
|
||
strip_jsonp,
|
||
unified_timestamp,
|
||
unsmuggle_url,
|
||
urlencode_postdata,
|
||
)
|
||
|
||
|
||
class BiliBiliIE(InfoExtractor):
|
||
_VALID_URL = r'''(?x)
|
||
https?://
|
||
(?:(?:www|bangumi)\.)?
|
||
bilibili\.(?:tv|com)/
|
||
(?:
|
||
(?:
|
||
video/[aA][vV]|
|
||
anime/(?P<anime_id>\d+)/play\#
|
||
)(?P<id_bv>\d+)|
|
||
video/[bB][vV](?P<id>[^/?#&]+)
|
||
)
|
||
'''
|
||
|
||
_TESTS = [{
|
||
'url': 'http://www.bilibili.tv/video/av1074402/',
|
||
'md5': '5f7d29e1a2872f3df0cf76b1f87d3788',
|
||
'info_dict': {
|
||
'id': '1074402',
|
||
'ext': 'flv',
|
||
'title': '【金坷垃】金泡沫',
|
||
'description': 'md5:ce18c2a2d2193f0df2917d270f2e5923',
|
||
'duration': 308.067,
|
||
'timestamp': 1398012678,
|
||
'upload_date': '20140420',
|
||
'thumbnail': r're:^https?://.+\.jpg',
|
||
'uploader': '菊子桑',
|
||
'uploader_id': '156160',
|
||
},
|
||
}, {
|
||
# Tested in BiliBiliBangumiIE
|
||
'url': 'http://bangumi.bilibili.com/anime/1869/play#40062',
|
||
'only_matching': True,
|
||
}, {
|
||
'url': 'http://bangumi.bilibili.com/anime/5802/play#100643',
|
||
'md5': '3f721ad1e75030cc06faf73587cfec57',
|
||
'info_dict': {
|
||
'id': '100643',
|
||
'ext': 'mp4',
|
||
'title': 'CHAOS;CHILD',
|
||
'description': '如果你是神明,并且能够让妄想成为现实。那你会进行怎么样的妄想?是淫靡的世界?独裁社会?毁灭性的制裁?还是……2015年,涩谷。从6年前发生的大灾害“涩谷地震”之后复兴了的这个街区里新设立的私立高中...',
|
||
},
|
||
'skip': 'Geo-restricted to China',
|
||
}, {
|
||
# Title with double quotes
|
||
'url': 'http://www.bilibili.com/video/av8903802/',
|
||
'info_dict': {
|
||
'id': '8903802',
|
||
'title': '阿滴英文|英文歌分享#6 "Closer',
|
||
'description': '滴妹今天唱Closer給你聽! 有史以来,被推最多次也是最久的歌曲,其实歌词跟我原本想像差蛮多的,不过还是好听! 微博@阿滴英文',
|
||
},
|
||
'playlist': [{
|
||
'info_dict': {
|
||
'id': '8903802_part1',
|
||
'ext': 'flv',
|
||
'title': '阿滴英文|英文歌分享#6 "Closer',
|
||
'description': 'md5:3b1b9e25b78da4ef87e9b548b88ee76a',
|
||
'uploader': '阿滴英文',
|
||
'uploader_id': '65880958',
|
||
'timestamp': 1488382634,
|
||
'upload_date': '20170301',
|
||
},
|
||
'params': {
|
||
'skip_download': True, # Test metadata only
|
||
},
|
||
}, {
|
||
'info_dict': {
|
||
'id': '8903802_part2',
|
||
'ext': 'flv',
|
||
'title': '阿滴英文|英文歌分享#6 "Closer',
|
||
'description': 'md5:3b1b9e25b78da4ef87e9b548b88ee76a',
|
||
'uploader': '阿滴英文',
|
||
'uploader_id': '65880958',
|
||
'timestamp': 1488382634,
|
||
'upload_date': '20170301',
|
||
},
|
||
'params': {
|
||
'skip_download': True, # Test metadata only
|
||
},
|
||
}]
|
||
}, {
|
||
# new BV video id format
|
||
'url': 'https://www.bilibili.com/video/BV1JE411F741',
|
||
'only_matching': True,
|
||
}]
|
||
|
||
_APP_KEY = 'iVGUTjsxvpLeuDCf'
|
||
_BILIBILI_KEY = 'aHRmhWMLkdeMuILqORnYZocwMBpMEOdt'
|
||
|
||
def _report_error(self, result):
|
||
if 'message' in result:
|
||
raise ExtractorError('%s said: %s' % (self.IE_NAME, result['message']), expected=True)
|
||
elif 'code' in result:
|
||
raise ExtractorError('%s returns error %d' % (self.IE_NAME, result['code']), expected=True)
|
||
else:
|
||
raise ExtractorError('Can\'t extract Bangumi episode ID')
|
||
|
||
def _real_extract(self, url):
|
||
url, smuggled_data = unsmuggle_url(url, {})
|
||
|
||
mobj = re.match(self._VALID_URL, url)
|
||
video_id = mobj.group('id') or mobj.group('id_bv')
|
||
anime_id = mobj.group('anime_id')
|
||
webpage = self._download_webpage(url, video_id)
|
||
|
||
if 'anime/' not in url:
|
||
cid = self._search_regex(
|
||
r'\bcid(?:["\']:|=)(\d+)', webpage, 'cid',
|
||
default=None
|
||
) or compat_parse_qs(self._search_regex(
|
||
[r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)',
|
||
r'EmbedPlayer\([^)]+,\s*\\"([^"]+)\\"\)',
|
||
r'<iframe[^>]+src="https://secure\.bilibili\.com/secure,([^"]+)"'],
|
||
webpage, 'player parameters'))['cid'][0]
|
||
else:
|
||
if 'no_bangumi_tip' not in smuggled_data:
|
||
self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dl with %s' % (
|
||
video_id, anime_id, compat_urlparse.urljoin(url, '//bangumi.bilibili.com/anime/%s' % anime_id)))
|
||
headers = {
|
||
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
|
||
'Referer': url
|
||
}
|
||
headers.update(self.geo_verification_headers())
|
||
|
||
js = self._download_json(
|
||
'http://bangumi.bilibili.com/web_api/get_source', video_id,
|
||
data=urlencode_postdata({'episode_id': video_id}),
|
||
headers=headers)
|
||
if 'result' not in js:
|
||
self._report_error(js)
|
||
cid = js['result']['cid']
|
||
|
||
headers = {
|
||
'Referer': url
|
||
}
|
||
headers.update(self.geo_verification_headers())
|
||
|
||
entries = []
|
||
|
||
RENDITIONS = ('qn=80&quality=80&type=', 'quality=2&type=mp4')
|
||
for num, rendition in enumerate(RENDITIONS, start=1):
|
||
payload = 'appkey=%s&cid=%s&otype=json&%s' % (self._APP_KEY, cid, rendition)
|
||
sign = hashlib.md5((payload + self._BILIBILI_KEY).encode('utf-8')).hexdigest()
|
||
|
||
video_info = self._download_json(
|
||
'http://interface.bilibili.com/v2/playurl?%s&sign=%s' % (payload, sign),
|
||
video_id, note='Downloading video info page',
|
||
headers=headers, fatal=num == len(RENDITIONS))
|
||
|
||
if not video_info:
|
||
continue
|
||
|
||
if 'durl' not in video_info:
|
||
if num < len(RENDITIONS):
|
||
continue
|
||
self._report_error(video_info)
|
||
|
||
for idx, durl in enumerate(video_info['durl']):
|
||
formats = [{
|
||
'url': durl['url'],
|
||
'filesize': int_or_none(durl['size']),
|
||
}]
|
||
for backup_url in durl.get('backup_url', []):
|
||
formats.append({
|
||
'url': backup_url,
|
||
# backup URLs have lower priorities
|
||
'preference': -2 if 'hd.mp4' in backup_url else -3,
|
||
})
|
||
|
||
for a_format in formats:
|
||
a_format.setdefault('http_headers', {}).update({
|
||
'Referer': url,
|
||
})
|
||
|
||
self._sort_formats(formats)
|
||
|
||
entries.append({
|
||
'id': '%s_part%s' % (video_id, idx),
|
||
'duration': float_or_none(durl.get('length'), 1000),
|
||
'formats': formats,
|
||
})
|
||
break
|
||
|
||
title = self._html_search_regex(
|
||
('<h1[^>]+\btitle=(["\'])(?P<title>(?:(?!\1).)+)\1',
|
||
'(?s)<h1[^>]*>(?P<title>.+?)</h1>'), webpage, 'title',
|
||
group='title')
|
||
description = self._html_search_meta('description', webpage)
|
||
timestamp = unified_timestamp(self._html_search_regex(
|
||
r'<time[^>]+datetime="([^"]+)"', webpage, 'upload time',
|
||
default=None) or self._html_search_meta(
|
||
'uploadDate', webpage, 'timestamp', default=None))
|
||
thumbnail = self._html_search_meta(['og:image', 'thumbnailUrl'], webpage)
|
||
|
||
# TODO 'view_count' requires deobfuscating Javascript
|
||
info = {
|
||
'id': video_id,
|
||
'title': title,
|
||
'description': description,
|
||
'timestamp': timestamp,
|
||
'thumbnail': thumbnail,
|
||
'duration': float_or_none(video_info.get('timelength'), scale=1000),
|
||
}
|
||
|
||
uploader_mobj = re.search(
|
||
r'<a[^>]+href="(?:https?:)?//space\.bilibili\.com/(?P<id>\d+)"[^>]*>(?P<name>[^<]+)',
|
||
webpage)
|
||
if uploader_mobj:
|
||
info.update({
|
||
'uploader': uploader_mobj.group('name'),
|
||
'uploader_id': uploader_mobj.group('id'),
|
||
})
|
||
if not info.get('uploader'):
|
||
info['uploader'] = self._html_search_meta(
|
||
'author', webpage, 'uploader', default=None)
|
||
|
||
for entry in entries:
|
||
entry.update(info)
|
||
|
||
if len(entries) == 1:
|
||
return entries[0]
|
||
else:
|
||
for idx, entry in enumerate(entries):
|
||
entry['id'] = '%s_part%d' % (video_id, (idx + 1))
|
||
|
||
return {
|
||
'_type': 'multi_video',
|
||
'id': video_id,
|
||
'title': title,
|
||
'description': description,
|
||
'entries': entries,
|
||
}
|
||
|
||
|
||
class BiliBiliBangumiIE(InfoExtractor):
|
||
_VALID_URL = r'https?://bangumi\.bilibili\.com/anime/(?P<id>\d+)'
|
||
|
||
IE_NAME = 'bangumi.bilibili.com'
|
||
IE_DESC = 'BiliBili番剧'
|
||
|
||
_TESTS = [{
|
||
'url': 'http://bangumi.bilibili.com/anime/1869',
|
||
'info_dict': {
|
||
'id': '1869',
|
||
'title': '混沌武士',
|
||
'description': 'md5:6a9622b911565794c11f25f81d6a97d2',
|
||
},
|
||
'playlist_count': 26,
|
||
}, {
|
||
'url': 'http://bangumi.bilibili.com/anime/1869',
|
||
'info_dict': {
|
||
'id': '1869',
|
||
'title': '混沌武士',
|
||
'description': 'md5:6a9622b911565794c11f25f81d6a97d2',
|
||
},
|
||
'playlist': [{
|
||
'md5': '91da8621454dd58316851c27c68b0c13',
|
||
'info_dict': {
|
||
'id': '40062',
|
||
'ext': 'mp4',
|
||
'title': '混沌武士',
|
||
'description': '故事发生在日本的江户时代。风是一个小酒馆的打工女。一日,酒馆里来了一群恶霸,虽然他们的举动令风十分不满,但是毕竟风只是一届女流,无法对他们采取什么行动,只能在心里嘟哝。这时,酒家里又进来了个“不良份子...',
|
||
'timestamp': 1414538739,
|
||
'upload_date': '20141028',
|
||
'episode': '疾风怒涛 Tempestuous Temperaments',
|
||
'episode_number': 1,
|
||
},
|
||
}],
|
||
'params': {
|
||
'playlist_items': '1',
|
||
},
|
||
}]
|
||
|
||
@classmethod
|
||
def suitable(cls, url):
|
||
return False if BiliBiliIE.suitable(url) else super(BiliBiliBangumiIE, cls).suitable(url)
|
||
|
||
def _real_extract(self, url):
|
||
bangumi_id = self._match_id(url)
|
||
|
||
# Sometimes this API returns a JSONP response
|
||
season_info = self._download_json(
|
||
'http://bangumi.bilibili.com/jsonp/seasoninfo/%s.ver' % bangumi_id,
|
||
bangumi_id, transform_source=strip_jsonp)['result']
|
||
|
||
entries = [{
|
||
'_type': 'url_transparent',
|
||
'url': smuggle_url(episode['webplay_url'], {'no_bangumi_tip': 1}),
|
||
'ie_key': BiliBiliIE.ie_key(),
|
||
'timestamp': parse_iso8601(episode.get('update_time'), delimiter=' '),
|
||
'episode': episode.get('index_title'),
|
||
'episode_number': int_or_none(episode.get('index')),
|
||
} for episode in season_info['episodes']]
|
||
|
||
entries = sorted(entries, key=lambda entry: entry.get('episode_number'))
|
||
|
||
return self.playlist_result(
|
||
entries, bangumi_id,
|
||
season_info.get('bangumi_title'), season_info.get('evaluate'))
|
||
|
||
|
||
class BilibiliAudioBaseIE(InfoExtractor):
|
||
def _call_api(self, path, sid, query=None):
|
||
if not query:
|
||
query = {'sid': sid}
|
||
return self._download_json(
|
||
'https://www.bilibili.com/audio/music-service-c/web/' + path,
|
||
sid, query=query)['data']
|
||
|
||
|
||
class BilibiliAudioIE(BilibiliAudioBaseIE):
|
||
_VALID_URL = r'https?://(?:www\.)?bilibili\.com/audio/au(?P<id>\d+)'
|
||
_TEST = {
|
||
'url': 'https://www.bilibili.com/audio/au1003142',
|
||
'md5': 'fec4987014ec94ef9e666d4d158ad03b',
|
||
'info_dict': {
|
||
'id': '1003142',
|
||
'ext': 'm4a',
|
||
'title': '【tsukimi】YELLOW / 神山羊',
|
||
'artist': 'tsukimi',
|
||
'comment_count': int,
|
||
'description': 'YELLOW的mp3版!',
|
||
'duration': 183,
|
||
'subtitles': {
|
||
'origin': [{
|
||
'ext': 'lrc',
|
||
}],
|
||
},
|
||
'thumbnail': r're:^https?://.+\.jpg',
|
||
'timestamp': 1564836614,
|
||
'upload_date': '20190803',
|
||
'uploader': 'tsukimi-つきみぐー',
|
||
'view_count': int,
|
||
},
|
||
}
|
||
|
||
def _real_extract(self, url):
|
||
au_id = self._match_id(url)
|
||
|
||
play_data = self._call_api('url', au_id)
|
||
formats = [{
|
||
'url': play_data['cdns'][0],
|
||
'filesize': int_or_none(play_data.get('size')),
|
||
}]
|
||
|
||
song = self._call_api('song/info', au_id)
|
||
title = song['title']
|
||
statistic = song.get('statistic') or {}
|
||
|
||
subtitles = None
|
||
lyric = song.get('lyric')
|
||
if lyric:
|
||
subtitles = {
|
||
'origin': [{
|
||
'url': lyric,
|
||
}]
|
||
}
|
||
|
||
return {
|
||
'id': au_id,
|
||
'title': title,
|
||
'formats': formats,
|
||
'artist': song.get('author'),
|
||
'comment_count': int_or_none(statistic.get('comment')),
|
||
'description': song.get('intro'),
|
||
'duration': int_or_none(song.get('duration')),
|
||
'subtitles': subtitles,
|
||
'thumbnail': song.get('cover'),
|
||
'timestamp': int_or_none(song.get('passtime')),
|
||
'uploader': song.get('uname'),
|
||
'view_count': int_or_none(statistic.get('play')),
|
||
}
|
||
|
||
|
||
class BilibiliAudioAlbumIE(BilibiliAudioBaseIE):
|
||
_VALID_URL = r'https?://(?:www\.)?bilibili\.com/audio/am(?P<id>\d+)'
|
||
_TEST = {
|
||
'url': 'https://www.bilibili.com/audio/am10624',
|
||
'info_dict': {
|
||
'id': '10624',
|
||
'title': '每日新曲推荐(每日11:00更新)',
|
||
'description': '每天11:00更新,为你推送最新音乐',
|
||
},
|
||
'playlist_count': 19,
|
||
}
|
||
|
||
def _real_extract(self, url):
|
||
am_id = self._match_id(url)
|
||
|
||
songs = self._call_api(
|
||
'song/of-menu', am_id, {'sid': am_id, 'pn': 1, 'ps': 100})['data']
|
||
|
||
entries = []
|
||
for song in songs:
|
||
sid = str_or_none(song.get('id'))
|
||
if not sid:
|
||
continue
|
||
entries.append(self.url_result(
|
||
'https://www.bilibili.com/audio/au' + sid,
|
||
BilibiliAudioIE.ie_key(), sid))
|
||
|
||
if entries:
|
||
album_data = self._call_api('menu/info', am_id) or {}
|
||
album_title = album_data.get('title')
|
||
if album_title:
|
||
for entry in entries:
|
||
entry['album'] = album_title
|
||
return self.playlist_result(
|
||
entries, am_id, album_title, album_data.get('intro'))
|
||
|
||
return self.playlist_result(entries, am_id)
|
||
|
||
|
||
class BiliBiliPlayerIE(InfoExtractor):
|
||
_VALID_URL = r'https?://player\.bilibili\.com/player\.html\?.*?\baid=(?P<id>\d+)'
|
||
_TEST = {
|
||
'url': 'http://player.bilibili.com/player.html?aid=92494333&cid=157926707&page=1',
|
||
'only_matching': True,
|
||
}
|
||
|
||
def _real_extract(self, url):
|
||
video_id = self._match_id(url)
|
||
return self.url_result(
|
||
'http://www.bilibili.tv/video/av%s/' % video_id,
|
||
ie=BiliBiliIE.ie_key(), video_id=video_id)
|