mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-14 20:38:11 -05: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>
796 lines
27 KiB
Python
796 lines
27 KiB
Python
# coding: utf-8
|
|
from __future__ import unicode_literals
|
|
|
|
import itertools
|
|
import re
|
|
import random
|
|
import json
|
|
|
|
from .common import InfoExtractor
|
|
from ..compat import (
|
|
compat_kwargs,
|
|
compat_parse_qs,
|
|
compat_str,
|
|
compat_urllib_parse_urlencode,
|
|
compat_urllib_parse_urlparse,
|
|
)
|
|
from ..utils import (
|
|
clean_html,
|
|
ExtractorError,
|
|
int_or_none,
|
|
orderedSet,
|
|
parse_duration,
|
|
parse_iso8601,
|
|
qualities,
|
|
str_or_none,
|
|
try_get,
|
|
unified_timestamp,
|
|
update_url_query,
|
|
url_or_none,
|
|
urljoin,
|
|
)
|
|
|
|
|
|
class TwitchBaseIE(InfoExtractor):
|
|
_VALID_URL_BASE = r'https?://(?:(?:www|go|m)\.)?twitch\.tv'
|
|
|
|
_API_BASE = 'https://api.twitch.tv'
|
|
_USHER_BASE = 'https://usher.ttvnw.net'
|
|
_LOGIN_FORM_URL = 'https://www.twitch.tv/login'
|
|
_LOGIN_POST_URL = 'https://passport.twitch.tv/login'
|
|
_CLIENT_ID = 'kimne78kx3ncx6brgo4mv6wki5h1ko'
|
|
_NETRC_MACHINE = 'twitch'
|
|
|
|
def _handle_error(self, response):
|
|
if not isinstance(response, dict):
|
|
return
|
|
error = response.get('error')
|
|
if error:
|
|
raise ExtractorError(
|
|
'%s returned error: %s - %s' % (self.IE_NAME, error, response.get('message')),
|
|
expected=True)
|
|
|
|
def _call_api(self, path, item_id, *args, **kwargs):
|
|
headers = kwargs.get('headers', {}).copy()
|
|
headers.update({
|
|
'Accept': 'application/vnd.twitchtv.v5+json; charset=UTF-8',
|
|
'Client-ID': self._CLIENT_ID,
|
|
})
|
|
kwargs.update({
|
|
'headers': headers,
|
|
'expected_status': (400, 410),
|
|
})
|
|
response = self._download_json(
|
|
'%s/%s' % (self._API_BASE, path), item_id,
|
|
*args, **compat_kwargs(kwargs))
|
|
self._handle_error(response)
|
|
return response
|
|
|
|
def _real_initialize(self):
|
|
self._login()
|
|
|
|
def _login(self):
|
|
username, password = self._get_login_info()
|
|
if username is None:
|
|
return
|
|
|
|
def fail(message):
|
|
raise ExtractorError(
|
|
'Unable to login. Twitch said: %s' % message, expected=True)
|
|
|
|
def login_step(page, urlh, note, data):
|
|
form = self._hidden_inputs(page)
|
|
form.update(data)
|
|
|
|
page_url = urlh.geturl()
|
|
post_url = self._search_regex(
|
|
r'<form[^>]+action=(["\'])(?P<url>.+?)\1', page,
|
|
'post url', default=self._LOGIN_POST_URL, group='url')
|
|
post_url = urljoin(page_url, post_url)
|
|
|
|
headers = {
|
|
'Referer': page_url,
|
|
'Origin': page_url,
|
|
'Content-Type': 'text/plain;charset=UTF-8',
|
|
}
|
|
|
|
response = self._download_json(
|
|
post_url, None, note, data=json.dumps(form).encode(),
|
|
headers=headers, expected_status=400)
|
|
error = response.get('error_description') or response.get('error_code')
|
|
if error:
|
|
fail(error)
|
|
|
|
if 'Authenticated successfully' in response.get('message', ''):
|
|
return None, None
|
|
|
|
redirect_url = urljoin(
|
|
post_url,
|
|
response.get('redirect') or response['redirect_path'])
|
|
return self._download_webpage_handle(
|
|
redirect_url, None, 'Downloading login redirect page',
|
|
headers=headers)
|
|
|
|
login_page, handle = self._download_webpage_handle(
|
|
self._LOGIN_FORM_URL, None, 'Downloading login page')
|
|
|
|
# Some TOR nodes and public proxies are blocked completely
|
|
if 'blacklist_message' in login_page:
|
|
fail(clean_html(login_page))
|
|
|
|
redirect_page, handle = login_step(
|
|
login_page, handle, 'Logging in', {
|
|
'username': username,
|
|
'password': password,
|
|
'client_id': self._CLIENT_ID,
|
|
})
|
|
|
|
# Successful login
|
|
if not redirect_page:
|
|
return
|
|
|
|
if re.search(r'(?i)<form[^>]+id="two-factor-submit"', redirect_page) is not None:
|
|
# TODO: Add mechanism to request an SMS or phone call
|
|
tfa_token = self._get_tfa_info('two-factor authentication token')
|
|
login_step(redirect_page, handle, 'Submitting TFA token', {
|
|
'authy_token': tfa_token,
|
|
'remember_2fa': 'true',
|
|
})
|
|
|
|
def _prefer_source(self, formats):
|
|
try:
|
|
source = next(f for f in formats if f['format_id'] == 'Source')
|
|
source['quality'] = 10
|
|
except StopIteration:
|
|
for f in formats:
|
|
if '/chunked/' in f['url']:
|
|
f.update({
|
|
'quality': 10,
|
|
'format_note': 'Source',
|
|
})
|
|
self._sort_formats(formats)
|
|
|
|
|
|
class TwitchItemBaseIE(TwitchBaseIE):
|
|
def _download_info(self, item, item_id):
|
|
return self._extract_info(self._call_api(
|
|
'kraken/videos/%s%s' % (item, item_id), item_id,
|
|
'Downloading %s info JSON' % self._ITEM_TYPE))
|
|
|
|
def _extract_media(self, item_id):
|
|
info = self._download_info(self._ITEM_SHORTCUT, item_id)
|
|
response = self._call_api(
|
|
'api/videos/%s%s' % (self._ITEM_SHORTCUT, item_id), item_id,
|
|
'Downloading %s playlist JSON' % self._ITEM_TYPE)
|
|
entries = []
|
|
chunks = response['chunks']
|
|
qualities = list(chunks.keys())
|
|
for num, fragment in enumerate(zip(*chunks.values()), start=1):
|
|
formats = []
|
|
for fmt_num, fragment_fmt in enumerate(fragment):
|
|
format_id = qualities[fmt_num]
|
|
fmt = {
|
|
'url': fragment_fmt['url'],
|
|
'format_id': format_id,
|
|
'quality': 1 if format_id == 'live' else 0,
|
|
}
|
|
m = re.search(r'^(?P<height>\d+)[Pp]', format_id)
|
|
if m:
|
|
fmt['height'] = int(m.group('height'))
|
|
formats.append(fmt)
|
|
self._sort_formats(formats)
|
|
entry = dict(info)
|
|
entry['id'] = '%s_%d' % (entry['id'], num)
|
|
entry['title'] = '%s part %d' % (entry['title'], num)
|
|
entry['formats'] = formats
|
|
entries.append(entry)
|
|
return self.playlist_result(entries, info['id'], info['title'])
|
|
|
|
def _extract_info(self, info):
|
|
status = info.get('status')
|
|
if status == 'recording':
|
|
is_live = True
|
|
elif status == 'recorded':
|
|
is_live = False
|
|
else:
|
|
is_live = None
|
|
_QUALITIES = ('small', 'medium', 'large')
|
|
quality_key = qualities(_QUALITIES)
|
|
thumbnails = []
|
|
preview = info.get('preview')
|
|
if isinstance(preview, dict):
|
|
for thumbnail_id, thumbnail_url in preview.items():
|
|
thumbnail_url = url_or_none(thumbnail_url)
|
|
if not thumbnail_url:
|
|
continue
|
|
if thumbnail_id not in _QUALITIES:
|
|
continue
|
|
thumbnails.append({
|
|
'url': thumbnail_url,
|
|
'preference': quality_key(thumbnail_id),
|
|
})
|
|
return {
|
|
'id': info['_id'],
|
|
'title': info.get('title') or 'Untitled Broadcast',
|
|
'description': info.get('description'),
|
|
'duration': int_or_none(info.get('length')),
|
|
'thumbnails': thumbnails,
|
|
'uploader': info.get('channel', {}).get('display_name'),
|
|
'uploader_id': info.get('channel', {}).get('name'),
|
|
'timestamp': parse_iso8601(info.get('recorded_at')),
|
|
'view_count': int_or_none(info.get('views')),
|
|
'is_live': is_live,
|
|
}
|
|
|
|
def _real_extract(self, url):
|
|
return self._extract_media(self._match_id(url))
|
|
|
|
|
|
class TwitchVideoIE(TwitchItemBaseIE):
|
|
IE_NAME = 'twitch:video'
|
|
_VALID_URL = r'%s/[^/]+/b/(?P<id>\d+)' % TwitchBaseIE._VALID_URL_BASE
|
|
_ITEM_TYPE = 'video'
|
|
_ITEM_SHORTCUT = 'a'
|
|
|
|
_TEST = {
|
|
'url': 'http://www.twitch.tv/riotgames/b/577357806',
|
|
'info_dict': {
|
|
'id': 'a577357806',
|
|
'title': 'Worlds Semifinals - Star Horn Royal Club vs. OMG',
|
|
},
|
|
'playlist_mincount': 12,
|
|
'skip': 'HTTP Error 404: Not Found',
|
|
}
|
|
|
|
|
|
class TwitchChapterIE(TwitchItemBaseIE):
|
|
IE_NAME = 'twitch:chapter'
|
|
_VALID_URL = r'%s/[^/]+/c/(?P<id>\d+)' % TwitchBaseIE._VALID_URL_BASE
|
|
_ITEM_TYPE = 'chapter'
|
|
_ITEM_SHORTCUT = 'c'
|
|
|
|
_TESTS = [{
|
|
'url': 'http://www.twitch.tv/acracingleague/c/5285812',
|
|
'info_dict': {
|
|
'id': 'c5285812',
|
|
'title': 'ACRL Off Season - Sports Cars @ Nordschleife',
|
|
},
|
|
'playlist_mincount': 3,
|
|
'skip': 'HTTP Error 404: Not Found',
|
|
}, {
|
|
'url': 'http://www.twitch.tv/tsm_theoddone/c/2349361',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
|
|
class TwitchVodIE(TwitchItemBaseIE):
|
|
IE_NAME = 'twitch:vod'
|
|
_VALID_URL = r'''(?x)
|
|
https?://
|
|
(?:
|
|
(?:(?:www|go|m)\.)?twitch\.tv/(?:[^/]+/v(?:ideo)?|videos)/|
|
|
player\.twitch\.tv/\?.*?\bvideo=v?
|
|
)
|
|
(?P<id>\d+)
|
|
'''
|
|
_ITEM_TYPE = 'vod'
|
|
_ITEM_SHORTCUT = 'v'
|
|
|
|
_TESTS = [{
|
|
'url': 'http://www.twitch.tv/riotgames/v/6528877?t=5m10s',
|
|
'info_dict': {
|
|
'id': 'v6528877',
|
|
'ext': 'mp4',
|
|
'title': 'LCK Summer Split - Week 6 Day 1',
|
|
'thumbnail': r're:^https?://.*\.jpg$',
|
|
'duration': 17208,
|
|
'timestamp': 1435131709,
|
|
'upload_date': '20150624',
|
|
'uploader': 'Riot Games',
|
|
'uploader_id': 'riotgames',
|
|
'view_count': int,
|
|
'start_time': 310,
|
|
},
|
|
'params': {
|
|
# m3u8 download
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
# Untitled broadcast (title is None)
|
|
'url': 'http://www.twitch.tv/belkao_o/v/11230755',
|
|
'info_dict': {
|
|
'id': 'v11230755',
|
|
'ext': 'mp4',
|
|
'title': 'Untitled Broadcast',
|
|
'thumbnail': r're:^https?://.*\.jpg$',
|
|
'duration': 1638,
|
|
'timestamp': 1439746708,
|
|
'upload_date': '20150816',
|
|
'uploader': 'BelkAO_o',
|
|
'uploader_id': 'belkao_o',
|
|
'view_count': int,
|
|
},
|
|
'params': {
|
|
# m3u8 download
|
|
'skip_download': True,
|
|
},
|
|
'skip': 'HTTP Error 404: Not Found',
|
|
}, {
|
|
'url': 'http://player.twitch.tv/?t=5m10s&video=v6528877',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://www.twitch.tv/videos/6528877',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://m.twitch.tv/beagsandjam/v/247478721',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://www.twitch.tv/northernlion/video/291940395',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://player.twitch.tv/?video=480452374',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
def _real_extract(self, url):
|
|
item_id = self._match_id(url)
|
|
|
|
info = self._download_info(self._ITEM_SHORTCUT, item_id)
|
|
access_token = self._call_api(
|
|
'api/vods/%s/access_token' % item_id, item_id,
|
|
'Downloading %s access token' % self._ITEM_TYPE)
|
|
|
|
formats = self._extract_m3u8_formats(
|
|
'%s/vod/%s.m3u8?%s' % (
|
|
self._USHER_BASE, item_id,
|
|
compat_urllib_parse_urlencode({
|
|
'allow_source': 'true',
|
|
'allow_audio_only': 'true',
|
|
'allow_spectre': 'true',
|
|
'player': 'twitchweb',
|
|
'playlist_include_framerate': 'true',
|
|
'nauth': access_token['token'],
|
|
'nauthsig': access_token['sig'],
|
|
})),
|
|
item_id, 'mp4', entry_protocol='m3u8_native')
|
|
|
|
self._prefer_source(formats)
|
|
info['formats'] = formats
|
|
|
|
parsed_url = compat_urllib_parse_urlparse(url)
|
|
query = compat_parse_qs(parsed_url.query)
|
|
if 't' in query:
|
|
info['start_time'] = parse_duration(query['t'][0])
|
|
|
|
if info.get('timestamp') is not None:
|
|
info['subtitles'] = {
|
|
'rechat': [{
|
|
'url': update_url_query(
|
|
'https://api.twitch.tv/v5/videos/%s/comments' % item_id, {
|
|
'client_id': self._CLIENT_ID,
|
|
}),
|
|
'ext': 'json',
|
|
}],
|
|
}
|
|
|
|
return info
|
|
|
|
|
|
class TwitchPlaylistBaseIE(TwitchBaseIE):
|
|
_PLAYLIST_PATH = 'kraken/channels/%s/videos/?offset=%d&limit=%d'
|
|
_PAGE_LIMIT = 100
|
|
|
|
def _extract_playlist(self, channel_id):
|
|
info = self._call_api(
|
|
'kraken/channels/%s' % channel_id,
|
|
channel_id, 'Downloading channel info JSON')
|
|
channel_name = info.get('display_name') or info.get('name')
|
|
entries = []
|
|
offset = 0
|
|
limit = self._PAGE_LIMIT
|
|
broken_paging_detected = False
|
|
counter_override = None
|
|
for counter in itertools.count(1):
|
|
response = self._call_api(
|
|
self._PLAYLIST_PATH % (channel_id, offset, limit),
|
|
channel_id,
|
|
'Downloading %s JSON page %s'
|
|
% (self._PLAYLIST_TYPE, counter_override or counter))
|
|
page_entries = self._extract_playlist_page(response)
|
|
if not page_entries:
|
|
break
|
|
total = int_or_none(response.get('_total'))
|
|
# Since the beginning of March 2016 twitch's paging mechanism
|
|
# is completely broken on the twitch side. It simply ignores
|
|
# a limit and returns the whole offset number of videos.
|
|
# Working around by just requesting all videos at once.
|
|
# Upd: pagination bug was fixed by twitch on 15.03.2016.
|
|
if not broken_paging_detected and total and len(page_entries) > limit:
|
|
self.report_warning(
|
|
'Twitch pagination is broken on twitch side, requesting all videos at once',
|
|
channel_id)
|
|
broken_paging_detected = True
|
|
offset = total
|
|
counter_override = '(all at once)'
|
|
continue
|
|
entries.extend(page_entries)
|
|
if broken_paging_detected or total and len(page_entries) >= total:
|
|
break
|
|
offset += limit
|
|
return self.playlist_result(
|
|
[self._make_url_result(entry) for entry in orderedSet(entries)],
|
|
channel_id, channel_name)
|
|
|
|
def _make_url_result(self, url):
|
|
try:
|
|
video_id = 'v%s' % TwitchVodIE._match_id(url)
|
|
return self.url_result(url, TwitchVodIE.ie_key(), video_id=video_id)
|
|
except AssertionError:
|
|
return self.url_result(url)
|
|
|
|
def _extract_playlist_page(self, response):
|
|
videos = response.get('videos')
|
|
return [video['url'] for video in videos] if videos else []
|
|
|
|
def _real_extract(self, url):
|
|
return self._extract_playlist(self._match_id(url))
|
|
|
|
|
|
class TwitchProfileIE(TwitchPlaylistBaseIE):
|
|
IE_NAME = 'twitch:profile'
|
|
_VALID_URL = r'%s/(?P<id>[^/]+)/profile/?(?:\#.*)?$' % TwitchBaseIE._VALID_URL_BASE
|
|
_PLAYLIST_TYPE = 'profile'
|
|
|
|
_TESTS = [{
|
|
'url': 'http://www.twitch.tv/vanillatv/profile',
|
|
'info_dict': {
|
|
'id': 'vanillatv',
|
|
'title': 'VanillaTV',
|
|
},
|
|
'playlist_mincount': 412,
|
|
}, {
|
|
'url': 'http://m.twitch.tv/vanillatv/profile',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
|
|
class TwitchVideosBaseIE(TwitchPlaylistBaseIE):
|
|
_VALID_URL_VIDEOS_BASE = r'%s/(?P<id>[^/]+)/videos' % TwitchBaseIE._VALID_URL_BASE
|
|
_PLAYLIST_PATH = TwitchPlaylistBaseIE._PLAYLIST_PATH + '&broadcast_type='
|
|
|
|
|
|
class TwitchAllVideosIE(TwitchVideosBaseIE):
|
|
IE_NAME = 'twitch:videos:all'
|
|
_VALID_URL = r'%s/all' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
|
|
_PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'archive,upload,highlight'
|
|
_PLAYLIST_TYPE = 'all videos'
|
|
|
|
_TESTS = [{
|
|
'url': 'https://www.twitch.tv/spamfish/videos/all',
|
|
'info_dict': {
|
|
'id': 'spamfish',
|
|
'title': 'Spamfish',
|
|
},
|
|
'playlist_mincount': 869,
|
|
}, {
|
|
'url': 'https://m.twitch.tv/spamfish/videos/all',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
|
|
class TwitchUploadsIE(TwitchVideosBaseIE):
|
|
IE_NAME = 'twitch:videos:uploads'
|
|
_VALID_URL = r'%s/uploads' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
|
|
_PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'upload'
|
|
_PLAYLIST_TYPE = 'uploads'
|
|
|
|
_TESTS = [{
|
|
'url': 'https://www.twitch.tv/spamfish/videos/uploads',
|
|
'info_dict': {
|
|
'id': 'spamfish',
|
|
'title': 'Spamfish',
|
|
},
|
|
'playlist_mincount': 0,
|
|
}, {
|
|
'url': 'https://m.twitch.tv/spamfish/videos/uploads',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
|
|
class TwitchPastBroadcastsIE(TwitchVideosBaseIE):
|
|
IE_NAME = 'twitch:videos:past-broadcasts'
|
|
_VALID_URL = r'%s/past-broadcasts' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
|
|
_PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'archive'
|
|
_PLAYLIST_TYPE = 'past broadcasts'
|
|
|
|
_TESTS = [{
|
|
'url': 'https://www.twitch.tv/spamfish/videos/past-broadcasts',
|
|
'info_dict': {
|
|
'id': 'spamfish',
|
|
'title': 'Spamfish',
|
|
},
|
|
'playlist_mincount': 0,
|
|
}, {
|
|
'url': 'https://m.twitch.tv/spamfish/videos/past-broadcasts',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
|
|
class TwitchHighlightsIE(TwitchVideosBaseIE):
|
|
IE_NAME = 'twitch:videos:highlights'
|
|
_VALID_URL = r'%s/highlights' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
|
|
_PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'highlight'
|
|
_PLAYLIST_TYPE = 'highlights'
|
|
|
|
_TESTS = [{
|
|
'url': 'https://www.twitch.tv/spamfish/videos/highlights',
|
|
'info_dict': {
|
|
'id': 'spamfish',
|
|
'title': 'Spamfish',
|
|
},
|
|
'playlist_mincount': 805,
|
|
}, {
|
|
'url': 'https://m.twitch.tv/spamfish/videos/highlights',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
|
|
class TwitchStreamIE(TwitchBaseIE):
|
|
IE_NAME = 'twitch:stream'
|
|
_VALID_URL = r'''(?x)
|
|
https?://
|
|
(?:
|
|
(?:(?:www|go|m)\.)?twitch\.tv/|
|
|
player\.twitch\.tv/\?.*?\bchannel=
|
|
)
|
|
(?P<id>[^/#?]+)
|
|
'''
|
|
|
|
_TESTS = [{
|
|
'url': 'http://www.twitch.tv/shroomztv',
|
|
'info_dict': {
|
|
'id': '12772022048',
|
|
'display_id': 'shroomztv',
|
|
'ext': 'mp4',
|
|
'title': 're:^ShroomzTV [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
|
|
'description': 'H1Z1 - lonewolfing with ShroomzTV | A3 Battle Royale later - @ShroomzTV',
|
|
'is_live': True,
|
|
'timestamp': 1421928037,
|
|
'upload_date': '20150122',
|
|
'uploader': 'ShroomzTV',
|
|
'uploader_id': 'shroomztv',
|
|
'view_count': int,
|
|
},
|
|
'params': {
|
|
# m3u8 download
|
|
'skip_download': True,
|
|
},
|
|
}, {
|
|
'url': 'http://www.twitch.tv/miracle_doto#profile-0',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://player.twitch.tv/?channel=lotsofs',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://go.twitch.tv/food',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://m.twitch.tv/food',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
@classmethod
|
|
def suitable(cls, url):
|
|
return (False
|
|
if any(ie.suitable(url) for ie in (
|
|
TwitchVideoIE,
|
|
TwitchChapterIE,
|
|
TwitchVodIE,
|
|
TwitchProfileIE,
|
|
TwitchAllVideosIE,
|
|
TwitchUploadsIE,
|
|
TwitchPastBroadcastsIE,
|
|
TwitchHighlightsIE,
|
|
TwitchClipsIE))
|
|
else super(TwitchStreamIE, cls).suitable(url))
|
|
|
|
def _real_extract(self, url):
|
|
channel_name = self._match_id(url)
|
|
|
|
access_token = self._call_api(
|
|
'api/channels/%s/access_token' % channel_name, channel_name,
|
|
'Downloading access token JSON')
|
|
|
|
token = access_token['token']
|
|
channel_id = compat_str(self._parse_json(
|
|
token, channel_name)['channel_id'])
|
|
|
|
stream = self._call_api(
|
|
'kraken/streams/%s?stream_type=all' % channel_id,
|
|
channel_id, 'Downloading stream JSON').get('stream')
|
|
|
|
if not stream:
|
|
raise ExtractorError('%s is offline' % channel_id, expected=True)
|
|
|
|
# Channel name may be typed if different case than the original channel name
|
|
# (e.g. http://www.twitch.tv/TWITCHPLAYSPOKEMON) that will lead to constructing
|
|
# an invalid m3u8 URL. Working around by use of original channel name from stream
|
|
# JSON and fallback to lowercase if it's not available.
|
|
channel_name = try_get(
|
|
stream, lambda x: x['channel']['name'],
|
|
compat_str) or channel_name.lower()
|
|
|
|
query = {
|
|
'allow_source': 'true',
|
|
'allow_audio_only': 'true',
|
|
'allow_spectre': 'true',
|
|
'p': random.randint(1000000, 10000000),
|
|
'player': 'twitchweb',
|
|
'playlist_include_framerate': 'true',
|
|
'segment_preference': '4',
|
|
'sig': access_token['sig'].encode('utf-8'),
|
|
'token': token.encode('utf-8'),
|
|
}
|
|
formats = self._extract_m3u8_formats(
|
|
'%s/api/channel/hls/%s.m3u8?%s'
|
|
% (self._USHER_BASE, channel_name, compat_urllib_parse_urlencode(query)),
|
|
channel_id, 'mp4')
|
|
self._prefer_source(formats)
|
|
|
|
view_count = stream.get('viewers')
|
|
timestamp = parse_iso8601(stream.get('created_at'))
|
|
|
|
channel = stream['channel']
|
|
title = self._live_title(channel.get('display_name') or channel.get('name'))
|
|
description = channel.get('status')
|
|
|
|
thumbnails = []
|
|
for thumbnail_key, thumbnail_url in stream['preview'].items():
|
|
m = re.search(r'(?P<width>\d+)x(?P<height>\d+)\.jpg$', thumbnail_key)
|
|
if not m:
|
|
continue
|
|
thumbnails.append({
|
|
'url': thumbnail_url,
|
|
'width': int(m.group('width')),
|
|
'height': int(m.group('height')),
|
|
})
|
|
|
|
return {
|
|
'id': str_or_none(stream.get('_id')) or channel_id,
|
|
'display_id': channel_name,
|
|
'title': title,
|
|
'description': description,
|
|
'thumbnails': thumbnails,
|
|
'uploader': channel.get('display_name'),
|
|
'uploader_id': channel.get('name'),
|
|
'timestamp': timestamp,
|
|
'view_count': view_count,
|
|
'formats': formats,
|
|
'is_live': True,
|
|
}
|
|
|
|
|
|
class TwitchClipsIE(TwitchBaseIE):
|
|
IE_NAME = 'twitch:clips'
|
|
_VALID_URL = r'''(?x)
|
|
https?://
|
|
(?:
|
|
clips\.twitch\.tv/(?:embed\?.*?\bclip=|(?:[^/]+/)*)|
|
|
(?:(?:www|go|m)\.)?twitch\.tv/[^/]+/clip/
|
|
)
|
|
(?P<id>[^/?#&]+)
|
|
'''
|
|
|
|
_TESTS = [{
|
|
'url': 'https://clips.twitch.tv/FaintLightGullWholeWheat',
|
|
'md5': '761769e1eafce0ffebfb4089cb3847cd',
|
|
'info_dict': {
|
|
'id': '42850523',
|
|
'ext': 'mp4',
|
|
'title': 'EA Play 2016 Live from the Novo Theatre',
|
|
'thumbnail': r're:^https?://.*\.jpg',
|
|
'timestamp': 1465767393,
|
|
'upload_date': '20160612',
|
|
'creator': 'EA',
|
|
'uploader': 'stereotype_',
|
|
'uploader_id': '43566419',
|
|
},
|
|
}, {
|
|
# multiple formats
|
|
'url': 'https://clips.twitch.tv/rflegendary/UninterestedBeeDAESuppy',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://www.twitch.tv/sergeynixon/clip/StormyThankfulSproutFutureMan',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://clips.twitch.tv/embed?clip=InquisitiveBreakableYogurtJebaited',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://m.twitch.tv/rossbroadcast/clip/ConfidentBraveHumanChefFrank',
|
|
'only_matching': True,
|
|
}, {
|
|
'url': 'https://go.twitch.tv/rossbroadcast/clip/ConfidentBraveHumanChefFrank',
|
|
'only_matching': True,
|
|
}]
|
|
|
|
def _real_extract(self, url):
|
|
video_id = self._match_id(url)
|
|
|
|
clip = self._download_json(
|
|
'https://gql.twitch.tv/gql', video_id, data=json.dumps({
|
|
'query': '''{
|
|
clip(slug: "%s") {
|
|
broadcaster {
|
|
displayName
|
|
}
|
|
createdAt
|
|
curator {
|
|
displayName
|
|
id
|
|
}
|
|
durationSeconds
|
|
id
|
|
tiny: thumbnailURL(width: 86, height: 45)
|
|
small: thumbnailURL(width: 260, height: 147)
|
|
medium: thumbnailURL(width: 480, height: 272)
|
|
title
|
|
videoQualities {
|
|
frameRate
|
|
quality
|
|
sourceURL
|
|
}
|
|
viewCount
|
|
}
|
|
}''' % video_id,
|
|
}).encode(), headers={
|
|
'Client-ID': self._CLIENT_ID,
|
|
})['data']['clip']
|
|
|
|
if not clip:
|
|
raise ExtractorError(
|
|
'This clip is no longer available', expected=True)
|
|
|
|
formats = []
|
|
for option in clip.get('videoQualities', []):
|
|
if not isinstance(option, dict):
|
|
continue
|
|
source = url_or_none(option.get('sourceURL'))
|
|
if not source:
|
|
continue
|
|
formats.append({
|
|
'url': source,
|
|
'format_id': option.get('quality'),
|
|
'height': int_or_none(option.get('quality')),
|
|
'fps': int_or_none(option.get('frameRate')),
|
|
})
|
|
self._sort_formats(formats)
|
|
|
|
thumbnails = []
|
|
for thumbnail_id in ('tiny', 'small', 'medium'):
|
|
thumbnail_url = clip.get(thumbnail_id)
|
|
if not thumbnail_url:
|
|
continue
|
|
thumb = {
|
|
'id': thumbnail_id,
|
|
'url': thumbnail_url,
|
|
}
|
|
mobj = re.search(r'-(\d+)x(\d+)\.', thumbnail_url)
|
|
if mobj:
|
|
thumb.update({
|
|
'height': int(mobj.group(2)),
|
|
'width': int(mobj.group(1)),
|
|
})
|
|
thumbnails.append(thumb)
|
|
|
|
return {
|
|
'id': clip.get('id') or video_id,
|
|
'title': clip.get('title') or video_id,
|
|
'formats': formats,
|
|
'duration': int_or_none(clip.get('durationSeconds')),
|
|
'views': int_or_none(clip.get('viewCount')),
|
|
'timestamp': unified_timestamp(clip.get('createdAt')),
|
|
'thumbnails': thumbnails,
|
|
'creator': try_get(clip, lambda x: x['broadcaster']['displayName'], compat_str),
|
|
'uploader': try_get(clip, lambda x: x['curator']['displayName'], compat_str),
|
|
'uploader_id': try_get(clip, lambda x: x['curator']['id'], compat_str),
|
|
}
|